raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,975 Commits 16 Branches 456 Tags
ed429dd20db14cfa8fa01a675c556cc17276b2e7
Commit Graph

9975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
ed429dd20d Fix models/spree/order_spec tests related to tax on shipments: 
- make Spree::Config be picked up correctly by reordering test object creation
- make sure line item is loaded in the order when the order is created
 2018-10-11 18:06:33 +01:00
Pau Pérez Fabregat
2aeed9763c Merge pull request #2789 from luisramos0/pending_order_syncer 
[Spree Upgrade] Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788
 2018-10-08 17:51:36 +02:00
Pau Pérez Fabregat
c30458b90a Merge pull request #2787 from luisramos0/pending_subs_mailer 
[Spree Upgrade] Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786
 2018-10-08 17:51:24 +02:00
Pau Pérez Fabregat
875f0c01bc Merge pull request #2794 from luisramos0/pending_bulk_prod_update 
[Spree Upgrade] Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in #2790
 2018-10-08 17:51:08 +02:00
Pau Pérez Fabregat
d2720652bb Merge pull request #2795 from luisramos0/pending_subs_pacement_job 
[Spree Upgrade] Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793
 2018-10-08 17:50:58 +02:00
Pau Pérez Fabregat
b51bd4aa4b Merge pull request #2796 from luisramos0/pending_prod_import 
[Spree Upgrade] Making product import and product importer specs pending, 17 tests to be fixed in #2791
 2018-10-08 17:50:48 +02:00
Pau Pérez Fabregat
86d9f4d56a Merge pull request #2797 from luisramos0/pending_reports 
[Spree Upgrade] Making reports and reports_controller specs pending, 18 tests to be fixed in #2792
 2018-10-08 17:50:25 +02:00
Maikel
d15f524cb1 Merge pull request #2779 from luisramos0/2-0-shipment-specs 
[Spree Upgrade] Fixed several specs by defining line_items.target_shipmnt
 2018-10-08 17:43:54 +11:00
luisramos0
d2fe203c89 Fixes error undefined 'stock_location' by adding shipment to line_items in the following specs: features/admin/reports_spec, lib/open_food_network/bulk_coop_report_spec, lib/open_food_network/customers_report_spec, lib/open_food_network/order_cycle_management_report_spec, lib/open_food_network/orders_and_fulfillments_report_spec and lib/open_food_network/packing_report_spec 2018-10-01 11:57:36 +01:00
luisramos0
1ff1e32398 Making reports and reports_controller specs pending, 18 tests to be fixed in issue #2792 2018-09-30 00:30:49 +01:00
luisramos0
7dfce6c368 Making product import and product importer specs pending, 17 tests to be fixed in issue #2791 2018-09-30 00:21:43 +01:00
luisramos0
1d49edb194 Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793 2018-09-30 00:10:31 +01:00
luisramos0
50ac519dd5 Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in issue #2790 2018-09-30 00:04:33 +01:00
luisramos0
e79d184db0 Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788 2018-09-29 23:42:35 +01:00
luisramos0
801c4d1cab Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786 2018-09-29 23:31:11 +01:00
luisramos0
6c05be9772 Fixed 22 out of 30 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items. 2018-09-27 21:13:11 +01:00
Luis Ramos
f0183cd17e Merge pull request #2762 from luisramos0/2-0-order-model-spec 
[Spree Upgrade] Fixed updates of order.shipping_method_id and improved order, stock_location and shipment factories
 2018-09-27 13:43:58 +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
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
luisramos0
4f32a8efc2 Fixed shipment factory by making shipments unique per order and stock_location factory by making stock_location unique 2018-09-25 00:49:03 +01: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
luisramos0
89114655fd Fixed shipping_method update in features/consumer/shopping/orders_spec, order.shipment is now updated instead of order.shipping_method_id 2018-09-24 15:13:36 +01:00
luisramos0
4476b88044 Fixed shipping_method update in models/spree/order_spec, order.shipment is now updated instead of order.shipping_method_id 2018-09-24 15:13:36 +01:00
luisramos0
99fff3d279 Fixed factory completed_order_with_fees by skipping a failing and unnecessary part of the checkout workflow 
Fixed factory's shipment_with shipping_fees trait by ensuring only one shipping_rate in the shipment
 2018-09-24 15:13:35 +01: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
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