Commit graph

11238 commits

Author SHA1 Message Date
Jan Goralski
136156b5e7 [Api] Created tests of revisiting steps of checkout 2016-09-15 14:46:11 +02:00
Jan Goralski
5aa8c8ce64 [Api] Removed unused json responses 2016-09-15 14:46:11 +02:00
Jan Goralski
cee30b33fe [Api] Removed faulty checkout routes 2016-09-15 14:46:11 +02:00
Michał Marcinkowski
f94abef92d Merge pull request #6105 from Arminek/cannot-start-checkout-with-empty-cart
[Shop][Checkout] Prevent starting checkout with empty cart
2016-09-15 14:34:03 +02:00
Michał Marcinkowski
c49b709d27 Merge pull request #6093 from pamil/class/ui-bundle
[Ui] Remove .class parameters
2016-09-15 13:20:46 +02:00
Michał Marcinkowski
987a9c2291 Merge pull request #6094 from pamil/class/taxonomy-bundle
[Taxonomy] Remove .class parameters
2016-09-15 13:18:08 +02:00
Michał Marcinkowski
13206b1661 Merge pull request #6095 from pamil/class/taxation-bundle
[Taxation] Remove .class parameters
2016-09-15 13:17:41 +02:00
Arminek
c6243d0d62 Review fixes 2016-09-15 13:03:36 +02:00
Michał Marcinkowski
2c32651c8a Merge pull request #6121 from lchrusciel/master-hot-fix
[HOTFIX] [CRITICAL] Fix master build
2016-09-15 12:39:55 +02:00
Łukasz
296cec5416 [Api] Fix shipping api tests 2016-09-15 12:02:29 +02:00
Łukasz
a215857dc9 [Twig] Reduce chain required to gather a shipment method price 2016-09-15 10:35:16 +02:00
Łukasz
4b15469416 [HOTFIX] Fix master build(array indexed with names instead of id) 2016-09-15 10:22:07 +02:00
Michał Marcinkowski
82083fef63 Merge pull request #5393 from videni/patch-3
use code to show shipping method options
2016-09-15 00:14:26 +02:00
Michał Marcinkowski
b96a957df8 Merge pull request #6109 from GSadee/remove-deleting-order
[Order][Admin] Remove possibility to delete an order
2016-09-15 00:07:15 +02:00
Michał Marcinkowski
eaa024d008 Merge pull request #6096 from pamil/user/do-not-redefine-class-variable
[User] Do not redeclare roles property on AdminUser
2016-09-15 00:05:27 +02:00
Michał Marcinkowski
ab99e6bae3 Merge pull request #6114 from NeverResponse/remove/product-variant-sold-field
[Core] Removed the 'sold' field from ProductVariant
2016-09-14 23:53:40 +02:00
Michał Marcinkowski
1451d361ef Merge pull request #6103 from steffenbrem/bugfix/remove-admin-bundle-dependency-in-shop-bundle
[ShopBundle] Fix dependency issue with AdminBundle in _addresses.html.twig
2016-09-14 23:44:40 +02:00
Michał Marcinkowski
6d7d27dd66 Merge pull request #6100 from steffenbrem/bugfix/shop-switcher-redirect-to-base-url-on-direct-hit
[ShopBundle] Locale and currency switcher small improvement
2016-09-14 23:43:30 +02:00
Michał Marcinkowski
74d328eaf0 Merge pull request #5332 from steffenbrem/bugfix/promotion-rule-shipping-country-code-fix
[Bug Fix] ShippingCountryRuleChecker, Use the country configuration as a code, instead of it's id
2016-09-14 23:29:30 +02:00
Michał Marcinkowski
3fc95a92ae Merge pull request #6071 from SyliusBot/crowdin-translations-2016-09-12-21-37-02
[AUTO] Updated translations from Crowdin
2016-09-14 23:25:37 +02:00
Michał Marcinkowski
6ec7340676 Merge pull request #6055 from sweoggy/symfony-3-compatibility
[Addressing][Shop][Taxonomy] Quoting scalars...
2016-09-14 22:58:24 +02:00
Michał Marcinkowski
fe561a9361 Merge pull request #6064 from steffenbrem/bugfix/cascade-transitions-shipment-unit
[BugFix][Core] Remove cascade transitions on sylius_shipment_unit
2016-09-14 22:27:37 +02:00
Michał Marcinkowski
4bf30cee02 Merge pull request #6116 from NeverResponse/fix/variant-code-on-summary
[Shop] Made sure item's variant code is displayed
2016-09-14 19:40:17 +02:00
Jan Goralski
ffbc39c3eb
[Behat] Variant's code checking on cart's summary 2016-09-14 17:12:32 +02:00
Jan Goralski
91fe681c92
[Shop][Ui] Made sure the variant code gets displayed rather than product 2016-09-14 17:11:43 +02:00
Michał Marcinkowski
5e04b74f0d Merge pull request #6115 from NeverResponse/fix/menu-rendering
[Ui] Small frontend fixes
2016-09-14 16:14:24 +02:00
Jan Goralski
ff2dbcbff0
[Ui] Fixed breadcrumps location 2016-09-14 15:05:40 +02:00
Jan Goralski
80ed89e5b1
[Ui] Fixed admin's menu rendering 2016-09-14 14:35:38 +02:00
Brett Bailey
c5bf0c1b32 5942 - Added extend knp menu twig for duplicate menu issue 2016-09-14 14:34:04 +02:00
Jan Goralski
af565f753f
[Core] Removed the 'sold' field from ProductVariant 2016-09-14 13:54:49 +02:00
Michał Marcinkowski
87fba95f61 Merge pull request #6102 from Arminek/add-admin-translation
[Admin][Translation] Add translation for editing administrator
2016-09-14 13:48:29 +02:00
Arminek
5210baf7d5 [Shop][Checkout] Prevent starting checkout with empty cart 2016-09-14 10:24:03 +02:00
Grzegorz Sadowski
ab7b8626f4 [Order][Admin] Remove possibility to delete an order 2016-09-14 10:02:56 +02:00
Kamil Kokot
7fad50e97e
[Ui] Remove .class parameters 2016-09-14 10:01:32 +02:00
Kamil Kokot
ef2c6dd728
[User] Do not redeclare roles property on AdminUser 2016-09-14 09:59:50 +02:00
Steffen Brem
3cb73c6899 Use the _address.html.twig partial template from the ShopBundle instead of the AdminBundle. 2016-09-13 22:39:50 +02:00
Arminek
051c969965 [Admin][Translation] Add translation for editing administrator 2016-09-13 22:29:41 +02:00
Steffen Brem
0e21ccbeeb This will fix any issues when you switch the locale or currency without having a referer. When no referer it present it will go to the shops homepage. 2016-09-13 22:17:01 +02:00
Michał Marcinkowski
a63e26058c Merge pull request #6074 from ahilles107/fix_template_checking
[Theme] fix bc break in templates loading, add real template existence check
2016-09-13 18:10:52 +02:00
Kamil Kokot
91256bd27b
[Taxonomy] Remove .class parameters 2016-09-13 17:41:01 +02:00
Kamil Kokot
1030dfc3d9
[Taxation] Remove .class parameters 2016-09-13 16:06:13 +02:00
Steffen Brem
ecc28ff636 Remove cascading transitions from sylius_inventory_unit to sylius_shipment_unit since they seem to fulfill different purposes right now. 2016-09-13 13:03:48 +02:00
Paweł Mikołajczuk
f61e11c0f1 [Theme] fix bc break in templates loading, add real template existence check 2016-09-13 11:22:57 +01:00
Michał Marcinkowski
95e1e6672c Merge pull request #6059 from NeverResponse/fix/email-checker-upgrades
[Behat] EmailChecker upgrades
2016-09-13 10:58:39 +02:00
Jan Goralski
e85c2cf56e Review fixes of EmailChecker upgrade 2016-09-13 10:02:35 +02:00
Jan Goralski
67e48dc69f [Behat] Removed 'email' tag from a scenario which didn't use it 2016-09-13 10:02:35 +02:00
Jan Goralski
89daee0e36 [Behat] Tiny shipping_order feature amend 2016-09-13 10:02:35 +02:00
Jan Goralski
a45de441e4 [Behat] Upgraded EmailChecker for stricter recipients checking 2016-09-13 10:02:35 +02:00
Michał Marcinkowski
2e3159280d Merge pull request #6065 from pamil/core/extract-services
[Core] Extract even more services definitions
2016-09-13 09:53:32 +02:00
Sylius Bot
620922e400 [Translations] Updated translations from Crowdin 2016-09-12 21:43:03 -04:00