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 |
|
Pau Pérez Fabregat
|
36bdde6cc4
|
Merge pull request #2754 from HugsDaniel/apply_overrides_to_shipping_methods_index
[Spree Upgrade] Replace Spree::ShippingMethods index view by our own and apply overrides
|
2018-09-21 15:28:44 +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 |
|
Pau Pérez Fabregat
|
e79f7c13f1
|
Merge pull request #2727 from luisramos0/2-0-shipment-adjustment
[Spree Upgrade] Adapt order_decorator.shipments.adjustments to spree 2
|
2018-09-18 09:37:10 +02:00 |
|
Maikel
|
1130bb341d
|
Merge pull request #2677 from luisramos0/2-0-sample-data
[Spree Upgrade] Fixed db:load_sample_data
|
2018-09-18 16:37:22 +10: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
|
692101db36
|
Merge pull request #2691 from coopdevs/fix-variant-override-spec
Fix failing spec due to wrong attribute
|
2018-09-13 12:21:35 +02:00 |
|
Pau Perez
|
ce148e0197
|
Fix failing spec due to wrong attribute
|
2018-09-12 18:19:08 +02:00 |
|
luisramos0
|
145b4385a4
|
Fixed db:load_sample_data shipping_method build
|
2018-09-11 22:21:43 +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 |
|
Pau Pérez Fabregat
|
288f685fd4
|
Merge pull request #2654 from luisramos0/2-0-ship-method
[Spree 2 Upgrade] - Added adapted order.shipping_method
|
2018-09-11 08:27:36 +02:00 |
|
luisramos0
|
c00e6a5dc7
|
Added DB uniqueness constraint on order_id to shipments
By forbidding more than a row per order in the spree_shipments table we ensure all orders have no more than one shipment associated
|
2018-09-11 00:24:50 +01:00 |
|
luisramos0
|
3577f3790d
|
Moved order.shipping_method to the OrderShippingMethod concern
|
2018-09-11 00:24:35 +01:00 |
|
luisramos0
|
62951f7d48
|
Removing duplicated factories inserted by previous PRs: 2668 and 2670
|
2018-09-10 16:51:20 +01:00 |
|
luisramos0
|
f24b20d28c
|
Added adapted implementation of order.shipping_method to order_decorator
|
2018-09-10 14:32:50 +01:00 |
|
Pau Pérez Fabregat
|
cde2f98514
|
Merge pull request #2590 from luisramos0/spree2_mail_method_create
Spree 2 - MailMethod - CreateMailMethod is now MailConfiguration
|
2018-09-10 12:08:23 +02:00 |
|
Pau Pérez Fabregat
|
a906ad15bd
|
Merge pull request #2670 from luisramos0/2-0-ship-method-adjustment-spec
[Spree 2 Upgrade] Fix issues related to shipments in adjustment_spec
|
2018-09-10 11:32:54 +02: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 |
|
Pau Pérez Fabregat
|
5a11af9118
|
Merge pull request #2668 from luisramos0/2-0-ship-method-order-spec
[Spree 2 Upgrade] Fixed models/order_spec issues related to order.shipping_method
|
2018-09-10 11:18:10 +02:00 |
|
Maikel
|
bce2c1cfd5
|
Merge pull request #2588 from luisramos0/spree2_mail_method_specs
Spree 2 Upgrade - MailMethod - Fix "undefined mail method" error in specs
|
2018-09-10 11:28:34 +10:00 |
|
luisramos0
|
2f1616a286
|
Changed reference from order.shipping_method to order.shipments in adjustment_spec
|
2018-09-09 23:32:59 +01:00 |
|
luisramos0
|
5bcc49a61c
|
Removed calls to the now inexistent order.create_shipment! from specs
|
2018-09-09 23:16:19 +01:00 |
|
luisramos0
|
73512d3591
|
Replaced order.shipping_method with order.shipments in models.order_spec.
Fixed factory completed_order_with_fees used in order_spec and also in line_items_controller_spec and orders_controller_spec.
|
2018-09-09 23:13:32 +01:00 |
|
luisramos0
|
afedbe45ab
|
Fixed scenario "guest order with registered email" in order_spec
Spree order factory requires user (we are setting it to nil below so, no impact on the test)
Defining shipping method is not necessary for this test
|
2018-09-09 23:13:32 +01:00 |
|
luisramos0
|
d6cff9bc68
|
Removed calls to the now inexistent order.create_shipment! from specs
|
2018-09-09 23:13:27 +01:00 |
|
Maikel
|
ce7c7b3867
|
Merge pull request #2640 from luisramos0/2-0-stable-spree-revision
Updated spree 2-0-4 revision used
|
2018-09-08 15:00:50 +10:00 |
|
luisramos0
|
d2f4f8ccb2
|
Removed unused shipping_method.within_zone, customization not needed
|
2018-09-06 20:29:04 +01:00 |
|
Maikel
|
417c33a870
|
Merge pull request #2639 from luisramos0/2-0-stable-sept
Merging master into 2-0-stable (one month of commits in master)
|
2018-09-06 08:50:47 +10: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 |
|
luisramos0
|
d29a1ebf9a
|
Updated spree 2-0-4 revision used
|
2018-09-04 00:41:29 +01: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
|
903d70090e
|
Merge pull request #2636 from luisramos0/heroku_dead_code
Removed old files that were used with, now unsupported, heroku
|
2018-09-03 12:49:19 +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
|
8004abbb9f
|
Improved Order mailer and Subscriptions mailer specs by removing dependency to old mail method
|
2018-09-03 10:03:06 +01: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
|
129e2c915e
|
Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0
Bump angular-rails-templates from 0.2.0 to 0.3.0
|
2018-09-03 14:39:21 +10: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
|
42afd426d5
|
Merge pull request #2620 from openfoodfoundation/dependabot/bundler/foreigner-1.7.4
Bump foreigner from 1.6.1 to 1.7.4
|
2018-09-03 11:48:48 +10:00 |
|