Pau Pérez Fabregat
0d259b217e
Merge pull request #6017 from Matt-Yorkley/tidyup
...
Remove old code
2020-09-23 20:47:33 +02:00
Luis Ramos
a2610279d9
Merge pull request #5976 from luisramos0/address_form
...
Fix address state selector and "use billing address" checkbox in order customer details page
2020-09-23 12:42:37 +01:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
Matt-Yorkley
7ddc53bb5b
Remove temporary debugging helpers added during the Rails 4 upgrade.
2020-09-12 12:25:43 +01:00
Luis Ramos
9c0c324835
Add some requires now required as spree does not contain controller helpers
2020-09-04 14:30:17 +01:00
Luis Ramos
ed114f4c4c
Fix rubocop issues
2020-09-01 15:52:36 +01:00
Luis Ramos
ffa0d202be
Add states api endpoint to support existing code on the customer details page when user changes country
2020-09-01 15:46:22 +01:00
Luis Ramos
208be3ede6
Fix rubocop issues
2020-08-31 20:00:08 +01:00
Luis Ramos
66587ccc00
Allow user to remove terms and conditions file
2020-08-31 17:40:34 +01:00
Arun Kumar Mohan
bf07da6267
Fix the order resend message translation
2020-08-29 20:47:28 -05:00
Maikel
d57f20a542
Merge pull request #4925 from luisramos0/finders
...
Adapt remaining AR finders to rails 4
2020-08-28 09:46:20 +10:00
Pau Pérez Fabregat
06b41a8236
Merge pull request #5908 from Matt-Yorkley/subs-logging
...
Improve subs logging
2020-08-27 16:23:15 +02:00
Luis Ramos
4a5a6a2242
Merge pull request #5906 from Matt-Yorkley/checkout_flash_errors
...
Fix flash error issues in checkout requests
2020-08-21 13:03:30 +01:00
Luis Ramos
d1b60e3778
Merge pull request #5905 from mkllnk/lost-decorators
...
Load previously lost decorator code and don't delete orders
2020-08-21 12:34:37 +01:00
Gaetan Riou
bba683469b
add product filter parameters on the group buy options and search pages, so that the bulk import product page filters can be preserved
2020-08-21 10:39:43 +10:00
Gaetan Riou
c6e1f458cc
add product filter parameters on the various product properties pages, so that the bulk import product page filters can be preserved
2020-08-21 10:39:43 +10:00
Gaetan Riou
a6444e76a5
add product filter parameters on the various product image pages, so that the bulk import product page filters can be preserved
2020-08-21 10:29:07 +10:00
Gaetan Riou
9b26ff2fa4
move product filter helper to a service
2020-08-21 10:29:07 +10:00
Gaetan Riou
459708dbc8
add product filter parameters on the various product variants pages, so that the bulk import product page filters can be preserved
2020-08-21 10:29:07 +10:00
Gaetan Riou
f75aaf0b45
extract product filter functionality to a helper
2020-08-21 10:19:53 +10:00
Gaetan Riou
1a186affcf
refactor create and update to get rid of respond_override
2020-08-21 10:19:53 +10:00
Gaetan Riou
6e5c168d3b
add filter parameters to link leading back to bulk import product page and preserve filter parameters when updating product
2020-08-21 10:19:53 +10:00
Luis Ramos
40d4ed2c95
Merge pull request #5733 from luisramos0/base_ctrl
...
Move lib/spree to OFN
2020-08-19 18:35:17 +01:00
Maikel Linke
bb3f958dd2
Remove redundant includes
2020-08-19 10:37:18 +10:00
Matt-Yorkley
0fd163602d
Rename method for clarity
2020-08-17 11:17:42 +01:00
Luis Ramos
f8146fb946
Adapt finders to rails 4
2020-08-16 16:50:54 +01:00
Matt-Yorkley
91789494b0
Fix error: Unpermitted attribute: order_cycle_ids
2020-08-15 17:03:19 +01:00
Matt-Yorkley
2eda8789d1
Add user id logging to OrderCycle an Schedule PaperTrail entries
2020-08-15 14:49:08 +01:00
Matt-Yorkley
de22ad0000
Fix flash error issues in checkout requests
2020-08-14 12:41:56 +01:00
Maikel Linke
b79c568b08
Load our spree overrides instead of the originals
...
We changed some of Spree's logic and want to use that. And once we
remove the spree_core gem, we need to load those files before using
them.
2020-08-14 15:38:00 +10:00
Maikel Linke
5761014205
Restore Spree customisations for controllers
2020-08-13 16:59:15 +10:00
Luis Ramos
327d6c43d9
Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10
...
[Security] Bump devise from 2.2.8 to 3.5.10
2020-08-01 15:55:19 +01:00
Luis Ramos
d052a7b796
Verify the user is confirmed before returning a reset password token
...
Co-authored-by: Maikel <maikel@email.org.au >
2020-07-31 09:14:07 +01:00
Luis Ramos
7c498a573c
Make shopfront redirect work when logging out by storing it outside session data
2020-07-31 09:05:42 +01:00
Luis Ramos
0f29806198
Adapt code to devise 3.2 where the reset_password_token stored in the db is a encrypted version of the token sent in the email
...
In this particular case, the user confirmations controller is redirecting to the reset password page but it doesnt know what is the raw reset_password_token
So we regenerate the reset password token so that it can know what's the raw value for the redirect
The method User#regenerate_reset_password_token is a proxy to the protected method in Devise::Recoverable
2020-07-31 09:05:42 +01:00
Luis Ramos
9e9e0d0bd8
Remove rescue_from and just add the rescue to the edit action, the update action has a different logic where there is a generic rescue StandardError after the GatewayError rescue
2020-07-29 22:50:25 +01:00
Luis Ramos
da4abf6617
Add a comment to explain the necessity of the first rescue in the update action
2020-07-29 22:50:20 +01:00
Luis Ramos
ad00971ca8
Improve readability and add bugsnag error (now in the checkout_failed method) when checkout_fails while handling stripe redirect
2020-07-29 22:50:18 +01:00
Maikel Linke
fe0c04b650
Complete renaming of AdvanceOrderService to OrderWorkflow
2020-07-29 12:24:18 +10:00
Luis Ramos
07005594ff
Move payments persistence code to order workflow service
2020-07-28 23:56:43 +01:00
Luis Ramos
9cbcf14485
Move shipping method id setting code to OrderWorkflow service
2020-07-28 23:50:47 +01:00
Luis Ramos
c3f99050fd
Move advance_order_state from checkout_controller to OrderWorkflow service
2020-07-28 23:43:07 +01:00
Luis Ramos
26eee4631f
Rename AdvanceOrderService to OrderWorkflow
2020-07-28 23:40:49 +01:00
Luis Ramos
734fce5ce7
Add code to persist payments after failed payments. The state machine
...
rollbacks the transactions, with this we keep record of what went wrong.
2020-07-28 23:29:49 +01:00
Luis Ramos
ec0d06af54
Reuse update_failed method as the code needed is exactly the same
2020-07-25 19:39:46 +01:00
Luis Ramos
b23b707b5d
Notify bugsnag and execute post checkout actions (reset to cart state) whenever there's a payment gateway exceeption raised
2020-07-25 19:39:46 +01:00
Luis Ramos
1bf946d124
Reused code in checkout controller, the reponse for the case when there is a stripe exception anywhere is the same as when the update action fails
2020-07-25 19:39:46 +01:00
Luis Ramos
5266d95910
Move method closer to related/similar methods
2020-07-25 19:39:46 +01:00
Pau Perez
59da07de66
Handle all errors when dealing with payment event
...
This basically catches ActiveRecord::RecordInvalid caused by an invalid
credit record, for instance, but also other situations we haven't
forseen.
2020-07-23 20:24:31 +02:00
