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
5e321c9f48
Fix country/state selection for shipping address; missing controller and data
2022-01-30 11:33:31 +00:00
Matt-Yorkley
611beb2e90
Rearrange controller placement, field order, and nesting
2022-01-30 11:33:31 +00:00
Matt-Yorkley
908a22bcb6
Don't repopulate states select on page load; breaks pre-filling selection from saved address
2022-01-30 11:33:31 +00:00
Matt-Yorkley
370ec17818
Improve countries and states loading
2022-01-30 11:33:31 +00:00
Matt-Yorkley
bf4428b688
Tidy up dependent-select controller
2022-01-30 11:33:31 +00:00
Matt-Yorkley
448e4bb67b
Reduce expensive tax recalculation calls
...
This can only really be enabled once we've merged the split checkout
2022-01-29 18:56:52 +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
794e0e0326
Delete old login modal code
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
77d8e7da90
Use non-Angular login modal in /registration pages
2022-01-29 14:49:23 +00:00
Matt-Yorkley
a522e597e1
Add Matamo event
2022-01-29 14:49:23 +00:00
Matt-Yorkley
50389a864a
Improve dynamic Angular Bootstrapping
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
0577b46f3f
Create simpler non-Angular login modal
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
04da148af0
Decouple login modal opening from Angular
2022-01-29 10:08:51 +00:00
Matt-Yorkley
6561a7246b
Delete unused partial
2022-01-29 10:08:51 +00:00
Matt-Yorkley
798af2dafc
Drop unused #create action
2022-01-29 10:08:50 +00:00
Filipe
e63225d389
Merge pull request #8727 from Matt-Yorkley/js-matomo-login
...
Move Matomo event tracking for login modal into Authentication service
2022-01-28 20:02:46 +00:00
Cillian O'Ruanaidh
67ae2e72f3
Replace inline JS for toggling order cycle advanced settings with StimulusJs controller
...
Partially addresses #8699 .
This adjusts the Stimulus toggle controller so you can toggle content in both directions via a single element. This is in addition to the previous behaviour for toggling via multiple elements like radio buttons when each element always toggles in one direction only.
If a toggle element contains a chevron icon this will automatically toggle the direction of that icon too.
Note, in order to not have to re-implement the animation provided by the slideToggle() function in standard JavaScript, this just switches the style :display between 'none' and 'block' so it is not as smooth. Perhaps it could be made more smooth later with a CSS transition.
2022-01-28 16:19:36 +00:00
Matt-Yorkley
6c6e5ca316
Ensure fees are applied during checkout
2022-01-28 11:38:23 +00:00
Matt-Yorkley
4ace7efd97
Fix visual regression on filter buttons
2022-01-28 10:40:01 +00:00
Filipe
49030049dd
Merge pull request #8732 from Matt-Yorkley/template-cull
...
Remove some Angular templates
2022-01-27 15:18:06 +00:00
Matt-Yorkley
0bec693655
Merge pull request #8791 from Matt-Yorkley/split-checkout-terms
...
[Split Checkout] Update terms of service handling
2022-01-27 13:07:04 +00:00
Nihal M. Kelanthodika
23a7ba2479
Added before_save callback to convert variant weight to decimal and 0.0 if nil
2022-01-27 16:33:14 +05:30
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
28a126024f
Merge pull request #8722 from cillian/remove-unused-js-from-products-form
...
Remove unused inline JavaScript from products/_form.html.haml
2022-01-26 19:14:24 +00:00
Filipe
374c05116b
Merge pull request #8726 from Matt-Yorkley/stringex-machina
...
Reduce impact of stringex gem
2022-01-26 19:02:41 +00:00
Filipe
54083ea803
Merge pull request #8738 from jibees/add-locale-to-stripe-elements
...
Add locale to stripe elements options to display stripe error messages in globale interface chosen language
2022-01-26 19:01:37 +00:00
Filipe
62457f0c69
Merge pull request #8778 from georgethoppil/master
...
Adding deleted_at check on variant_stock move
2022-01-26 17:33:29 +00:00
Filipe
404fb4cb7f
Merge pull request #8771 from tsara27/8458-missing-translation
...
Missing translation: table headers in product import validation table #8458
2022-01-26 17:22:44 +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
Filipe
cea4714296
Merge pull request #8761 from Dmoment/8457-missng-translation-or-between-buttons
...
removed translation or between buttons
2022-01-26 10:04:41 +00:00
Filipe
30b3b7455d
Merge pull request #8717 from jibees/6139-improve-radio-button-on-split-checkout
...
SplitCheckout: adjust display of long shipping method or payment method label
2022-01-25 16:32:38 +00:00
Filipe
8715e9865b
Merge pull request #8643 from jibees/8623-disable-save-card-option
...
Split Checkout: Show "Save card for future use" checkbox only on "Enter new card details" option selected
2022-01-25 16:11:20 +00:00
Matt-Yorkley
6e8bb777e6
Show platform and distributor terms and conditions
2022-01-25 15:16:43 +00:00
Matt-Yorkley
b5a1d9ebef
Allow using saved cards at checkout
2022-01-24 23:06:43 +00:00
George Thoppil
77e5aab6c8
Merge branch 'openfoodfoundation:master' into master
2022-01-24 16:48:21 -05: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
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