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
Filipe
3cf2db68b1
Merge pull request #8945 from jibees/8914-do-not-display-shipping-method-backoffice-only-for-split-checkout
...
SplitCheckout: display only shipping method that are set as front end available
2022-03-10 16:13:42 +00:00
Filipe
1522263cfc
Merge pull request #8893 from jibees/8889-handle-redirect-to-next-step-for-the-split-checkout
...
SplitCheckout: handle navigation between steps
2022-03-10 16:07:58 +00:00
Jean-Baptiste Bellet
e3a529be5d
Display only shipping method that are set as front end available
...
and update the tests as well
2022-03-10 16:15:50 +01:00
Jean-Baptiste Bellet
f47de45346
Reference splitcheckout as a checkout redirect
...
This stored in session value is used to redirect after login
Update tests as well, thanks @filipefurtad0 ! 🙏
2022-03-01 15:12:18 +01:00
Jean-Baptiste Bellet
e47198f1e5
Handle both types of redirection
...
One is based on the order step itself, the other is based on the current step passed through the params
2022-02-28 15:23:37 +01:00
Filipe
7590b3ecf8
Merge pull request #8756 from jibees/8075-take-into-account-the-inherits_properties-attribute
...
Product that don't inherits from "producer"/"enterprise" properties should be filtered out by user on shop page
2022-02-21 19:04:08 +00:00
Adrien Chauve
ca46359224
More fixes
2022-02-16 10:23:22 +11:00
Adrien Chauve
9b93102a96
More fixes
2022-02-16 10:23:22 +11:00
Filipe
d8936b412e
Merge pull request #8819 from apricot12/8694-Improve_subsvriptions_index_perfomance
...
8694 improve subscriptions index perfomance by eager loading tags, suppliers and exchanges.
2022-02-10 17:37:00 +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
Filipe
30c1d89525
Merge pull request #8822 from Matt-Yorkley/split-checkout-payment-total
...
[Split Checkout] Move setting of payment total during checkout into OrderUpdater
2022-02-09 16:21:47 +00:00
Matt-Yorkley
8dc743f2d4
Extract update_payment_total method
2022-02-08 12:27:42 +00:00
Matt-Yorkley
1c180299a5
Pass indexed payment method tags to PaymentMethod Serializer
2022-02-08 11:42:24 +00:00
Nihal M. Kelanthodika
3152fef2ef
Eager load distributors and cached_incoming_exchanges
2022-02-08 11:42:24 +00:00
Nihal M. Kelanthodika
f0d6cd1f59
Query payment_method_tags by id
2022-02-08 11:42:24 +00:00
Nihal M. Kelanthodika
ee77210e81
Eager load taggings in SubscriptionsController#Index
2022-02-08 11:42:24 +00:00
Jean-Baptiste Bellet
4a3e0ea9b9
Use the right scope to retrieve products based on properties
2022-02-07 08:57:18 +01:00
Jean-Baptiste Bellet
dfe8ed26d9
Update tests and use ransack to search with the new scope: with_properties
2022-02-07 08:57:18 +01:00
Filipe
e403fc171d
Merge pull request #8808 from Matt-Yorkley/login-modal
...
Remove all Angular code from Login/Signup process
2022-02-03 19:36:44 +00:00
Filipe
c4751d7056
Merge pull request #8813 from Matt-Yorkley/split-checkout-address-state
...
Split checkout: fix loading of saved addresses
2022-02-03 19:06:35 +00:00
Matt-Yorkley
7235d1813d
Update totals and payment explicitly in current (non-split) checkout
2022-02-01 11:39:07 +00:00
Filipe
ca0166a420
Merge pull request #8807 from Matt-Yorkley/closed-oc-payment-auth
...
Fix Stripe payment authorizing for closed order cycles
2022-02-01 11:16:31 +00:00
Matt-Yorkley
5b434ca7c4
Replace conditional with a guard clause
2022-01-31 15:55:35 +00:00
Matt-Yorkley
11ed1574ca
Call #check_order_cycle_expiry in PaypalController and StripeController, but avoid it on #authorize action
...
The authorize action is used for authorizing off-session payments where the order is *already complete* and the order cycle may have closed (backoffice and subscriptions). They are essentially asynchronous and not coupled to the current open/closed state of the order cycle.
2022-01-31 15:55:35 +00:00
Matt-Yorkley
5e6dd1e6e1
Move #check_order_cycle_expiry method to OrderStockCheck and don't call it from BaseController :before_action callback
2022-01-31 15:55:35 +00:00
Matt-Yorkley
7c0a631f7f
Remove an unnecessary assignment
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-01-31 08:40:58 +00:00
Matt-Yorkley
370ec17818
Improve countries and states loading
2022-01-30 11:33:31 +00: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
8b59ef20db
Improve controller tests
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
6c6e5ca316
Ensure fees are applied during checkout
2022-01-28 11:38:23 +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
Filipe
53b96896a9
Merge pull request #8779 from mkllnk/7872-remove-stripe-connect
...
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
2022-01-26 11:57:26 +00:00
Matt-Yorkley
b5a1d9ebef
Allow using saved cards at checkout
2022-01-24 23:06:43 +00:00
Matt-Yorkley
8c9ca3b0c3
Extract method and allow Stripe payment completion on orders in confirmation state
2022-01-24 20:49:06 +00:00
Matt-Yorkley
8552da2377
Extract and stub PaymentMethodFetcher
2022-01-24 20:28:59 +00:00
Matt-Yorkley
167adb3ddc
Memoize selected_payment_method
2022-01-24 20:28:59 +00:00
Matt-Yorkley
02590014ab
Improve split checkout feature toggle
2022-01-24 20:28:59 +00:00
Matt-Yorkley
50b82d347b
Redirect to payment gateway during order confirmation
2022-01-24 20:28:59 +00:00
Maikel Linke
f22c2b0e73
Remove option to create StripeConnect methods
2022-01-24 12:35:45 +11:00
Matt-Yorkley
0f154de235
Use OrderCompletion in split checkout for #order_completion_reset
2022-01-19 17:51:03 +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
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
8ce27bed86
Move guest checkout handling to the frontend
2022-01-19 13:14:10 +00:00
Matt-Yorkley
a6af9b3ad5
Disable CSP on order ticket printing via QZ
2022-01-18 12:22:06 +00:00