raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 451 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

35 Commits

Author SHA1 Message Date
Matt-Yorkley
9b45b71696 Improve feature toggling 2023-07-04 13:13:05 +01:00
Matt-Yorkley
de97e69e7d Show/hide payment methods if voucher changes order total to zero 2023-07-04 13:13:05 +01:00
Matt-Yorkley
55bce9f1b2 Remove @voucher_adjustment instance variable 2023-07-04 13:13:05 +01:00
Matt-Yorkley
bd29a9acde Introduce "zero priced orders" to checkout UI and order state flow 2023-07-04 13:13:05 +01:00
Matt-Yorkley
91004588f6 Add separate voucher form 2023-07-03 11:03:05 +01:00
Matt-Yorkley
3f83da9928 Move voucher section out of main checkout form 2023-07-03 11:03:05 +01:00
Matt-Yorkley
e04a3f6b4d Move form definition down into each checkout step 2023-07-03 11:03:05 +01:00
Gaetan Craig-Riou
3f37554ff9 Add VoucherAdjustmentsController and specs 
Refactor split checkout to use the new controller. But unfortunately
we can't have nested form, so adding a voucher is still handled by
SplitCheckoutController.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
fe9b94a80e Fix cart disappearing bug after adding a voucher 
The split checkout page uses `mrujs` and `CableCar` to set the form as
a remote one and perform `CableCar` operation if any : https://mrujs.com/how-tos/integrate-cablecar
The previous solution broke the cart handled by angularJS, it looks like
`morpdom` (https://mrujs.com/references/remote-forms-and-links Navigation Adapter section )
was doing something that angularJS didn't like when redirecting to
the current page.
With the power of `CableCar`, we now replace the #voucher-section on the
split checkout page instead of doing a redirect.
 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
d157d91054 When voucher cover more than order total, use only amount needed 
The checkout payment step will also show a warning.
The amount used is stored in the adjustment created, so we will be able
to track how much has been used down the line.
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
e487ed0532 Add link to remove voucher when a voucher has been applied 
Improve styling to match the design
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
a9d9b33f7d First take at adding a voucher to an order 
Use voucher.create_adjustment to add an adjustment to the order
Currently doesn't take into account tax part
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
Filipe
f917027cb1 Merge pull request #10249 from jibees/10228-split-checkout-error-422-on-step-2-payment-update-highlighted-fields 
SplitCheckout: Fix an issue that was sending unintentionally bad params for payment
 2023-01-24 10:31:49 +00:00
Jean-Baptiste Bellet
251ab2ac9a Payment method id attribute don't need to start with paymentmethod 2023-01-23 17:46:26 +01:00
Jean-Baptiste Bellet
ef572668d5 Let's keep fees next to the payment or shipping method 2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
1e1ec95a5a Include payment form right after the payment description 
which is right after the radio input that select the payment description
 2022-12-28 15:24:46 +01:00
Jean-Baptiste Bellet
2d86e8857a Put payment method description just above the 
+ update spec by adding `data-paymentmethod-id` attribute
 2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet
f1bb4fdf38 Same display css rules for price of payment and shipping method 
+ update spec since parenthesis are added by css
 2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet
7be2f418d0 preselect the only available payment method 2022-02-17 09:33:23 +01:00
Jean-Baptiste Bellet
f78ff3fc3b Improve display when label is long 
(ie. longer than the available screen width)
 2022-01-13 11:05:44 +01:00
Jean-Baptiste Bellet
7b6aa99de2 Handle when input is already checked 
ie. user hasn't click on anything
 2021-12-20 15:34:58 +01:00
Matt-Yorkley
8105f0ebf3 Simplify partial selecting and rename stripe_sca partial 2021-12-07 16:29:25 +00:00
Jean-Baptiste Bellet
f9b0798c88 Add stripe_sca, paypal, check payment method 
Stripe_sca use the same template than stripe
 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
e89caf7a0d Add stripe as payment method 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
fc6fba4fe9 Move into specific folder 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
792763d275 use specific gateway form template for split checkout 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
2564de4ca4 Display the right container by default regarding the selected_payment_method 2021-12-07 16:27:22 +00:00
Jean-Baptiste Bellet
3063b041d1 Change the paymentmethod controller to handle both desc and form 
Add tests as well

Update _payment.html.haml

Update _payment.html.haml
 2021-12-07 16:23:39 +00:00
Matt-Yorkley
ebe2923512 Improve form outputs and error handling 2021-09-01 14:16:32 +01:00
Jean-Baptiste Bellet
10ddaf4384 Last step (ie. summary) is larger than the two previous step 2021-08-25 15:53:22 +02:00
Matt-Yorkley
98ae82147c Avoid using Angular in shipping and payment method display 2021-08-12 12:53:45 +01:00
Matt-Yorkley
a631d057f1 Update payment methods form 2021-08-11 15:22:28 +01:00
Jean-Baptiste Bellet
4c81f0f27b Specify name for this payment input 2021-08-11 15:20:03 +01:00
Matt-Yorkley
a32ca23ca5 Simplify routes and partials 2021-08-03 11:24:03 +02:00