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
|
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
|
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 |
|
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 |
|
Maikel
|
1b88edea1f
|
Merge pull request #2420 from stveep/stripe-admin-2
Stripe admin 2
|
2018-08-30 15:48:49 +10:00 |
|
Maikel Linke
|
d1f7828432
|
Fix pending spec
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
|
2018-08-30 14:50:41 +10:00 |
|
Maikel Linke
|
0174b84254
|
Remove old deactivated code
|
2018-08-30 14:50:41 +10:00 |
|
Maikel Linke
|
c7648d67bd
|
Add Variant stock API of Spree 1
|
2018-08-30 13:55:12 +10:00 |
|
luisramos0
|
02b968b312
|
Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view
|
2018-08-30 00:27:35 +01:00 |
|
luisramos0
|
53e7fcb019
|
Imcreased cookies banner font size for med/large screens to improve readability
|
2018-08-30 00:21:00 +01:00 |
|
luisramos0
|
8dc10ffc6e
|
Added new test to cookies spec to cover bug on cookies banner and fixed it. See issue #2599.
Also, improved readability on cookies spec with some extracted methods.
|
2018-08-28 23:48:22 +01:00 |
|
Maikel
|
79f50e0b7b
|
Merge pull request #2353 from luisramos0/customers_admin_country_state
fixed UX problem in the state selector in customers admin
|
2018-08-28 16:46:00 +10:00 |
|
luisramos0
|
0de691b821
|
Delete outdated base_mailer_decorator.from_address (it used old MailMethod). This way we rely on the correct spree base_mailer.from_address (that gets it from Spree::Config
|
2018-08-25 13:47:05 +01:00 |
|
luisramos0
|
27f5e6db8a
|
Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: 32d2adc8a2 (diff-aa82d768109073ea8ad7858146630be4R9). Spree change introduced here: 8d90ae15f8 (diff-1e2ba31309f1f1abd2a4b626036d316fR94)
|
2018-08-25 12:50:36 +01:00 |
|
Maikel
|
8eee8f96ed
|
Merge pull request #2557 from Matt-Yorkley/pi/class_descriptions
Class descriptions for Product Import
|
2018-08-24 18:14:12 +10:00 |
|
Matt-Yorkley
|
717f626dfe
|
Refactor enterprise validation
|
2018-08-24 15:51:37 +10:00 |
|
Matt-Yorkley
|
2b057a26d5
|
Add primary_producer to index to reduce queries
|
2018-08-24 15:51:37 +10:00 |
|
Matt-Yorkley
|
666fbf53bf
|
Validate enterprise.is_primary_producer?
|
2018-08-24 15:51:37 +10:00 |
|
Maikel
|
616b42a14d
|
Merge pull request #2555 from luisramos0/cookie_http_only
Added httponly to cookieConsent cookie, this makes this cookie secure…
|
2018-08-24 15:50:13 +10:00 |
|
Maikel
|
a37931afda
|
Merge pull request #2542 from luisramos0/add_to_cart
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
|
2018-08-24 14:43:33 +10:00 |
|
Maikel
|
bf55190136
|
Merge pull request #2546 from Matt-Yorkley/pi/sku_validation
Remove empty SKU values if empty
|
2018-08-24 14:32:00 +10:00 |
|