Commit graph

43 commits

Author SHA1 Message Date
Jordi Boggiano
2149b64937 Remove duplicate keyword 2012-04-09 12:40:23 +03:00
Paweł Jędrzejewski
5e044da7aa fix missed conflict. 2012-04-08 21:57:04 +02:00
Paweł Jędrzejewski
11d962827b Merge branch 'master' of git://github.com/Sylius/SyliusSalesBundle
Conflicts:
	README.md
2012-04-08 21:56:09 +02:00
Paweł Jędrzejewski
1a9667b00b fix status changing, add some tests, tweak order model. 2012-04-08 21:53:45 +02:00
Paweł Jędrzejewski
6490e30b6b update readme. 2012-04-08 20:35:28 +02:00
Paweł Jędrzejewski
4e4bc73a8a add custom sorting for statuses. 2012-04-08 20:23:42 +02:00
Paweł Jędrzejewski
170663cc37 clean up gitignore. 2012-04-07 22:42:29 +02:00
Paweł Jędrzejewski
45176c4117 initial refactoring. 2012-04-07 22:39:59 +02:00
Paweł Jędrzejewski
f2d4080390 Merge pull request #6 from yohang/fix-implements-type-get-name
Fix implements type get name
2012-02-25 01:26:49 -08:00
Paweł Jędrzejewski
d4379d8536 Merge pull request #5 from yohang/fix-use-same-name
Fixed ItemManager (use BaseItemManager for Inheritance)
2012-02-25 01:26:19 -08:00
yohang
6d11f9283c Fixed CS (inheritdoc) 2012-02-24 18:09:24 +01:00
yohang
84dc937192 Implements getName abstract method in Form/Type/ItemType.php 2012-02-24 18:08:11 +01:00
yohang
efec065061 Fixed ItemManager (use BaseItemManager for Inheritance) 2012-02-24 18:03:19 +01:00
Paweł Jędrzejewski
50288522a7 Merge pull request #4 from benscholler/master
Moving order status to a seperate entity
2012-02-03 11:44:53 -08:00
Benjamin Scholler
60f00c85c7 Getting rid of double use case on StatusChoiceList. 2012-02-03 11:24:58 -08:00
Benjamin Scholler
34dd370ca9 Merging from upstream of Sylius/SyliusSalesBundle. 2012-02-03 11:22:55 -08:00
Paweł Jędrzejewski
9ad2dcb118 Merge pull request #3 from umpirsky/array-choice-list
Fixed ArrayChoiceList not found error.
2012-02-02 23:32:20 -08:00
Benjamin Scholler
883eb8cbd7 Using the entity form type to build out the drop down for order status. Updating some constructs. 2012-01-31 14:29:05 -08:00
Benjamin Scholler
4f7b4baa07 Fixing association of sales order to order status. 2012-01-31 08:58:01 -08:00
Benjamin Scholler
50da011c62 Fixing some parameter issues that would prevent the display of status drop down. 2012-01-30 17:22:32 -08:00
Benjamin Scholler
44a181c718 Creating seperate form list type for statuses so we can update orders in the system per norm. 2012-01-30 17:10:11 -08:00
Benjamin Scholler
82c008f419 Removing unnecessary files. Updating sorting and fixing listing statuses on admin. 2012-01-30 16:21:54 -08:00
Benjamin Scholler
2a3a2ee7df Implementing Statuses for Orders. Still need to associate an order with a foreign key on an order and change the way it's rendered outside of the administration of a status. 2012-01-30 16:16:01 -08:00
Sasa Stamenkovic
cb5cd8347d Fixed ArrayChoiceList not found error. 2012-01-29 21:03:03 +01:00
Paweł Jędrzejewski
b998d6a925 Merge pull request #2 from umpirsky/tabs-to-spaces
Minor tabs fix.
2012-01-28 10:54:58 -08:00
Sasa Stamenkovic
78bc0eb024 Minor tabs fix. 2012-01-28 19:23:23 +01:00
Paweł Jędrzejewski
ba89280150 mass readme tweak. 2012-01-16 23:03:59 +01:00
Paweł Jędrzejewski
e00237c901 give access to prepared order in template. 2011-11-30 20:40:15 +01:00
Paweł Jędrzejewski
d38ae59d34 added ci reports. 2011-11-20 14:42:50 +01:00
Paweł Jędrzejewski
04c5980c77 added tests, composer.json and travis-ci.org support. 2011-11-18 01:14:58 +01:00
Paweł Jędrzejewski
37f8b3de1e fixed bug in FilterOrderEvent. 2011-11-15 22:05:10 +01:00
Paweł Jędrzejewski
8a08128134 move too complex logic from templates to sorters and filters. 2011-11-10 21:24:36 +01:00
Paweł Jędrzejewski
0e330653cc wooops, that was missing. 2011-11-07 20:56:26 +01:00
Paweł Jędrzejewski
933d0d1a01 added order filtering. 2011-11-07 20:01:18 +01:00
Paweł Jędrzejewski
b65011adaf fixed typo. 2011-11-02 19:20:19 +01:00
Paweł Jędrzejewski
6380f9fe67 added order preparation event and method to processor. 2011-11-02 19:16:37 +01:00
Paweł Jędrzejewski
3b86f5e582 updated readme. 2011-11-02 18:41:05 +01:00
Paweł Jędrzejewski
552f3b15d5 fixed sorting interfaces. 2011-11-02 12:25:08 +01:00
Paweł Jędrzejewski
4ad9b5e652 added sorters. 2011-11-02 11:12:57 +01:00
Paweł Jędrzejewski
a78b50a71d fixed bug. 2011-10-31 21:56:39 +01:00
Paweł Jędrzejewski
f2c909cc64 added placeAction to frontend order controller for simple checkouts. 2011-10-31 21:30:05 +01:00
Paweł Jędrzejewski
ece72b0989 added docblock for listener. 2011-10-28 18:15:29 +02:00
Paweł Jędrzejewski
5e81411e1b initial commit. 2011-10-28 12:20:36 +02:00