Matt-Yorkley
48a7cfa09e
Fix more deprecated keyword arguments
2022-01-24 14:11:08 +00:00
Filipe
1ddff2c4bf
Merge pull request #8678 from Matt-Yorkley/dead-code-js-uri
...
Remove outdated jsUri
2022-01-24 13:15:02 +00:00
Filipe
1120e4e460
Merge pull request #8759 from jibees/8547-use-the-last-payment-in-the-Payment-Method-Report
...
Use the last payment method instead of the first for the Payment Method Report
2022-01-24 12:51:08 +00:00
Filipe
f17226ffbe
Merge pull request #8438 from cillian/show-out-of-stock-line-items
...
If an order has out of stock line items display them and let admins remove them
2022-01-24 12:18:19 +00:00
Matt-Yorkley
0f154de235
Use OrderCompletion in split checkout for #order_completion_reset
2022-01-19 17:51:03 +00:00
Filipe
2e85783465
Merge pull request #8731 from Matt-Yorkley/split-checkout-default-addresses
...
Split checkout: default address saving
2022-01-19 17:43:51 +00:00
Filipe
7444e2d2f3
Merge pull request #8741 from Matt-Yorkley/guest-checkout-login
...
Fix split checkout guest user login
2022-01-19 16:43:24 +00:00
Matt-Yorkley
2b960a04c6
Move Order callback entirely into service
2022-01-19 13:40:33 +00:00
Matt-Yorkley
8a944e3e78
Tidy up Order#save_default_addresses
2022-01-19 13:40:33 +00:00
Matt-Yorkley
8f37aa71f2
Save default addresses when requested during checkout
2022-01-19 13:40:33 +00:00
Matt-Yorkley
fb00a51ae8
Merge pull request #8653 from Matt-Yorkley/split-checkout-t-and-c
...
Split checkout T&Cs
2022-01-19 13:39:15 +00:00
Matt-Yorkley
21ed136e00
Enable opening login modal via broadcasted DOM Event
2022-01-19 13:14:10 +00:00
Matt-Yorkley
8ce27bed86
Move guest checkout handling to the frontend
2022-01-19 13:14:10 +00:00
Jean-Baptiste Bellet
8455d79f9b
Use the last payment method instead of the first for the Payment Method Report
2022-01-18 20:35:08 +01:00
Matt-Yorkley
7c2b3cdf51
Fix param whitelisting
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-01-18 09:14:55 +00:00
Filipe
067f90b17c
Merge pull request #8712 from Matt-Yorkley/oc-mails
...
OC notifications
2022-01-17 20:30:40 +00:00
Filipe
8114eb1c9f
Merge pull request #8666 from openfoodfoundation/stripe-controller
...
Extract new StripeController
2022-01-17 20:21:40 +00:00
Filipe
62f0de75ee
Merge pull request #8679 from Matt-Yorkley/drop-jquery-ujs
...
Drop jquery_ujs
2022-01-17 16:30:25 +00:00
filipefurtad0
e7aa19c95d
Fixes translation/rendering inconsistency on Country label(step 3)
2022-01-15 19:43:57 +00:00
Matt-Yorkley
c209be9c17
Clarify params
...
Spree::Order.to_param outputs the order *number* (not the id) when used to build URLs. This makes it a bit more explicit.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
12f7fc98fa
Move payment authorization to StripeController
...
This Stripe-payment-authorizing logic is used by backoffice and subscriptions orders (but not the checkout), and was previously being handled by the #show action in Spree::OrdersController. It involves the user being redirected back to OFN after visiting a Stripe URL.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
6c2b623f8b
Tidy up OrderController
2022-01-14 19:41:08 +00:00
Matt-Yorkley
c65beae869
Extract some methods and move to simpler callbacks with guard clauses
2022-01-14 19:41:08 +00:00
Matt-Yorkley
c4d55feac8
Extract #last_payment
2022-01-14 19:41:08 +00:00
Matt-Yorkley
ddf6e7eadd
Use proper module/namespace
2022-01-14 19:41:08 +00:00
Matt-Yorkley
410485fbf4
Use #order_failed_route in #process_order_completion!
2022-01-14 19:41:08 +00:00
Matt-Yorkley
072f4f4c60
Use new stripe confirm path and remove dead code
2022-01-14 19:41:08 +00:00
Matt-Yorkley
3f3bfadb59
Simplify StripeScaPaymentAuthorize and clarify both return URL types (checkout and off-session)
2022-01-14 19:41:08 +00:00
Matt-Yorkley
789c29f678
Extract #load_checkout_order
2022-01-14 19:41:08 +00:00
Matt-Yorkley
daee5b49b5
Extract #process_payment_completion!
2022-01-14 19:41:08 +00:00
Matt-Yorkley
76647863e8
Add new Stripe controller
2022-01-14 19:41:08 +00:00
Matt-Yorkley
28d89103eb
Extract #gateway_error
2022-01-14 19:41:08 +00:00
Matt-Yorkley
7633255bea
Extract #order_failed_route
2022-01-14 19:41:08 +00:00
Matt-Yorkley
414e1eb299
Tidy up OrdersController#load_order
2022-01-14 19:41:08 +00:00
Matt-Yorkley
6385d9a782
Simplify interface of #order_completion_route
2022-01-14 19:41:08 +00:00
Matt-Yorkley
7cbdb7c1a2
Remove paypal-specific workaround from OrdersController
...
The previous commit means this is no longer needed here.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
1b459b2491
Extract #processing_failed
2022-01-14 19:41:08 +00:00
Matt-Yorkley
c1defdb1ff
Extract #order_processing_error
2022-01-14 19:41:08 +00:00
Matt-Yorkley
5c44614a8d
Extract and standardise payment/checkout #processing_succeeded
2022-01-14 19:41:08 +00:00
Matt-Yorkley
96f30133a7
Don't reset order for split checkout
...
The various places where we "reset" an order to cart state if a checkout submission does not succeed are an artifact of the process-all-the-steps-at-once approach of the current checkout.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
1e21a6a32f
Extract and standardise use of #handle_insufficient_stock
2022-01-14 19:41:08 +00:00
Matt-Yorkley
b6cf6483f2
Extract and standardise use of order loading around checkout processing
2022-01-14 19:41:08 +00:00
Matt-Yorkley
4d6c4f850f
Remove pointless callbacks in CheckoutController
...
These exact same checks are already made in #load_order (and #order_invalid_for_checkout?), which is called before these other two (later) callbacks.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
77d89ec7d0
Extract and standardise use of #order_completion_route
2022-01-14 19:41:08 +00:00
Matt-Yorkley
4c1fc2b326
Standardise use of #order_completion_reset
2022-01-14 19:41:08 +00:00
Matt-Yorkley
124b63fad0
Remove unused flash assignment
2022-01-14 19:41:08 +00:00
Matt-Yorkley
01bd77e437
Remove duplicate translation key
2022-01-14 19:41:08 +00:00
Matt-Yorkley
e58b1b1094
Tidy up before and after callbacks
2022-01-14 19:41:08 +00:00
Matt-Yorkley
9b6d4da8d5
Pull related lines into OrderCompletion#order_completion_reset
2022-01-14 19:41:08 +00:00
Matt-Yorkley
02995530e2
Pull apart OrderCompletionReset service
2022-01-14 19:41:08 +00:00
