Commit graph

12599 commits

Author SHA1 Message Date
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
4f38937203
[Core] Make example Admin great again 2016-11-15 14:53:17 +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
Jan Goralski
095f39b2e4
[Mailer] Added missing migration 2016-11-15 13:34:21 +01:00
Jan Goralski
4c28da648b
Review fixes of restricted items quantity 2016-11-15 13:04:18 +01:00
Arminek
2ba61b5043 Review fixes 2016-11-15 12:54:05 +01:00
Kamil Kokot
9f7fdde753
Remove ContentBundle 2016-11-15 12:38:48 +01:00
Paweł Jędrzejewski
a3cd1b85d1 Merge pull request #6723 from lchrusciel/patch-1
[Promotion] Fix unhelpful exception message
2016-11-15 12:08:12 +01:00
Jan Goralski
9c39a99060
[Behat] Prioritized promotion application tests 2016-11-15 11:52:13 +01:00
Paweł Jędrzejewski
e6c19b30af Merge pull request #6665 from michalmarcinkowski/remove-last-shipment
[BC Break] Remove getLastShipment method from Order
2016-11-15 11:46:25 +01:00
Paweł Jędrzejewski
859e68794b Merge pull request #6720 from SyliusBot/crowdin-translations-2016-11-14-21-37-02
[AUTO] Updated translations from Crowdin
2016-11-15 11:45:27 +01:00
tcaron
b54a5a3ef8 #6706 update Model.OrderItem.yml
#6706 fix : order-item instead of item
2016-11-15 11:31:02 +01:00
Arminek
be7d90b8e3 [Account][Order] Be able to pay for unpaid orders 2016-11-15 10:41:17 +01:00
Arminek
6611085d7e [Behat] Price per channel and currency fixes 2016-11-15 10:40:05 +01:00
Jan Goralski
13ae255e9e
[Behat] Scenarios for adding gazillions units to cart 2016-11-15 10:27:51 +01:00
Jan Goralski
f45b8e5a7b
[Order] Restricted max item quantity on adding to 9999 2016-11-15 09:59:43 +01:00
Michał Marcinkowski
da50c73910 Merge pull request #6721 from inssein/fix-currency-switch-redirect
[ShopBundle] Fix redirect when referer is blank
2016-11-15 09:25:40 +01:00
Łukasz Chruściel
ddc019fe95 [Promotion] Fix unhelpful exception message 2016-11-15 09:10:55 +01:00
Michał Marcinkowski
b6444aeff7 Merge pull request #6722 from TheMadeleine/docs/book/promotion-usage-limit
[Documentation][Book] Promotion - usageLimit clarification
2016-11-15 08:48:13 +01:00
Magdalena Banasiak
575289754b [Documentation][Book] Promotion - usageLimit clarification 2016-11-15 08:30:43 +01:00
inssein
7869b1c73c use getSchemeAndHttpHost instead of baseUrl 2016-11-14 20:19:33 -08:00
Sylius Bot
2522aad938 [Translations] Updated translations from Crowdin 2016-11-14 21:43:02 -05:00
michalmarcinkowski
aefae6952d Fix Behat context 2016-11-14 21:51:25 +01:00
Paweł Jędrzejewski
78305eb928 Merge pull request #6716 from TheMadeleine/docs/cook/facebook
[Documentation][Cookbook] How to add Facebook login?
2016-11-14 20:19:38 +01:00
Paweł Jędrzejewski
4ba6eae585 Merge pull request #6683 from Arminek/price-per-channel-and-currency
[Pricing] Price per channel and currency
2016-11-14 20:18:04 +01:00
Paweł Jędrzejewski
b5faef23ea Merge pull request #6688 from NeverResponse/admin/products-dimensions
[Admin] Added physical dimensions to variant/simple product views
2016-11-14 20:15:20 +01:00
Paweł Jędrzejewski
3d265c5b12 Merge pull request #6692 from venyii/use-connection-dbname
[Core] Use dbname from doctrine connection to allow custom values
2016-11-14 20:14:21 +01:00
michalmarcinkowski
9728c0a1f8 Remove getLastShipment method from Order 2016-11-14 16:55:45 +01:00
michalmarcinkowski
f650ee7c86 Improve shipment taxes applicator 2016-11-14 16:55:45 +01:00
Jan Goralski
ae5da333a2 [Core] Fixed Order::getLastShipment return when none found 2016-11-14 16:55:45 +01:00
Paweł Jędrzejewski
34c5c3fe19 Merge pull request #6684 from GSadee/orders-on-customer-page
[Admin][Customer] Browsing orders of a customer
2016-11-14 16:40:16 +01:00
Jan Goralski
5371b89c36 [Promotion] Removed obsolete form types' specs 2016-11-14 16:39:02 +01:00
Jan Goralski
82a0deff52 [Behat] Promotions priority sorting tests 2016-11-14 16:39:02 +01:00
Michał Marcinkowski
d591e648e2 Merge pull request #6715 from pamil/promotions-actions-rules-fixes
[Behat] Fix JS tests related to promotions actions/rules
2016-11-14 16:08:29 +01:00
Paweł Jędrzejewski
e9176e4e2b Merge pull request #6714 from TheMadeleine/oauth-user-fix
[CoreBundle] Fix OAuthUser
2016-11-14 16:07:52 +01:00
Magdalena Banasiak
d08e48d565 [Documentation][Cookbook] How to add Facebook login? 2016-11-14 15:53:07 +01:00
Jan Goralski
c3645a7af3
[Promotion] Added priority UIs 2016-11-14 15:35:46 +01:00
Paweł Jędrzejewski
97cc8ff90a Merge pull request #6707 from pamil/remove-omnipay
Remove Omnipay dependency
2016-11-14 15:20:15 +01:00
Kamil Kokot
08b33b52ce
[Behat] Fix JS tests related to promotions actions/rules 2016-11-14 15:08:52 +01:00
Magdalena Banasiak
4571111a5e [Documentation][Cookbook] How to add Facebook login? - structure 2016-11-14 14:31:34 +01:00
Paweł Jędrzejewski
1412234920 Merge pull request #6709 from NeverResponse/sorting/promotion
[Admin] Added sorting to promotions
2016-11-14 13:53:12 +01:00
Paweł Jędrzejewski
9b62063cb1 Merge pull request #6710 from Arminek/fix-wait-for-methods
[Behat] Fix wait for methods
2016-11-14 13:52:35 +01:00