raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-29 06:21:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,369 Commits 17 Branches 460 Tags
a36b7ce01ac4aa2bcccb2f83ec6eadcb6b7b06fd
Commit Graph

34369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
a23b1b980d Make Web engine an isolated namespace engine mounted on / (without /web prefix) 
This approach is better to separate concerns, see “Isolated Engine” here: https://api.rubyonrails.org/v3.2/classes/Rails/Engine.html
 2018-09-26 12:30:06 +01: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
Matt-Yorkley
2dcc8ea4bb Add spec for pending payments service 2018-09-25 10:05:32 +01:00
Matt-Yorkley
e93d46e75a Use .find instead of .select().first 2018-09-25 09:35:05 +01: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
Maikel
51f9a0afa1 Merge pull request #2562 from Matt-Yorkley/pi/product_attributes 
[Product Import] Product attributes
 2018-09-25 11:36:03 +10:00
Maikel
bf1f2b93c6 Merge pull request #2768 from coopdevs/fire-unused-users-task 
Remove no longer used rake task
 2018-09-25 11:30:04 +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
Transifex-Openfoodnetwork
97775c0bc1 Updating translations for config/locales/fr_CA.yml 2018-09-25 06:12:48 +10:00
Matt-Yorkley
1d9243af19 DRY and clarify serializer and service 2018-09-24 16:58:43 +01:00
Pau Perez
4a7ee9b91e Remove no longer used rake task 2018-09-24 17:17:10 +02:00
Matt-Yorkley
6f2760cf92 Move translations into their namespace and use '.key' format 2018-09-24 15:54:05 +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
Pau Perez
f743b5f02f Extract Settings from Product Import processor 
This encapsulates the data structure used by the entry processor to
check various settings. It still requires a lot of work to move more
logic to this new class.
 2018-09-24 13:55:33 +02:00
Hugo Daniel
0dd1b1a976 Fix feature specs for shipping_methods 2018-09-24 12:40:59 +02:00
Hugo Daniel
06ee75981a Add require_shipping_address to shipping_methods_form 2018-09-24 12:35:40 +02:00
Pau Pérez Fabregat
b8417058b4 Merge pull request #2741 from coopdevs/refactor-checkout-process-bits 
Refactor checkout process bits
 2018-09-24 12:08:19 +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
9d48ea7b62 Merge pull request #2759 from luisramos0/del_old_spec_helper 
Removed deprecated spec helper have_select2_option and fixed its last usage
 2018-09-24 11:25:51 +10: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
Matt-Yorkley
9f57b43a13 Move sortble header elements to a partial 2018-09-23 22:14:12 +01:00
Maikel
f0bb927020 Merge pull request #2734 from coopdevs/make-rubocop-useful 
Get useful feedback from Rubocop Metrics cops
 2018-09-23 19:48:05 +10:00
Maikel
89be54f79e Merge pull request #2750 from openfoodfoundation/transifex 
Transifex
v1.20.0 		2018-09-22 16:05:04 +10:00
Transifex-Openfoodnetwork
7175434910 Updating translations for config/locales/en_US.yml 2018-09-22 01:25:48 +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
Maikel
e2fd5a36d8 Merge pull request #2757 from luisramos0/delete_dead_specs 
Deleted sample specs and one pending spec
 2018-09-21 15:41:49 +10: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
luisramos0
33d2b65d65 Removed deprecated spec helper have_select2_option and fixed its last usage 2018-09-20 23:01:23 +01:00
luisramos0
2a68184c01 Deleted unused test helper for rabl views 2018-09-20 20:09: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
Pau Pérez Fabregat
20077c99b5 Merge pull request #2618 from coopdevs/enable-style-send-cop 
Favor #public_send over #send using Rubocop's cop
 2018-09-20 19:03:40 +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
Pau Pérez Fabregat
3dd1fcbc72 Merge pull request #2749 from luisramos0/delete-li-ship-method-name 
Drop unused db column line_items.shipping_method_name
 2018-09-20 13:26:26 +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
Matt-Yorkley
897e43fe0b Remove Spree's Deface data-hooks from new view 2018-09-20 11:33:22 +01:00
Maikel Linke
5763bf0518 Update all translations 2018-09-20 10:33:02 +10:00