Matt-Yorkley
df1299b290
Fix user not yet loaded in prepend_before_filter
2020-02-22 11:06:51 +00:00
Matt-Yorkley
c0ecdb9e3a
Fix deprecated #includes in join without reference
...
DEPRECATION WARNING: It looks like you are eager loading table(s) (one of: variant_overrides, enterprises, enterprise_roles) that are referenced in a string SQL snippet. For example:
Post.includes(:comments).where("comments.title = 'foo'")
Currently, Active Record recognizes the table in the string, and knows to JOIN the comments table to the query, rather than loading comments in a separate query. However, doing this without writing a full-blown SQL parser is inherently flawed. Since we don't want to write an SQL parser, we are removing this functionality. From now on, you must explicitly tell Active Record when you are referencing a table from a string:
Post.includes(:comments).where("comments.title = 'foo'").references(:comments)
If you don't rely on implicit join references you can disable the feature entirely by setting `config.active_record.disable_implicit_join_references = true`. (called from collection at /home/user/Github/openfoodnetwork/app/controllers/admin/variant_overrides_controller.rb:77)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
98fdbb8621
Update deprecated #scoped calls
...
Model#scoped is now deprecated. Model#where(nil) in Rails 4 returns the same result as Model#scoped in Rails 3
2020-02-22 11:06:51 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
luisramos0
8dbe4accaf
Upgrade to the spree branch 2-1-0-stable and rails 4.0.0
2020-02-22 11:05:24 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
Luis Ramos
323ca906bc
Merge pull request #4759 from pacodelaluna/order-admin-products
...
Order admin products
2020-02-13 11:33:05 +00:00
Luis Ramos
c43b34e0fa
Merge pull request #4760 from luisramos0/checkout_ctrl
...
Merge Spree::CheckoutController with CheckoutController and clean it up
2020-02-13 11:31:15 +00:00
François Turbelin
4c7bd4d6a8
Fix mess with order
2020-02-13 06:38:13 +01:00
François Turbelin
523b266308
Put back created_at desc as default order
2020-02-13 06:38:13 +01:00
François Turbelin
212413c8b3
Avoid mutable q params
2020-02-13 06:38:13 +01:00
François Turbelin
b248dc598e
Cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4
Set default value at backend side
2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93
Fix specs and cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7
Filter Admin products by name asc
2020-02-13 06:38:13 +01:00
luisramos0
858d2cc6c2
Add doc to Spree::CheckoutController to make it more obvious why this controller exists
2020-02-07 11:50:23 +00:00
luisramos0
2acf8e5125
Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice
2020-02-05 16:02:43 +00:00
Luis Ramos
9313a57d19
Merge pull request #4511 from luisramos0/backend_ctrl_search
...
Bring spree_backend search controller to OFN
2020-02-05 15:54:30 +00:00
luisramos0
b41de52012
Moved checkout services into a specific folder under app/services
2020-02-05 14:49:17 +00:00
luisramos0
214eb43122
Add frozen string literal magic comment
2020-02-05 14:49:17 +00:00
luisramos0
01fc4e0513
Add Spree::CheckoutController only to redirect to CheckoutController
...
I have not managed to make the spree checkout route, that paypal express uses, go to CheckoutController directly. According to the rails docs "to: '/checkout#edit'" should do it, but it doesnt work here.
2020-02-05 14:49:17 +00:00
luisramos0
6ce50a5fa5
Extract paypal redirect logic to service class
2020-02-05 14:49:17 +00:00
luisramos0
4fbd2cfa52
Extract UserDefaultAddress logic into separate class to take more 30 lines out of CheckoutController
2020-02-05 14:49:17 +00:00
luisramos0
383b28e170
Add order and current_user to checkout_form_data_adapter where they are required
...
Also re-add order.state condition to update_result: in some tests, the order state is complete but no completion data (completed?) is present
2020-02-05 14:49:17 +00:00
luisramos0
bf55a15f81
Extract checkout params adaptation logic into a service class
2020-02-05 14:49:17 +00:00
luisramos0
43a6798db2
Move methods around in checkout controller into a more logical organisation: first the filters code and then support code for the update action
2020-02-05 14:49:17 +00:00
luisramos0
06d6579486
Refactor construct_saved_card_attributes to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
76df526002
Remove dead code from construct_saved_card_attributes
2020-02-05 14:49:17 +00:00
luisramos0
06569ea24c
Refactor load_order to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
25431f851b
Refactor object_params to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
bab2420bb3
Break up default address methods to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
0b2acb3a76
Extracted two methods from checkout_workflow to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
27db9e604f
Extract respond_to_update_succeeded from update_succeeded
2020-02-05 14:49:17 +00:00
luisramos0
c4e58ebb9e
Extract update_succeeded from checkout#update
2020-02-05 14:49:17 +00:00
luisramos0
9a0ee254af
Extract checkout_workflow from checkout#update
2020-02-05 14:49:17 +00:00
luisramos0
5ce3e1e0d2
Fix some rubocop issues in checkout controller
2020-02-05 14:49:17 +00:00
luisramos0
4b345d928c
Remove old code to detect Phantom Fees, no bugsnag events detected at all
2020-02-05 14:49:17 +00:00
luisramos0
52b1e6c71a
Move all logic required in Spree::CheckoutController to CheckoutController
2020-02-05 14:49:17 +00:00
Luis Ramos
ea75714561
Merge pull request #4635 from luisramos0/main_app_routes
...
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
luisramos0
44d1b3f00c
Remove unused search/users controller action
2020-02-04 14:55:34 +00:00
luisramos0
88464d58c2
Fix some rubocop issues and extract ransack hash to reduce repetition
2020-02-04 14:55:34 +00:00
luisramos0
962779bba1
Merge search controller with decorator
2020-02-04 14:54:51 +00:00
luisramos0
1ae73dd6ae
Add search_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 14:54:51 +00:00
Pau Pérez Fabregat
246235b921
Merge pull request #4667 from Matt-Yorkley/rails-4-prep
...
Rails 4 prep
2020-02-04 15:20:28 +01:00
luisramos0
bbb3748d3c
Simplify orders events logic
2020-02-04 11:51:13 +00:00
luisramos0
6e26841817
Fix load_order before filter and remove unused open and close adjustments actions
2020-02-04 11:50:44 +00:00
luisramos0
ab60c4a9dd
Remove unnecessary index action override because this is no longer a decorator
...
Remove useless todo comment
2020-02-04 11:50:44 +00:00
luisramos0
7009cd89e0
Fix rubocop issues in customer details controller and update rubocop manual todo accordingly
2020-02-04 11:50:44 +00:00
luisramos0
b93af37ea9
Merge customer details decorator with controller
2020-02-04 11:50:03 +00:00
luisramos0
76b6a85509
Merge spree/admin/orders_controller and its decorator and fix a few rubocop issues
2020-02-04 11:50:03 +00:00
