luisramos0
fb65c64c68
Keep the ship_address clearing logic (this time reusing the OrderUpdate method) thus making the restart_checkout process work for these cases (because order.ship_address is not empty)
...
OrderUpdater#shipping_address_from_distributor uses order.address_from_distributor to set order.ship_address when order is not delivery: this will clear the ship address as it was done previously without setting an empty address like Spree::Address.default
2019-09-09 22:05:20 +01:00
luisramos0
cc7461e692
Remove clear_ship_address from checkout_controller because it is setting an empty address on order.ship_address which is breaking the reset_checkout process in some cases.
...
This logic is already repeated in the before_save hook in the OrderUpdater where the distributor address is put into the ship_address on order.finalize
In cases the order is not to be finalized we keep the ship_address sent from the client as we may need it to make the order workflow work properly
2019-09-09 17:48:17 +01:00
luisramos0
8efd69c3d1
Remove unnecessary checkout registration code, it's not used in OFN
2019-07-08 12:57:17 +01:00
luisramos0
02b9fca620
Remove unused spree checkout and spree cart routes
2019-06-18 10:49:19 +01:00
luisramos0
56db90f49e
Remove unused checkout controller update action and order controller populate action
...
Additionally, remove routes of these actions as well as routes already defined in routes.rb (checkout and cart)
2019-06-18 10:47:34 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
luisramos0
4a67acf954
Removing a few rubocop warnings
2019-05-28 12:55:17 +01:00
luisramos0
d602375ac7
Redirect user to cart page if some item in the order is unavailable
2019-04-13 20:31:05 +01:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
luisramos0
4f4fc00549
Improve code, specs and comments in the shipping_method selection process in the checkout controller
2018-12-09 20:05:10 +00:00
luisramos0
7a8c65b3ea
In the checkout controller update process, grab shipping_method_id from form data and inject it in the order when the order workflow gets to delivery (which is when the order gets shipments created)
2018-11-30 10:46:31 +00:00
luisramos0
c032401eb0
Refactor checkout controller update method
2018-11-30 10:45:42 +00:00
Pau Perez
453b2a99de
Rename redundant #restart_checkout to #call
2018-11-23 12:05:39 +01:00
Pau Perez
3b681a59ba
Move controller tests to service class tests
2018-11-23 12:04:42 +01:00
Pau Perez
a62a2cb52f
Extract #restart_checkout to a service
2018-11-23 12:04:42 +01:00
Maikel Linke
561a73e911
Pass on redirect path instead of URL
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2376
The checkout doesn't deal with absolute URLs since
fc2cc09ea5
2018-06-14 16:49:52 +10:00
Pau Perez
6593dea4f6
Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop
2018-04-09 18:47:17 +02:00
Pau Perez
3161fa3801
Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop
2018-04-09 18:47:17 +02:00
Rob Harrington
4a0dab3608
Renaming LastUsedAddress as AddressFinder
2018-02-09 14:43:59 +11:00
Rob Harrington
1b72b7258d
Refactoring LastUsedAddress to take customers or users
2018-02-09 14:43:58 +11:00
Rob Harrington
1fcbf6b44d
Clear shipping_method_id from order when restarting checkout
...
If the order is allowed to retain a shipping_method_id, then subsequent
saves of the order will cause a new shipment to be initialised. Seems to
only happen for delivery shipping methods. This is undesirable because
fees for the new shipment will appear in the checkout summary, which is
not smart enough to recognise existing shipment fees and adjust the order
total accordingly.
2017-10-13 12:53:35 +11:00
Rob Harrington
c031b0e52b
Clear shipments and payments after failed payment at checkout
2017-10-13 12:53:35 +11:00
Rob Harrington
61feb2b27d
Rename Stripe existing_card param key to existing_card_id
2017-09-23 14:58:34 +10:00
Rob Harrington
5c58d30ca7
Create payment from user-specified payment method when using existing card
2017-09-23 14:58:33 +10:00
Rob Harrington
ae2d3d3fd9
Refactoring StripeHelper into service objects
2017-09-23 14:58:32 +10:00
Rob Harrington
64009a2c9e
CheckoutController can render payment gateway error messages as json
2017-09-23 14:58:32 +10:00
Rob Harrington
269a60b36f
Adding request specs for case when using an existing card stored by Stripe for payment
2017-09-23 14:58:32 +10:00
stveep
c4f9a5a234
Add code to CheckoutController to construct card attributes when using an existing card (via a818fbbecd/core/app/models/spree/order/checkout.rb:212)
2017-09-23 14:58:31 +10:00
Rob Harrington
131d9384c2
Use flash.notice instead of flash.success to display order confirmation message
...
This way it overwrites any message that is set from spree, rather than displaying duplicate messages
2017-09-23 14:25:55 +10:00
Pau Perez
3a9b71bd1f
Add doc to methods and classes [skip ci]
2017-09-08 23:55:50 +10:00
Enrico Stano
62c5ccf904
Address CodeClimate complains
2017-09-08 23:55:50 +10:00
Pau Perez
e087a008c2
Reduce coupling from controller
2017-09-08 23:55:50 +10:00
Pau Perez
4c4969e86b
Do not couple with controller's ivar and session
2017-09-08 23:55:50 +10:00
Pau Perez
bdfd718c51
Use service object directly from controller
2017-09-08 23:55:50 +10:00
Pau Perez
3c73282d57
Manually reset the order once completed
...
Spree does not call after_<order.state> methods any more as of
https://github.com/spree/spree/pull/2557 , so our #after_complete method
is never triggered and thus the order never reset.
This makes the condition:
```ruby
if current_order.andand.distributor == @order.distributor
```
in app/views/spree/orders/form/_update_buttons.html.haml return false
and as a result the "Back To Cart" button is not shown.
This commit resets the order (emptying the session[:order_id] and
creating a new order, aka. cart) right from the
CheckoutController#update rather than relying on infernal callbacks (of
what the Spree core team itself was unhappy about since long ago
https://github.com/spree/spree/issues/2488 ). There is the first place
where we know the order has been successfully completed.
2017-09-08 23:55:50 +10:00
enricostano
4e35c0448b
Use the state machine API to add state transition callbacks
...
See the following links for more context:
http://guides.spreecommerce.org/release_notes/spree_2_0_0.html#removal-of-checkoutcontrollerstatecallback
1d9581c884
2017-09-08 23:55:49 +10:00
enricostano
c439a23ef9
Adapt CheckoutController to new Spree changes
...
Freely inspired by ad5551bf84
2017-09-08 23:55:49 +10:00
Matt-Yorkley
113f6565be
Enable iframes for embedded shopfronts
2017-07-26 13:56:36 +10:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Rob Harrington
e5340cb53a
Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Rob Harrington
b59a1cc232
Using true/false instead of YES/NO for address defaults and billing same as shipping
2016-10-21 10:51:36 +11:00
Bing Xie
720ca17533
Fix the mistake
2016-10-21 10:51:36 +11:00
Bing Xie
77f43e3ca7
Refactor setting default addresses
2016-10-21 10:51:36 +11:00
Bing Xie
23b8fbbbc7
Update customer's default address
2016-10-21 10:51:36 +11:00
Bing Xie
079788b4eb
Add customer preferred bill and ship address
2016-10-21 10:51:36 +11:00
Bing Xie
8d534041b2
Refactor js CurrentOrder
2016-10-21 10:51:36 +11:00
Bing Xie
e91c313f1e
Fix state_id and country_id type bug
2016-10-21 10:51:36 +11:00
Bing Xie
2f241485a2
Set default addresses for user or customer
2016-10-21 10:51:36 +11:00
Bing Xie
3e590f92ff
Set default billing address and shipping address
2016-10-21 10:51:36 +11:00
