Andy Brett
6fdcd6218d
add remove_shop_authorizations method to controller
2020-12-08 07:46:10 -08:00
Luis Ramos
0f27f57cbb
Use new Admin::ResourceController
2020-12-03 15:32:20 -08:00
Luis Ramos
0fb9f44dda
Make all controllers use new Admin::ResourceController
2020-12-03 15:32:20 -08:00
Luis Ramos
99fd99cd33
Move spree admin resource controller to admin resource controller
2020-12-03 15:32:20 -08:00
Luis Ramos
6e08fccbbe
Merge resource_controller url helpers with parent version
2020-12-03 15:32:20 -08:00
Luis Ramos
fc4cf6a9a7
Merge resource_controller model_class method with parent version
2020-12-03 15:32:20 -08:00
Luis Ramos
de19efca64
Fix rubocop issue and add missing exceptions to manual_todo to get a green rubocop run
2020-12-03 06:38:24 -08:00
Matt-Yorkley
7408c45980
Merge pull request #6297 from openfoodfoundation/rails-4-1
...
[Rails 4.1] Merge Rails 4.1 branch into master
2020-12-01 10:56:08 +01:00
Pau Pérez Fabregat
07a72eccd4
Merge pull request #6391 from Matt-Yorkley/paypal-stock-clashes
...
Paypal stock clashes
2020-11-27 17:08:15 +01:00
Matt-Yorkley
ea5c7c5990
Fix broken redirect after bulk product update
...
Error:
As an Administrator
I want to be able to manage products in bulk
updating when a filter has been applied
Failure/Error: expect(page.find("#status-message")).to have_content "Changes saved."
expected to find text "Changes saved." in "Saving.."
# ./spec/features/admin/bulk_product_update_spec.rb:451:in `block (2 levels) in <top (required)>'
2020-11-27 14:00:29 +00:00
Luis Ramos
3ebc8145df
Avoid calling update with nil values
2020-11-27 13:59:46 +00:00
Luis Ramos
6814eb663f
Fix respond_with error
2020-11-27 13:59:46 +00:00
Matt-Yorkley
3bfa903912
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
2020-11-27 14:11:57 +01:00
Matt-Yorkley
0ba670b180
Ensure order is cleanly reset to cart state when redirecting to cart
2020-11-27 11:42:46 +00:00
Matt-Yorkley
2fa2a30c67
Add spec coverage, refactor, avoid double-render errors
...
👍
2020-11-22 18:37:31 +00:00
Matt-Yorkley
cabec7e73f
Fix Rubocop warnings and tidy up
2020-11-22 18:02:54 +00:00
Matt-Yorkley
87df44764f
Extract stock-check logic to controller concern and inject prior to final Paypal payment confirmation.
2020-11-22 18:02:52 +00:00
Andy Brett
85d99f3bf2
Merge branch 'master' into controllers
2020-11-20 08:12:03 -08:00
Matt-Yorkley
010c1c799d
Add some notes on paypal checkout flow
2020-11-18 14:55:29 +00:00
Matt-Yorkley
2faea65f82
Bring in Spree::PaypalController#confirm method
...
Original method from the gem. This handles the post-payment response from paypal.
2020-11-18 14:51:23 +00:00
Matt-Yorkley
dd8f139c1b
Memoize Spree::PaypalController#payment_method
...
This gets called 4 or 5 times in a single request just to read basic attributes from the object. The query doesn't need to be repeated each time
2020-11-18 13:45:14 +00:00
Matt-Yorkley
6d0d4b5096
Bring in Spree::PaypalController#payment_method
...
Original method from the gem. Modified in preceding commit.
2020-11-18 13:45:13 +00:00
Matt-Yorkley
0b18b0dc0a
Include Calculator attributes in PaymentMethod nested attributes and DRY repeated code
2020-11-17 19:04:26 +00:00
Matt-Yorkley
36f4f40e84
Refactor and fix PaymentMethod strong params
2020-11-17 18:51:48 +00:00
Andy Brett
17202ff39c
move gateway_error require to lib/spree/core.rb
2020-11-10 14:55:56 -08:00
Luis Ramos
c785d0d1d7
Make engine's routes append to main app instead of prepend
2020-11-04 12:15:45 +00:00
Luis Ramos
09aef524f3
Make route helpers use spree helper
2020-11-04 12:15:45 +00:00
Luis Ramos
1b4a4a8113
Bring code from spree_paypal_express to make it use spree url_helper
2020-11-04 12:15:45 +00:00
Luis Ramos
c9972189d0
Change usage of Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:56:59 +00:00
Luis Ramos
66ba9ff73d
Move Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:51:37 +00:00
Luis Ramos
55e8dace44
Fix sort_by issue on relation by calling to_a
2020-10-30 10:12:56 +00:00
Luis Ramos
7b06fdd943
Convert to array before using sort_by!
2020-10-30 10:12:56 +00:00
Andy Brett
57fe1db10e
guard against nil params[:available_units]
2020-10-29 09:18:24 -07:00
Andy Brett
18d2599075
indicate block argument is unused
2020-10-29 09:18:24 -07:00
Andy Brett
292b33b4ea
simplify available units params (and remove regex!)
2020-10-29 09:18:24 -07:00
Andy Brett
c9b540677c
refactor general settings controller to handle available_units params
2020-10-29 09:17:49 -07:00
Andy Brett
cb3ea133e9
add available units to instance prefs page
2020-10-29 09:17:31 -07:00
Matt-Yorkley
489529d30e
Merge pull request #5729 from luisramos0/image_settings
...
Remove Image settings page and standardise Paperclip styles
2020-10-22 15:58:14 +02:00
Luis Ramos
032075c04a
Merge pull request #6119 from arku/chore/fire-event-removal
...
Remove fire_event method usage
2020-10-21 21:21:35 +01:00
Luis Ramos
b267f542d1
Merge pull request #5980 from luisramos0/spree_clean_up
...
[Bye bye spree] Some clean up fixes to make it all work without spree
2020-10-20 18:52:54 +01:00
Luis Ramos
0f06195baa
Remove Image settings page, these settings will come from ofn-install now
2020-10-20 11:20:37 +01:00
Arun Kumar Mohan
b0fa1464f8
Remove fire_event method usage
2020-10-18 20:36:38 -05:00
Maikel
8c65498661
Merge pull request #5998 from andrewpbrett/shipping-per-pound
...
Per-pound shipping calculator
2020-10-16 15:27:57 +11:00
Luis Ramos
0100963a39
Delete dead code brought from spree
2020-09-26 21:16:27 +01:00
Andy Brett
fdb1019ee2
fix styles per rubocop
2020-09-17 16:41:49 -07:00
Luis Ramos
1a513567f2
Fix easy rubocop issues
2020-09-17 13:59:41 +01:00
Luis Ramos
1df7890a0d
Use spree url_helpers
2020-09-17 13:59:41 +01:00
Luis Ramos
d5d62894a5
Use spree url helpers
2020-09-17 13:59:41 +01:00
Luis Ramos
66f27aad32
Explicitly use spree url helpers for spree routes
2020-09-17 13:59:41 +01:00
Luis Ramos
e0cb7a29bf
Add helper prefix to helper calls
2020-09-17 13:58:45 +01:00
