Commit graph

12639 commits

Author SHA1 Message Date
Mateusz Zalewski
61acefeaac
[Taxon][Admin] Taxon slug validation 2016-11-17 13:04:05 +01:00
Paweł Jędrzejewski
b3610b0079 Merge pull request #6743 from lchrusciel/latest-translatable-issue
Latest translatable issue
2016-11-17 10:32:51 +01:00
Paweł Jędrzejewski
c06961e3b7 Merge pull request #6752 from venyii/remove-useless-argument-types
[Taxation] Remove useless argument type property
2016-11-17 10:11:53 +01:00
Paweł Jędrzejewski
11f112f667 Merge pull request #6753 from Zales0123/minor-fixes-after-review
[Core][Behat] Minor fixes from previous PRs
2016-11-17 10:11:31 +01:00
Mateusz Zalewski
bc644aab20
[Core][Behat] Minor fixes from previous PRs 2016-11-17 09:11:48 +01:00
Michał Marcinkowski
bea9153911 Merge pull request #6741 from TheMadeleine/docs/cook/custom-promotion
[Documentation][Cookbook] How to add a custom promotion action?
2016-11-17 09:04:16 +01:00
venyii
ba6f272667
[Taxation] Remove useless argument type property
This fixes a 'non-numeric value encountered' warning when running
PHP7.1. PR in Symfony: https://github.com/symfony/symfony/pull/20539
2016-11-17 09:00:34 +01:00
Łukasz
63d95ae6fa [Order] Fix latest new orders 2016-11-17 08:51:25 +01:00
Michał Marcinkowski
1b59ad833a Merge pull request #6750 from lchrusciel/hot-fix-master
[Shipment] Fix master build and consistency
2016-11-17 06:34:38 +01:00
Łukasz Chruściel
d7f0a4fa03
[Shipment] Fix master build and consistency 2016-11-16 22:28:42 +01:00
Michał Marcinkowski
747322a1fa Merge pull request #6744 from Zales0123/unify-taxon-rule-checkers
[Core][Promotion] Unify taxon rule checkers
2016-11-16 20:10:32 +01:00
Michał Marcinkowski
9ed09b10c2 Merge pull request #6731 from Zales0123/select-channel-on-shipping-and-payment-method-forms
[Core][Admin] Select channel on shipping and payment method's forms
2016-11-16 20:03:20 +01:00
Michał Marcinkowski
31daf892ea Merge pull request #6729 from davalb/master
fixes #6595
2016-11-16 18:41:37 +01:00
Łukasz
6d2ab318c8 [Behat] Implemet latest product scenario 2016-11-16 15:59:32 +01:00
Michał Marcinkowski
1f77a29006 Merge pull request #6746 from pamil/settings-out-of-control
Remove dev dependency on SettingsBundle
2016-11-16 15:06:45 +01:00
Mateusz Zalewski
4f4e71f531
[Core] Rename TaxonRule to HasTaxonRule 2016-11-16 13:57:43 +01:00
Kamil Kokot
265db7b521
Remove dev dependency on SettingsBundle 2016-11-16 13:03:21 +01:00
Mateusz Zalewski
23beb7e8f2
PR review fixes 2016-11-16 11:56:07 +01:00
Mateusz Zalewski
581bf3bacc
Remove unneeded interfaces and generate migration 2016-11-16 11:56:06 +01:00
Mateusz Zalewski
0f9e0087a9
[Core] Remove shipping methods collection from channel 2016-11-16 11:56:06 +01:00
Mateusz Zalewski
eecf6b6824
[Core][Admin] Choose channels on shipping method form 2016-11-16 11:56:05 +01:00
Mateusz Zalewski
c815b5586d
[Core] Remove payment methods collection from channel 2016-11-16 11:55:13 +01:00
Mateusz Zalewski
e8e1d10000
[Core] Select channel on payment method form 2016-11-16 11:55:13 +01:00
Mateusz Zalewski
86cbceb9d9
[Core] Added channels collection to PaymentMethod model 2016-11-16 11:55:13 +01:00
Mateusz Zalewski
5cb509b487
[Channel][Admin] Remove selecting shipping and payments methods on channel 2016-11-16 11:55:12 +01:00
Paweł Jędrzejewski
d4079b383d Merge pull request #6733 from Zales0123/change-shipment-to-shipping-method
[Behat] Be consistent with shipping method naming
2016-11-16 11:28:16 +01:00
Paweł Jędrzejewski
13c74f2ae2 Merge pull request #6713 from lchrusciel/product-variant-generation
[Product] Product variant generation
2016-11-16 11:25:37 +01:00
Paweł Jędrzejewski
7864c71059 Merge pull request #6673 from NeverResponse/remove/settings
[SettingsBundle] Removed from the main repository
2016-11-16 11:22:58 +01:00
Mateusz Zalewski
f83c30435d
[Core] Remove ContainsTaxonRuleChecker 2016-11-16 10:11:20 +01:00
Magdalena Banasiak
0685b161c9 [Documentation][Cookbook] How to add a custom promotion action? 2016-11-16 09:28:18 +01:00
Łukasz
d274599f9b [Behat] Scenario for product translations weird behavior 2016-11-16 09:02:53 +01:00
Łukasz
ffe1bbb0f1 [ProductVarian] Change product variant validation 2016-11-15 19:09:52 +01:00
Łukasz
0d50932310 [Flash] Custom translation 2016-11-15 19:09:52 +01:00
Łukasz
4f015f36ce [ProductVariant] Generating product variants 2016-11-15 19:09:51 +01:00
Łukasz
a678d78085 [Behat] Test product generation 2016-11-15 19:09:51 +01:00
Łukasz
8edeefc8e9 [ProductVariant] Scenarios 2016-11-15 19:09:51 +01:00
Paweł Jędrzejewski
2bd80c5058 Merge pull request #6726 from NeverResponse/cart/restrict-quantity
[Shop] Restrict the max quantity of units on add to cart
2016-11-15 19:03:03 +01:00
Paweł Jędrzejewski
ac4aafb21d Merge pull request #6735 from lchrusciel/missing-currency
[Twig] Add missing currency variable
2016-11-15 18:59:27 +01:00
Michał Marcinkowski
0b224e1a8e Merge pull request #6732 from Zales0123/make-example-admin-always-enabled
[Core] Make example Admin great again
2016-11-15 16:36:30 +01:00
Michał Marcinkowski
1c304ad18f Merge pull request #6724 from Arminek/pr-fixes
[Behat] Price per channel and currency fixes
2016-11-15 15:34:20 +01:00
Łukasz
9561bd5fcf [Twig] Add missing currency variable 2016-11-15 15:02:14 +01:00
Mateusz Zalewski
80cfe527f8
[Behat] Be consistent with shipping method naming 2016-11-15 14:57:02 +01:00
Mateusz Zalewski
4f38937203
[Core] Make example Admin great again 2016-11-15 14:53:17 +01:00
Jan Goralski
f84b37e482
[Settings] Removed from main repo 2016-11-15 14:23:43 +01:00
David Albrecht
04c8a604b6 fixes #6595 2016-11-15 14:18:46 +01:00
Paweł Jędrzejewski
e83bc0f4b8 Merge pull request #6719 from NeverResponse/promotion/prioritize
[Admin] Added promotion priorities to admin's panel
2016-11-15 14:12:07 +01:00
Paweł Jędrzejewski
47203632f6 Merge pull request #6728 from NeverResponse/migrate/mail
[Mailer] Added missing migration
2016-11-15 14:10:52 +01:00
Paweł Jędrzejewski
550aece122 Merge pull request #6717 from pamil/remove-content-bundle
Remove ContentBundle
2016-11-15 14:09:56 +01:00
Paweł Jędrzejewski
f06b8385c4 Merge pull request #6718 from Arminek/be-able-to-pay-for-order-from-my-account
[Account][Order] Be able to pay for unpaid orders
2016-11-15 14:06:51 +01:00
Paweł Jędrzejewski
756af5a9b7 Merge pull request #6727 from tcaron/tcaron-patch-1
#6706 update Model.OrderItem.yml
2016-11-15 13:54:43 +01:00