Pau Pérez Fabregat
325ccdd8d5
Merge pull request #7208 from mkllnk/7130-double-processing-payment
...
Avoid double processing payment
2021-03-29 13:36:21 +02:00
Matt-Yorkley
0f5af2d9f1
Merge pull request #6927 from Matt-Yorkley/adjustments-payment-fee
...
[Adjustments] Payment fee adjustment
2021-03-25 17:40:53 +01:00
Matt-Yorkley
cbd7c9f4c0
Update adjustments controller collection scope
2021-03-25 15:02:02 +00:00
Pau Perez
ead1ab31b4
Fix multiple N+1 on /admin/customers.json
...
This (should) considerably improve traces like
https://app.datadoghq.com/apm/trace/917632173599137280?spanID=3163385094622710144&env=production&sort=time&colorBy=service&spanViewType=metadata&graphType=flamegraph&shouldShowLegend=true
by fixing the following 3 N+1s
```
user: root
GET /admin/customers.json?enterprise_id=4
USE eager loading detected
Customer => [:enterprise]
Add to your query: .includes([:enterprise])
Call stack
/usr/src/app/app/serializers/api/admin/customer_with_calculated_balance_serializer.rb:24:in `balance_value'
/usr/src/app/app/serializers/api/admin/customer_with_calculated_balance_serializer.rb:9:in `balance'
/usr/src/app/app/controllers/admin/customers_controller.rb:20:in `block (2 levels) in index'
/usr/src/app/app/controllers/admin/customers_controller.rb:17:in `index'
user: root
GET /admin/customers.json?enterprise_id=4
USE eager loading detected
Spree::Address => [:state]
Add to your query: .includes([:state])
Call stack
/usr/src/app/app/serializers/api/address_serializer.rb:14:in `state_name'
/usr/src/app/app/controllers/admin/customers_controller.rb:20:in `block (2 levels) in index'
/usr/src/app/app/controllers/admin/customers_controller.rb:17:in `index'
user: root
GET /admin/customers.json?enterprise_id=4
USE eager loading detected
Spree::Address => [:country]
Add to your query: .includes([:country])
Call stack
/usr/src/app/app/serializers/api/address_serializer.rb:10:in `country_name'
/usr/src/app/app/controllers/admin/customers_controller.rb:20:in `block (2 levels) in index'
/usr/src/app/app/controllers/admin/customers_controller.rb:17:in `index'
```
This popped up after improving the balances calculation. Now, that it's
fast, it's clear that are more performance problems on that endpoint.
We'll see if there are any left after this.
2021-03-25 11:19:00 +01:00
Maikel Linke
4d242af007
Use pessimistic locking processing Stripe payment
...
We used pessimistic locking around the `update` action already but when
Stripe redirects back to us we complete the payment in the `edit` action.
2021-03-25 15:17:30 +11:00
Andy Brett
afa7269f48
Merge branch 'master' into render_plain
2021-03-18 10:53:13 -07:00
Andy Brett
97a63edf50
Merge pull request #7096 from luisramos0/rails-5-2-helper
...
Rails 5.2 add T&Cs helper
2021-03-18 08:16:12 -07:00
Matt-Yorkley
3ed8dbe3b3
Merge pull request #7146 from Matt-Yorkley/deprecations
...
Deprecations
2021-03-18 11:25:14 +01:00
Andy Brett
b8629e847c
Merge pull request #7014 from andrewpbrett/canceled-order-payments
...
Add resumed to list of allowable order states to view the payment tab
2021-03-17 10:46:51 -07:00
Matt-Yorkley
826515874b
Replace some uses of #alias_method_chain
2021-03-17 16:28:19 +00:00
Luis Ramos
c4c5bbc9a3
Adapt helpers to rails 5.2
2021-03-16 23:37:24 +00:00
Luis Ramos
f55150745e
Add checkout helper to checkout controller
2021-03-16 23:37:24 +00:00
Luis Ramos
d4cbf47226
Add T and Cs helper to checkout controller
2021-03-16 23:37:24 +00:00
Luis Ramos
cb8fd2131e
Use body: nil instead of deprecated nothing:
...
Ideally we would be using render head status but it's issuing quite a lot of double render problems, we can improve later
2021-03-16 23:13:58 +00:00
Luis Ramos
53d758ca21
Replace render text with render plain for rails 5.1
2021-03-16 23:13:58 +00: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
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
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
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
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
04a13a4f6f
Update Boolean typecasting to Rails 5 version
2021-03-11 12:23:00 +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
688b3c98d7
Use strong params in variants search
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
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
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
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
