Pau Pérez Fabregat
51f63060a4
Merge pull request #6879 from coopdevs/customer-balance-bulk-coop-report
...
Customer balance bulk coop report
2021-03-17 12:08:44 +01:00
Andy Brett
0d364c6b69
Merge pull request #7110 from Matt-Yorkley/payment-capture-error
...
Fix payment capture handling in Api::OrdersController
2021-03-16 10:41:43 -07:00
Matt-Yorkley
2ba6a3cc23
Merge pull request #7133 from coopdevs/fix-env-deprecation
...
Fix `env` deprecated in Rails 5.0
2021-03-16 18:29:40 +01:00
Andy Brett
e8a256ecc5
Merge pull request #7132 from Matt-Yorkley/reload-deprecations
...
Replace deprecated use of :reload argument
2021-03-16 09:31:24 -07:00
Pau Perez
57101aa5b6
Fix env deprecated in Rails 5.0
...
I found it at the very bottom of the `test-consumer-features` CI build
job. See: https://github.com/rails/rails/issues/23294 .
2021-03-16 15:12:44 +01:00
Matt-Yorkley
5e8d231c49
Merge pull request #7113 from coopdevs/fix-reload-deprecation-on-user-112
...
Fix deprecation warning related to #reload
2021-03-16 14:25:18 +01:00
Matt-Yorkley
80a654cef1
Merge pull request #6938 from Matt-Yorkley/paypal-adjustments-coverage
...
[Adjustments] Paypal adjustments test coverage
2021-03-16 13:16:07 +01:00
Matt-Yorkley
2d9d293405
Replace deprecated use of :reload argument
2021-03-16 12:04:35 +00:00
Pau Perez
6fae80bb04
Fix deprecation warning related to #reload
...
This fixes:
```
DEPRECATION WARNING: Passing an argument to force an association to
reload is now deprecated and will be removed in Rails 5.1. Please call
`reload` on the result collection proxy instead. (called from
can_own_more_enterprises? at /usr/src/app/app/models/spree/user.rb:112)
```
This method in particular gets called a lot of times so it'll have it's
cost in performance.
2021-03-16 08:01:25 +01:00
Matt-Yorkley
c045efb89d
Merge pull request #7112 from Matt-Yorkley/admin-adjustments-controller
...
Ensure order association is set correctly when adding admin adjustments
2021-03-15 16:51:10 +01:00
Matt-Yorkley
657291df90
Update order total when editing admin adjustments
2021-03-15 11:46:14 +00:00
Matt-Yorkley
3219ea231d
Ensure order association is set correctly when adding admin adjustments
2021-03-15 11:18:14 +00:00
Matt-Yorkley
5354c63d9a
Fix payment capture handling in Api::OrdersController
...
Fixes:
NoMethodError: undefined method `t' for #<Api::OrdersController:0x0000000013834290>
Location
app/controllers/api/orders_controller.rb:50 - payment_capture_failed
2021-03-15 10:36:07 +00:00
Pau Pérez Fabregat
71aec23c0d
Merge pull request #7064 from coopdevs/abstract-order-balance
...
Abstract order balance in a simple PORO
2021-03-15 11:35:45 +01:00
Andy Brett
b7f9fb8d72
send full redirect URL to stripe
2021-03-13 10:58:33 +00:00
Matt-Yorkley
707d089419
Update type handling in PaymentMethodsController and add tests
2021-03-13 10:57:54 +00:00
Matt-Yorkley
6d51ece69c
Tidy up payment method params
2021-03-13 10:57:51 +00:00
Matt-Yorkley
6bb85e9acd
Fix payment and shipment states issue
...
For some reason the order objects were stale here when calling order.update! from either a payment or shipment callback, which was overwriting those states as nil on the order.
2021-03-11 12:23:00 +00:00
Matt-Yorkley
04a13a4f6f
Update Boolean typecasting to Rails 5 version
2021-03-11 12:23:00 +00:00
Matt-Yorkley
6c00fe44ae
Revert order permissions changes
2021-03-11 12:19:55 +00:00
Matt-Yorkley
25139178b5
Fix appending to collection (take 2)
2021-03-11 12:19:55 +00:00
Matt-Yorkley
4542a3464e
Fix params in Admin::ProductsController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
4c2871e572
Refactor and fix params issues in Admin::OrderCyclesController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
64b52527fd
Fix params issues in Admin::SubsciptionsController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
bbbce4e6c9
Fix params issues in Api::EnterprisesController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
c2c8dbfb38
Add strong params in Api::ExchangeProductsController and deal with boolean issue
2021-03-11 12:19:55 +00:00
Matt-Yorkley
aea8d1dc99
Fix appending to Relation in in EnterpriseFeesController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
e11d1e6cdb
Add strong params to Spree::Admin::SearchController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
6087a4b969
Fix rendering of javascript template
...
The erb tags in this partial were not being parsed as erb, breaking various other things on the page.
2021-03-11 12:19:55 +00:00
Matt-Yorkley
688b3c98d7
Use strong params in variants search
2021-03-11 12:19:55 +00:00
Matt-Yorkley
4ff56ce625
Update deprecated use of #uniq in OrderCyle scopes
2021-03-11 12:19:55 +00:00
Matt-Yorkley
ccf0556711
Fix params mangling in Admin::EnterprisesController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
190770b9df
Update query filter params handling
2021-03-11 12:19:55 +00:00
Matt-Yorkley
bd408e02b0
Update OrderCyclesController params usage
2021-03-11 12:19:55 +00:00
Matt-Yorkley
0393ea4219
Update variant params in CartController
2021-03-11 12:19:55 +00:00
Matt-Yorkley
1911d25959
Fix Sets::ModelSet spec
2021-03-11 12:19:54 +00:00
Matt-Yorkley
2ac4ace3e8
Fix params issues in UserPasswordsController
2021-03-11 12:19:54 +00:00
Matt-Yorkley
dcecfaea87
Fix params issues in OrderCyclescontroller spec
2021-03-11 12:19:54 +00:00
Matt-Yorkley
31df28b348
Fix params mangling in Api::ProductController
2021-03-11 12:19:54 +00:00
Matt-Yorkley
f28cd4a4e5
Adapt checkout FormDataAdapter
2021-03-11 12:06:00 +00:00
Matt-Yorkley
5e3d646f8c
Fix params access in reports views
2021-03-11 12:06:00 +00:00
Matt-Yorkley
dcf982c1c3
Fix params mangling issues in SubscriptionsController
2021-03-11 12:06:00 +00:00
Matt-Yorkley
af8d497433
Fix handling of params in variant overrides bulk update actions
2021-03-11 12:06:00 +00:00
Matt-Yorkley
7bf4f88034
Fix params issues in Api::TaxonsController
2021-03-11 12:06:00 +00:00
Matt-Yorkley
0f1142b5c4
Fix more broken specs related to accessing params hash
2021-03-11 12:06:00 +00:00
Matt-Yorkley
ed09db6003
Fix broken specs related to accessing params hash
2021-03-11 12:06:00 +00:00
Matt-Yorkley
c5a47b51a6
Update order totals during CheckoutController#update
2021-03-11 11:20:01 +00:00
Matt-Yorkley
90712647b1
Update totals when processing a return
2021-03-11 11:20:01 +00:00
Matt-Yorkley
4c64aaed77
Remove callbacks in Adjustment that call order.update!
2021-03-11 11:20:01 +00:00
Matt-Yorkley
791a47d170
Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost
...
[Adjustments] Move shipping adjustment from order to shipment
2021-03-11 12:17:14 +01:00
