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
Maikel
5ede6a40e7
Merge pull request #2766 from HugsDaniel/2744_add_require_ship_address_to_shipping_methods_form
...
[Spree Upgrade] Add require_shipping_address to shipping_methods_form
2018-09-25 11:37:15 +10:00
Luis Ramos
08104c62be
Merge pull request #2667 from luisramos0/2-0-ship-method-last-used-address
...
[Spree Upgrade] Adapt Address_Finder.last_used_ship_address to spree 2
2018-09-24 15:07:27 +01:00
Luis Ramos
0eb2854f8a
Merge pull request #2680 from luisramos0/2-0-stable-x
...
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
2018-09-24 15:07:04 +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
128ec1623a
Merge pull request #2760 from luisramos0/2-0-admin-enterprise-spec
...
[Spree Upgrade] In admin enterprises spec, replacing select2_search with select2_select
2018-09-24 11:15:18 +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
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
luisramos0
a04e90d188
In admin enterprises spec, replacing select2_search with select2_select makes all tests pass. Also made screen size longer to avoid errors with overlaying components
2018-09-20 23:58:14 +01: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
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
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
843cd44b23
In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments
2018-09-17 00:51:01 +01:00
luisramos0
c66b611b99
Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec
2018-09-17 00:51:01 +01:00
luisramos0
75656668cd
Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments
2018-09-17 00:51:01 +01:00
luisramos0
38c2f52278
In features/admin/reports_spec, fixed setting shipping_method in order, this is now done through order shipments
2018-09-17 00:51:01 +01:00
luisramos0
fbd2d96b05
Moved shipment and shipping_method factories with flat rate and shipping fees to traits
2018-09-17 00:51:01 +01:00
luisramos0
7b6e4825e7
Fixed controllers/spree/admin/orders/customer_details_controller_spec:
...
- fixed order creation to use order.shipments instead of order.shipping_method
- adapted test to new spree 2 controller logic (shipments page is gone since 67f568914988bcc0a1fc520d15ed6444a6d12824 and redirect logic changed on e9cde1b4d570dd4f7f979ac71a58d6f3f342ebb4)
2018-09-17 00:44:14 +01:00
luisramos0
93ac99b5cc
Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec
2018-09-17 00:44:14 +01:00
luisramos0
8e5f43ed25
Fixed current order serializer spec name
2018-09-14 23:12:00 +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
5b3a529487
Adapted address_finder_spec to spree 2 shipments
2018-09-14 18:41:59 +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
2da7cc00f8
Fixed Address Finder last_used_ship_address. It now uses order.shipments.shipping_methods instead of order.shipping_method
2018-09-14 16:43: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 Perez
8d8670bdf4
Fix typos in comments
2018-09-10 14:26:19 +02:00
