Luis Ramos
b5cdcdf8cb
Permit specific params in products controller
2020-03-21 19:14:26 +00:00
Luis Ramos
5b37e89738
Handle strong params in variant_overrides_controller
...
We use a simpler way to permit on array within params here and change products_controller to the same style
2020-03-21 19:14:26 +00:00
Luis Ramos
c110f4832d
Handle strong params in spree/admin/products_controller
2020-03-21 19:14:26 +00:00
Luis Ramos
aec7f12f5a
Extract common user permitted attributes to a separate class
2020-03-21 18:31:14 +00:00
Luis Ramos
d0bd2818c2
Handle strong params on users_controller
2020-03-21 18:00:04 +00:00
Luis Ramos
431076fc6d
Add strong parameters permits to admin users_controller
2020-03-21 17:59:46 +00:00
Luis Ramos
df799340df
Add missing permitted attributes to payment_methods controller
2020-03-21 14:21:52 +00:00
Luis Ramos
e5ebf45765
Improve strong params implementation on payment methods controller by specifying specific list of permitted attributes
2020-03-21 14:09:33 +00:00
Luis Ramos
38849f5589
Extract method in payments_method_controller to make it readable
2020-03-21 14:09:32 +00:00
Luis Ramos
86d09ff21e
Bring strong parameters code from spree to payment_methods_controller
...
This code comes from spree commit fbc2d150f6
2020-03-21 14:08:03 +00:00
Luis Ramos
1c628fac58
Merge branch 'master' into 3-0-stable-mar20
2020-03-20 11:28:06 +00:00
Luis Ramos
9994bc75ca
Adapt reports controller to handle routes of reports in the order_management engine differently
2020-03-20 11:07:23 +00:00
Luis Ramos
a8078b22f8
Move enterprise fees summaries controller and views to ordermanagement engine
2020-03-20 11:07:23 +00:00
Maikel
c4e4beb912
Revert "Inner join visible orders"
2020-03-19 12:01:00 +11:00
Luis Ramos
0308f1465d
Remove taxons/search action and respective rabl view
...
This is dead code
2020-03-17 15:51:26 +00:00
Luis Ramos
eccaaca907
Merge pull request #4930 from luisramos0/3-0-stable-mar6
...
Merge master into 3-0-stable
2020-03-17 14:49:30 +00:00
Luis Ramos
5da47b3f19
Merge pull request #4757 from luisramos0/stripe_sca_extra
...
StripeSCA - Handle further SCA auth request when checking out
2020-03-16 16:45:28 +00:00
Luis Ramos
1049525e50
Merge pull request #4963 from luisramos0/variants_fix
...
Fix 2 broken buttons in the product variants list page
2020-03-12 23:48:50 +00:00
Matt-Yorkley
40b8eb470c
Fix deprecation warning for use of #all
2020-03-12 19:12:06 +01:00
Luis Ramos
32a4355f09
Merge branch 'master' into 3-0-stable-mar6
2020-03-12 16:54:09 +00:00
Luis Ramos
676d949972
Make variants collection show deleted again by bypassing the default scope that removed deleted variants
2020-03-10 14:21:20 +00:00
Luis Ramos
e4d307fe5e
Remove dead code related to user management
2020-03-07 18:14:07 +00:00
Luis Ramos
0815068050
Merge branch 'master' into 3-0-stable-mar6
2020-03-06 09:20:03 +00:00
Pau Perez
461b1b26f3
Add controller tests to cover totals by supplier
2020-03-05 17:45:06 +01:00
luisramos0
1289c3f1a2
Fix rubocop issues in credit_cards_controller
2020-03-02 17:29:30 +00:00
Luis Ramos
c37218fdc5
Merge pull request #4719 from luisramos0/stripe_card_to_pm
...
Make StripeSCA payment method work with existing credit cards (the ones saved through the Stripe Charges API)
2020-03-02 17:22:07 +00:00
Luis Ramos
dad21a52b2
Merge pull request #4672 from luisramos0/stripe_sca_method
...
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Matt-Yorkley
eef1574ebe
Call #permit on params object in before_filter
2020-02-28 12:18:53 +01:00
Luis Ramos
61439a3750
Re-add paypal controller code
2020-02-28 12:18:53 +01:00
Luis Ramos
bf47d34434
Merge branch 'master' into 3-0-merge-master
2020-02-28 09:52:01 +00:00
Pau Pérez Fabregat
a396a7f0af
Merge pull request #4818 from luisramos0/delete_dead_code
...
Delete dead code after PRs 4512 and 4508
2020-02-25 13:32:23 +01:00
Matt-Yorkley
f77194875c
Add strong parameters to orders_controller.rb
2020-02-22 16:24:30 +01: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
1bdeda4a21
Delete dead code after PRs 4512 and 4508
2020-02-21 12:25:07 +00:00
luisramos0
1afd712ff4
Make StripeSCA store cards (and delete them) on the Stripe platform account and not the Stripe Connected account (the sellers accounts)
...
This is important so that cards can be re-used across sellers in OFN
2020-02-21 10:56:32 +00:00
luisramos0
b3ac5d8f41
Improve code readability a little
2020-02-21 10:52:56 +00:00
luisramos0
38fd028a9f
Fix some rubocop issues from previous commit
2020-02-21 10:52:56 +00:00
luisramos0
c7b01c37af
Fix a problem in credit cards controller spec and test case where stripe_account_id must be included in the stripe api call
2020-02-21 10:52:55 +00:00
luisramos0
1b820ea85c
Fix rubocop issues in credit_cards_controller
2020-02-21 10:52:55 +00:00
luisramos0
a52c4b542c
Make destroy stored cards work for stripe SCA by setting stripe account id before making the call to the stripe api
...
This account id cannot be sent when dealing with the old StripeConnect gateway
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
2020-02-21 10:52:29 +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
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
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
