Commit Graph

1372 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
6a48bdbb82 Send email cancelation by default 2022-03-29 10:12:00 +02:00
Filipe
be1c255067 Merge pull request #8892 from Matt-Yorkley/spree-login-routes
Fix issue with unconfirmed email messages
2022-03-28 13:38:17 +01:00
Matt-Yorkley
ad5c834342 Merge pull request #8995 from apricot12/7853-deprecation-warnings-1
7853 deprecation warnings 1
2022-03-25 19:54:06 +00:00
Nihal Mohammed
b3771bb623 Use bypass_sign_in method instead of bypass option in app/controllers/spree/users_controller.rb 2022-03-15 05:35:43 +05:30
jibees
d4a4a36b14 Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
2022-03-11 08:56:41 +01:00
Matt-Yorkley
3effff8821 Show resent confirmation message in current tab 2022-02-18 09:42:49 +00:00
Adrien Chauve
9b93102a96 More fixes 2022-02-16 10:23:22 +11:00
Matt-Yorkley
4fbaa65534 Handle unconfirmed email message in UserSessionsController 2022-02-15 09:47:06 +00:00
Jean-Baptiste Bellet
50f547af98 Add an attribute that conditions the sending of the cancellation email
true by default to not change the default behavior.
Can be set to false when sending params send_cancellation_email
2022-02-10 14:39:00 +01:00
Matt-Yorkley
f3792acf55 Drop workaround previously required to avoid a bug caused by the stringex gem 2022-01-29 14:49:23 +00:00
Matt-Yorkley
13a7fb79cf Move more login handling out of Angular 2022-01-29 14:49:23 +00:00
Matt-Yorkley
89e692c6c8 Switch to CableCar for login responses 2022-01-29 14:49:23 +00:00
Matt-Yorkley
8a18a4de66 Clear up redirecting logic and path building 2022-01-29 10:08:51 +00:00
Matt-Yorkley
798af2dafc Drop unused #create action 2022-01-29 10:08:50 +00:00
Matt-Yorkley
1ee3d0f7a1 Drop embedded shops code 2022-01-26 19:58:39 +00:00
Filipe
75395f6f29 Merge pull request #8648 from Matt-Yorkley/csp
Configure CSP
2022-01-26 19:55:11 +00:00
Maikel Linke
f22c2b0e73 Remove option to create StripeConnect methods 2022-01-24 12:35:45 +11:00
Matt-Yorkley
a6af9b3ad5 Disable CSP on order ticket printing via QZ 2022-01-18 12:22:06 +00:00
Matt-Yorkley
dfbd384c95 Refactor embedding to a Concern 2022-01-18 12:22:06 +00:00
Filipe
8114eb1c9f Merge pull request #8666 from openfoodfoundation/stripe-controller
Extract new StripeController
2022-01-17 20:21:40 +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
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
99b75c9a6a Adjust usage of remote-method links on credit card deletion 2022-01-08 16:54:23 +00:00
Matt-Yorkley
3ad17aedd4 Merge pull request #8634 from Matt-Yorkley/order-tokens
Clarify use of order tokens
2022-01-04 13:05:41 +00:00
Filipe
13d04c367d Merge pull request #8636 from Matt-Yorkley/stripe-auth-emails
Stripe auth email sending; quick tidy up
2022-01-04 11:01:47 +00:00
Filipe
20c0195584 Merge pull request #8017 from cillian/hide-variants-with-no-stock
When creating backoffice orders hide variants with no stock by default
2021-12-23 21:34:06 +00:00
Maikel Linke
6d1e984af7 Enable testers to activate StripeConnect
This will make it easier to test the removal of StripeConnect.
2021-12-20 17:16:39 +11:00
Maikel Linke
470fc92825 Fix old, confusing typo 2021-12-20 17:13:40 +11:00
Maikel Linke
22de357724 Hide deprecated StripeConnect payment gateway
StripeConnect has been replaced by StripeSCA but some people still use
the old StripeConnect. Let's prevent people from creating deprecated
payment methods before migrating existing data.
2021-12-20 17:12:19 +11:00
Maikel Linke
6966dea0f5 Extract changing Stripe method selection logic
It will change and it's clearer in a separate method.
2021-12-20 17:09:57 +11:00
Cillian O'Ruanaidh
401cc19532 Fix Rubocop LineTooLong violation in spree/admin/variants_controller 2021-12-17 15:40:51 +00:00
Matt-Yorkley
542e3ad1aa Reuse StripeScaPaymentAuthorize in Admin::PaymentsController 2021-12-16 20:42:19 +00:00
Matt-Yorkley
fb2c0a253b Remove reference to params[:token] in Admin::Orders::CustomerDetailsController
params[:token] and session[:access_token] are only really used in the context of guest users in the customer-facing parts of the app. Here the user should be fully authenticated already to view the page. There aren't any URL that point at this controller which append a token to the params.
2021-12-16 14:02:50 +00:00
Matt-Yorkley
9f49a84e7f Clarify use of access tokens used for viewing order details as a guest user
There are 4 or 5 different places in the app where we reference a :token and params[:token] for completely different purposes (they're not even vaguely the *same* token).

This is an attempt to clarify the places in the app where we use params[:token] in relation to *orders*, for allowing guest users (who are not logged in) to view details of an order they have placed (like after checkout completion), and differentiate it from the various other places where params[:token] can actually be used for something entirely different!
2021-12-16 13:35:55 +00:00
Filipe
f6385215d3 Merge pull request #8568 from Matt-Yorkley/paypal-controller
Move paypal controller
2021-12-15 18:12:27 +00:00
Matt-Yorkley
6d2521bf5f Remove Spree.user_class
This construct was previously used in Spree to switch out the user class with a dummy class during certain tests. We don't use this any more, so it's just mess.

🔥
2021-12-10 18:18:20 +00:00
Matt-Yorkley
0d620aac94 Move paypal_controller out of spree namespace 2021-12-10 11:46:52 +00:00
Matt-Yorkley
d0f572b051 Remove dead code: session[:guest_token]
This `session[:guest_token]` doesn't seem to ever be assigned anywhere in the codebase, and it doesn't seem to be read at any point either..? There are some various places where `current_order.token` is used and `session[:access_token]` is used, but not this.

As far as I can tell: it was part of an old version of Spree and related to the spree_auth_devise gem (which we no longer use).
2021-11-14 12:02:07 +00:00
Matt-Yorkley
924f6568d6 Replace data loading with new Reports::QueryInterface 2021-11-04 14:55:23 +00:00
Matt-Yorkley
817f0942dd Pull in reports POC work replacing Packing reports 2021-11-04 14:55:23 +00:00
mariodz95
d1160ec66a Fix snail on shipping method fees 2021-10-19 09:56:35 +02:00
Cillian O'Ruanaidh
2462d71ab5 When creating backoffice orders hide variants with no stock by default
But let people include out of stock variants by checking a checkbox if they want.

Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.

Co-authored-by: Maikel Linke <maikel@email.org.au>
2021-10-08 13:13:32 +01:00
Maikel
c9d36e6f5c Merge pull request #8204 from meronokbay/6942-fix-payment-method-fee-bug-all
Fix payment method fee bug for all calculator types
2021-09-28 08:39:05 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Meron Ogbai
cd992ee866 Validate preferred values all calculators 2021-09-17 18:50:29 +03:00
Meron Ogbai
957f834694 Rename preferred amount to preferred value 2021-09-17 18:49:57 +03:00
Meron Ogbai
d73df78f43 Extract gateway_params to a private method 2021-09-17 16:48:53 +03:00
Luis Ramos
60a8ae6675 Remove Stripe Connect gateway and related code 2021-09-10 14:43:24 +05:30