Commit graph

7143 commits

Author SHA1 Message Date
Nicolas ADLER
ae61d8a54c [Composer] Add selenium server standalone in require-dev 2016-02-24 19:56:54 +01:00
Michał Marcinkowski
13399c8bb3 Merge pull request #4283 from Niiko/backend-menu
[BackendMenu] Add check on product association link
2016-02-24 15:30:58 +01:00
Paweł Jędrzejewski
58871be0cf Merge pull request #4269 from Zales0123/extract-reusable-transformers
[RFC][Behat] Extract reusable transformers
2016-02-24 12:49:09 +01:00
Nicolas ADLER
d05874df55 [BackendMenu] Add check on product association link 2016-02-24 12:20:05 +01:00
Paweł Jędrzejewski
c4c7bbbeef Merge pull request #4278 from jverdeyen-forks/association-bundle-dependency
[AssociationBundle ] Added Association component dependecy in the AssociationBundle
2016-02-24 11:40:39 +01:00
Joeri Verdeyen
a29775df43 Added Association component dependecy in the AssociationBundle 2016-02-24 11:03:08 +01:00
Mateusz Zalewski
6b0f4aa7f5 PR review fixes 2016-02-24 10:35:01 +01:00
Mateusz Zalewski
67c658508b [Behat] Some crucial fixes due to failing tests 2016-02-24 10:27:17 +01:00
Mateusz Zalewski
ab93c36966 [Behat] Use SharedStorageContext in taxation scenarios 2016-02-24 10:26:18 +01:00
Mateusz Zalewski
94c63b2d39 [Behat] Use SharedContext in all promotion scenarios 2016-02-24 10:26:18 +01:00
Mateusz Zalewski
a39c7789d5 [Behat] Implemented SharedStorageContext
Also implement usage of LexicalContext in promotions steps
2016-02-24 10:26:17 +01:00
Mateusz Zalewski
8af3740584 [Behat] Implemented LexicalContext 2016-02-24 10:26:17 +01:00
Paweł Jędrzejewski
aef69a1090 Merge pull request #4270 from Zales0123/shipping-discount-promotions
[Behat][Promotion] Shipping discount promotions
2016-02-24 09:32:11 +01:00
Mateusz Zalewski
3e6f6d5170 PR review fixes 2016-02-24 08:09:05 +01:00
Mateusz Zalewski
29ce76c93b [Behat] Implement missing steps for shipping discounts 2016-02-24 08:02:35 +01:00
Mateusz Zalewski
7006ae046e [Promotion] Added shipping discount creation method to factory 2016-02-24 08:00:43 +01:00
Paweł Jędrzejewski
8c4ec34605 Merge pull request #4184 from Niiko/master
[Cart] Set subject in CartEvent and CartItemEvent
2016-02-23 16:05:15 +01:00
Michał Marcinkowski
704a283e4d Merge pull request #4267 from Zales0123/discount-based-on-items-total
[Behat][Promotion] Discount based on items total
2016-02-23 15:33:08 +01:00
Mateusz Zalewski
e5940a23b0 PR review fixes 2016-02-23 13:57:43 +01:00
Mateusz Zalewski
24c4df51b0 [Behat][Promotion] Implemented item total rule missing steps 2016-02-23 11:11:12 +01:00
Mateusz Zalewski
7a007c519e [Core] Added item count rule creation method to factory 2016-02-23 11:11:12 +01:00
Paweł Jędrzejewski
4fff23a6c0 Merge pull request #4266 from Zales0123/remove-equal-flag-from-promotion-rules
[Promotion] Removed "equal" flag from rules
2016-02-23 11:09:30 +01:00
Paweł Jędrzejewski
6a61906700 Merge pull request #4009 from TheMadeleine/user-and-customer-not-softdeletable
[User] Remove softdeletable from User and Customer
2016-02-23 10:34:51 +01:00
Paweł Jędrzejewski
ca905fc6c5 Merge pull request #4232 from Arminek/fix-paypal
[Checkout] Quick fix behat command on travis
2016-02-23 10:30:21 +01:00
Paweł Jędrzejewski
fc7fd448a0 Merge pull request #4254 from nakashu/fix/average_rating-review-migration
[review] - migration fix to be consistent with model
2016-02-23 10:29:08 +01:00
Paweł Jędrzejewski
30d6e46b6b Merge pull request #4257 from Zales0123/discount-based-on-cart-quantity
[Behat][Promotion] Discount based on cart quantity
2016-02-23 10:17:47 +01:00
Paweł Jędrzejewski
446fe3ae3c Merge pull request #4263 from sjonkeesse/feature/adjustment-resource
[OrderBundle] Adjustment resource
2016-02-23 10:14:51 +01:00
Mateusz Zalewski
0ac2c480b3 [Promotion] Removed "equal" flag from rules 2016-02-23 10:01:54 +01:00
Magdalena Banasiak
546beba342 Deleting user should not delete reviews because the customer remains 2016-02-23 08:41:11 +01:00
Mateusz Zalewski
5fef96c8e0 [Promotion] Changes in promotions system to fit scenarios 2016-02-23 08:02:57 +01:00
Mateusz Zalewski
8711b8c695 [Behat][Promotion] Implemented missing promotion steps 2016-02-23 08:02:57 +01:00
Mateusz Zalewski
55c204fb90 [Core] Implemented custom rule factory 2016-02-23 08:02:32 +01:00
Robin Jansen
aae10fa484 Adjustment implements ResourceInterface, Adjustment manage permisson for sales manager 2016-02-22 23:06:44 +01:00
Paweł Jędrzejewski
43dc755131 Merge pull request #4249 from Zales0123/change-item-count-promotion-to-cart-quantity
[RFC][Promotion] Change "item count" promotion to "cart quantity"
2016-02-22 22:30:52 +01:00
Michał Marcinkowski
4961ddf89e Merge pull request #4258 from Zales0123/promotion-scenarios-minor-fixes
[Behat][Promotion] Changed promotions total step
2016-02-22 22:16:56 +01:00
Michał Marcinkowski
588daf9cb1 Merge pull request #4252 from lchrusciel/country-name-to-code-converter
[Addressing] Country name to code converter extraction
2016-02-22 22:14:05 +01:00
Michał Marcinkowski
106fc887ac Merge pull request #4206 from nakashu/fix/zone-tax-aplicator-consecutive-calls
[Taxation] - reset pointer for orderUnits collection before each call
2016-02-22 21:57:34 +01:00
Paweł Jędrzejewski
67acc05c72 Merge pull request #4238 from nakashu/fix/review-average-rating-recalculation-on-change
[Review] - average rating recalculation on change, decouple model
2016-02-22 16:39:24 +01:00
Paweł Jędrzejewski
e6a29491c1 Merge pull request #4168 from nakashu/fix/cart-item-translation
[cart] - added missing translation for quantity on cart item form type
2016-02-22 16:37:51 +01:00
Mateusz Zalewski
a6569e0208 [Behat] Changed promotions total step 2016-02-22 16:35:37 +01:00
Paweł Jędrzejewski
527c31b6d9 Merge pull request #4255 from GSadee/lazy-province-naming-provider
Changed ProvinceNamingProvider to lazy service
2016-02-22 16:30:46 +01:00
Mateusz Zalewski
881266de89 PR review fixes 2016-02-22 16:15:12 +01:00
Mateusz Zalewski
3d102dbed0 [Promotion] Fixes in scenarios to fit changed logic 2016-02-22 16:15:12 +01:00
Mateusz Zalewski
e6b75f69ee [Promotion] Change "item_count" type into "cart_quantity" 2016-02-22 16:15:12 +01:00
Łukasz Chruściel
476189b532 [Addressing] Country name to code converter 2016-02-22 15:33:10 +01:00
Grzegorz Sadowski
af632929d4 Changed ProvinceNamingProvider to lazy service 2016-02-22 15:16:14 +01:00
Michał Marcinkowski
2fc82dcbd0 Merge pull request #4135 from NeverResponse/optional-product-description
[Product] Removed the need of description
2016-02-22 14:53:48 +01:00
Daniel Kruzliak
fa61d83289 [review] - migration fix 2016-02-22 14:53:45 +01:00
Michał Marcinkowski
3518aef540 Merge pull request #4234 from Zales0123/percentage-discount-promotion-scenarios
[Behat][Promotion] Percentage discount scenarios implementation
2016-02-22 14:42:51 +01:00
Mateusz Zalewski
52ec41a060 PR review fixes 2016-02-22 13:42:45 +01:00