Andy Brett
a745fceb53
Merge pull request #6469 from andrewpbrett/sca-backend
...
Allow SCA cards to be setup and charged offline for subscriptions
2020-12-11 14:23:12 -08:00
Andy Brett
3b7313f7e3
add spec for deleting the default card
2020-12-10 12:31:58 -08:00
Andy Brett
655512adab
add missing require statements
2020-12-10 12:17:42 -08:00
Andy Brett
8c747e4812
refactor destroy_clones to separate class
2020-12-10 11:22:02 -08:00
Andy Brett
22ef9a0fef
fix long line
2020-12-08 14:37:16 -08:00
Andy Brett
7a03882314
re-refactor cart_service
2020-12-08 14:37:16 -08:00
Andy Brett
b713bd7aa7
spec updates
2020-12-08 14:37:16 -08:00
Andy Brett
c70ea44091
show specific error message when add-to-cart fails
2020-12-08 14:37:16 -08:00
Andy Brett
9c544ef2f4
remove cloned cards after removing the platform card
2020-12-08 07:52:42 -08:00
Andy Brett
bc3fd8c50c
remove unused method
2020-12-08 07:52:42 -08:00
Andy Brett
277d7f44b7
refactor api customers controller; resolve merge conflict
2020-12-08 07:52:42 -08:00
Andy Brett
a466886a32
fix rubocop warnings
2020-12-08 07:52:42 -08:00
Andy Brett
cad8a018f9
put SetupIntent on the connected Stripe account
2020-12-08 07:52:41 -08:00
Andy Brett
215d1bbe20
create js setup intent when authing shop
2020-12-08 07:52:41 -08:00
Andy Brett
b517d2f0c7
guard against a stripe customer already being deleted
2020-12-08 07:52:41 -08:00
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
1d327a61a6
Fix rubocop issue and adapt rubocop exceptions
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
c63d99dd20
Remove Spree namespace from controller
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
1d075bbc90
Remove empty 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
c6c20dc0f6
Add ActionController::ConditionalGet to Api::BaseController
...
This was added in Spree around the time of Rails 4.2 and seems to fix some of the response errors around the `responders` gem.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
60aaf8100a
Fix some Rubocop offences
2020-11-27 14:00:29 +00: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
Matt-Yorkley
3c74541145
Fix misbehaving params in Api::ProductsController
...
In some cases the given params were being deleted here.
2020-11-27 14:00:29 +00:00
Matt-Yorkley
aaf7a90f8b
Convert OrderCycleNotificationJob to ActiveJob
2020-11-27 14:00:29 +00:00
Matt-Yorkley
3cba9a16aa
Use ActionController::Base for Api::BaseController
...
It looks like ActionController::Metal does not play nicely with the big changes to controller responders: https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#responders
2020-11-27 14:00:28 +00:00
Matt-Yorkley
54a4952dc5
Fix ForbiddenAttributesError on tag rules
2020-11-27 14:00:28 +00:00
Matt-Yorkley
34bfd877cc
Fix #bulk_update in EnterprisesController
2020-11-27 14:00:28 +00:00
Matt-Yorkley
ccaff08928
Re-add ForbiddenAttributesError debugging helper
2020-11-27 14:00:28 +00:00
Matt-Yorkley
fb333c37e7
Fix Api controller setup for responders gem
2020-11-27 14:00:28 +00:00
Matt-Yorkley
3090cfa909
Add setup for responders gem
2020-11-27 14:00:28 +00:00
Luis Ramos
ff8d935699
Fix problem in enterprises controller
2020-11-27 13:59:46 +00:00
Matt-Yorkley
5c5a6361bf
Fix nasty json encoding issue
...
The enterprise id returned by these json endpoints was being returned in *unicode* format, so where Angular was expecting a simple integer it was instead getting strings like: "\u0017"
2020-11-27 13:59:46 +00:00
Matt-Yorkley
0f2cbe8a52
Fix API exception response handling
...
For some reason when using `render text:` instead of `render json:` for this response, the status code being returned was 200 instead of the clearly explicitly defined 422 (:unprocessable_entity). I absolutely have no idea why!
2020-11-27 13:59:46 +00:00
Matt-Yorkley
f1002b953d
Disable Javascript CSRF protection on EnterprisesController#check_permalink route
...
This route checks if an enterprise permalink is taken or not. Allowing the route to be accessed via Javascript without strict CSRF protection is reasonable. Fixes the following errors:
ActionController::InvalidCrossOriginRequest: Security warning: an embedded <script> tag on another site requested protected JavaScript. If you know what you're doing, go ahead and disable forgery protection on this action to permit cross-origin JavaScript embedding.
2020-11-27 13:59:46 +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
Eduardo
a8a933d73a
change from render json to render plain due to template missing issue
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
