Pau Perez
|
a5a2cb8ea7
|
Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up"
This reverts commit fa689b6607, reversing
changes made to 2aeed9763c.
|
2018-10-15 15:48:48 +02:00 |
|
luisramos0
|
b7416e42f4
|
Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8)
|
2018-10-11 23:02:17 +01:00 |
|
luisramos0
|
bed4ec4102
|
Improve docs and readability on tax_rate_decorator
|
2018-10-02 16:15:10 +01:00 |
|
Pau Pérez Fabregat
|
060b3c55f1
|
Merge pull request #2751 from luisramos0/2-0-order-details
[Spree Upgrade] Refactored spree/order_details, extracted delivery and pickup details into separate partials
|
2018-09-27 14:30:42 +02:00 |
|
Pau Pérez Fabregat
|
037432d1a7
|
Merge pull request #2767 from luisramos0/order_empty
[Spree Upgrade] Destroy all shipments when clearing order
|
2018-09-26 08:54:11 +02:00 |
|
Maikel
|
267edbdb45
|
Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
|
2018-09-25 11:37:46 +10:00 |
|
Pau Perez
|
eb64569c9a
|
Destroy all shipments when clearing order
Now we only clear the order's shipping_method, and in Spree 2.0 it can
have many shipments.
|
2018-09-24 15:25:33 +01:00 |
|
Hugo Daniel
|
06ee75981a
|
Add require_shipping_address to shipping_methods_form
|
2018-09-24 12:35:40 +02:00 |
|
Pau Pérez Fabregat
|
52a412a218
|
Merge pull request #2638 from coopdevs/unit-test-variant-stock
Unit test variant stock
|
2018-09-24 11:14:03 +02:00 |
|
Maikel
|
26eb79f5f2
|
Merge pull request #2729 from luisramos0/2-0-ship-method-curr-order-ser
[Spree Upgrade] Replace order.shipping_method_id in current_order_serializer
|
2018-09-24 08:56:21 +10:00 |
|
Maikel
|
9b10fbde2d
|
Merge pull request #2728 from luisramos0/2-0-ship-method-ctrl
[Spree Upgrade] Remove use of Order#shipping_method_id from ShippingMethodsControllerDecorator
|
2018-09-24 08:54:03 +10:00 |
|
Pau Pérez Fabregat
|
3c4ec62352
|
Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit
[Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides
|
2018-09-21 16:16:25 +02:00 |
|
Pau Pérez Fabregat
|
33fa687c28
|
Merge pull request #2755 from HugsDaniel/apply_overrides_to_shipping_methods_form
[Spree Upgrade] Replace Spree::ShippingMethods form partial by our own and apply overrides
|
2018-09-21 15:35:41 +02:00 |
|
Hugo Daniel
|
f9c5e732d8
|
Replace Spree::ShippingMethods form partial by our own and apply overrides
|
2018-09-20 19:21:02 +02:00 |
|
Hugo Daniel
|
0d7e24e554
|
Change to new ruby hash syntax
|
2018-09-20 14:34:10 +02:00 |
|
Hugo Daniel
|
b0fa76f519
|
Change to new ruby hash syntax
|
2018-09-20 14:32:27 +02:00 |
|
Hugo Daniel
|
07cbb08b42
|
Change to new ruby hash syntax
|
2018-09-20 14:28:20 +02:00 |
|
Hugo Daniel
|
56c1b073ee
|
Replace Spree::ShippingMethods new view by our own and apply overrides
|
2018-09-20 12:37:26 +02:00 |
|
Hugo Daniel
|
493da83378
|
Replace Spree::ShippingMethods index view by our own and apply overrides
|
2018-09-20 12:35:49 +02:00 |
|
Hugo Daniel
|
a14337df5c
|
Replace Spree::ShippingMethods edit view by our own and apply overrides
|
2018-09-20 12:34:16 +02:00 |
|
luisramos0
|
57bb1fec9a
|
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
|
2018-09-19 16:21:12 +01:00 |
|
Pau Pérez Fabregat
|
99ba9d7d1b
|
Merge branch '2-0-stable' into unit-test-variant-stock
|
2018-09-19 15:41:21 +02:00 |
|
Pau Perez
|
b77dd41eb0
|
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
This was copied/adapted from 6f7c8bb8b1
|
2018-09-19 14:20:44 +01:00 |
|
Pau Perez
|
0491a96d44
|
Ask to use backorderable? instead of on_demand
|
2018-09-19 15:12:38 +02:00 |
|
luisramos0
|
edcdf59621
|
In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec.
|
2018-09-18 16:11:01 +01:00 |
|
Pau Perez
|
314ad5400f
|
Move variant_stock.rb to concerns/
|
2018-09-18 12:18:50 +02:00 |
|
luisramos0
|
238d2f4feb
|
Removed unnecessary code copied and replaced with call to identical super class
|
2018-09-14 22:20:21 +01:00 |
|
luisramos0
|
d685b706ad
|
In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists
|
2018-09-14 17:13:20 +01:00 |
|
luisramos0
|
6b3fd22db8
|
Adapted order_decorator to spree 2 by fixing adjustment.update! call on update_adjustment
|
2018-09-14 16:40:59 +01:00 |
|
Pau Pérez Fabregat
|
e58f7269c3
|
Merge pull request #2652 from luisramos0/2-0-within-zone
[Spree 2 Upgrade] Removed unused shipping_method.within_zone, customization not needed
|
2018-09-11 08:43:06 +02:00 |
|
luisramos0
|
3577f3790d
|
Moved order.shipping_method to the OrderShippingMethod concern
|
2018-09-11 00:24:35 +01:00 |
|
luisramos0
|
f24b20d28c
|
Added adapted implementation of order.shipping_method to order_decorator
|
2018-09-10 14:32:50 +01:00 |
|
luisramos0
|
44d81622ac
|
CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly
|
2018-09-10 10:21:23 +01:00 |
|
luisramos0
|
d2f4f8ccb2
|
Removed unused shipping_method.within_zone, customization not needed
|
2018-09-06 20:29:04 +01:00 |
|
luisramos0
|
89d51d75ae
|
Merge branch 'master' into 2-0-stable-sept
|
2018-09-04 17:43:20 +01:00 |
|
Maikel
|
0d2fa3dc40
|
Merge pull request #2611 from luisramos0/cookies_banner_font_size
[Cookies] Increased cookies banner font size for med/large screens to improve readability
|
2018-09-04 11:35:32 +10:00 |
|
Maikel
|
1b6bb72966
|
Merge pull request #2587 from luisramos0/spree2_order_mailer_decorator_bug
Spree 2 Upgrade - MailMethod - Fixed bug on order_mailer_decorator (only visible in spree 2)
|
2018-09-04 11:29:51 +10:00 |
|
Pau Pérez Fabregat
|
7dbbc3e9d8
|
Merge pull request #2610 from luisramos0/cookies_banner_bug
[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
|
2018-09-03 17:23:17 +02:00 |
|
Pau Pérez Fabregat
|
0f118baa4e
|
Merge pull request #2615 from mkllnk/2575-variant-on-hand-api
2575 variant on hand api
|
2018-09-03 11:16:02 +02:00 |
|
luisramos0
|
921c8dfdf4
|
Removed unnecessary cancel_email from order_email_decorator (spree one is equivalent after ofn PR#2589). Also refactored remaining order_mailer_decorator methods by extracting duplicated code.
|
2018-09-03 10:03:02 +01:00 |
|
Maikel
|
1b264403e0
|
Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user
Subscription emails for customer should not link to order page if customer has no user account
|
2018-09-03 14:38:56 +10:00 |
|
Maikel
|
3fadd06dc7
|
Merge pull request #2613 from luisramos0/cookies_better_policy_page
[Cookies] Updated cookies policy page text
|
2018-09-03 11:49:14 +10:00 |
|
Maikel
|
c510bbd8d0
|
Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update
Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address
|
2018-09-03 11:05:48 +10:00 |
|
Kristina Lim
|
f844236b9c
|
Remove order link in non-user order cancellation email
|
2018-09-01 23:46:12 +08:00 |
|
Kristina Lim
|
5f2c3a1955
|
Remove order link in non-user failed payment email
|
2018-09-01 23:46:12 +08:00 |
|
Kristina Lim
|
f8244a400a
|
Custom subscription placement email if non-user
The order link should not be provided if the order does not have an
associated user account.
|
2018-09-01 23:46:11 +08:00 |
|
Kristina Lim
|
ad8b120e48
|
Extract format for order cycle closing in emails
Using a helper for this, but this can be changed to look up a
translation key.
|
2018-09-01 23:46:08 +08:00 |
|
Maikel Linke
|
13b9ecab21
|
Fix font issue in mobile menu
|
2018-08-31 11:23:11 +10:00 |
|
luisramos0
|
1b4e0cd73a
|
Made the menu config default values more user friendly
|
2018-08-31 11:23:11 +10:00 |
|
luisramos0
|
e573a3fc2b
|
The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.
|
2018-08-31 11:23:11 +10:00 |
|