raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,011 Commits 16 Branches 455 Tags
089d2b9c840c587652cd0ae9869cada57748d8f2
Commit Graph

14825 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
089d2b9c84 Clear any existing payment and payment fees when adding a voucher 
If a user come back to checkout step 2 from step 3, the order
will have payment and possibly payment fee existing. This can
interfere with voucher calculation, so we clear them.
The user can then select a payment method again if needed
 2023-07-31 12:05:52 +10:00
Gaetan Craig-Riou
33ef8def08 Update order total after removing a voucher 
We need to do this to make sure when display the payment method
again.
Plus spec
 2023-07-28 14:52:25 +10:00
Gaetan Craig-Riou
f35001dacc Update voucher adjustment and order total when adding a voucher 
This is needed so we can check if payment is needed and display
no payment required when no payment needed
 2023-07-28 14:27:27 +10:00
David Cook
ef62fb885d Check if record actually saved 
I'm not sure if it will ever make a difference, but I think this makes more sense.
 2023-07-28 14:11:45 +10:00
Gaetan Craig-Riou
a5b2bc6293 Per review, Refactor VoucherAdjustmentsService 
Change #calculate to #update and clean up internal code
 2023-07-18 15:16:21 +10:00
Gaetan Craig-Riou
a584f9aaec Refactor VoucherAdjustmentsService 
It's more inline with existing coding style
 2023-07-18 14:39:01 +10:00
Gaetan Craig-Riou
5a59396a41 Remove call to VoucherAdjustmentService when creating a voucher 
Voucher will be automatically applied when the order transition to
the confirmation step. No need to do the work twice.
 2023-07-14 14:47:39 +10:00
Gaetan Craig-Riou
3d9542fec2 Per review, rename amount to adjustment_amount 
It was confusing as I was re assigning a variable given as a parameter
 2023-07-14 14:47:39 +10:00
Gaetan Craig-Riou
edabc56b5c Add voucher calculation after updating an order 
This is to make sure the voucher are recalculated when a customer
update the order content from the `/cart` page. This is tested
with system test
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
ca7dcb82b8 Apply voucher after transitionning to the confirmation step 
Testing that VoucherAdjustmentsService.calculate has been called after a
transition doens't work, skipping test for now.
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
87790b29ae Fix VoucherAdjustmentsService.calculate so we can call it mutiple time 
It now uses `order.pre_discount_total` to make any calculation, that
means you can call it multiple time and you will still get the same
adjustment amount, included_tax and tax adjustment when needed. This
is assuming nothing changed on the order.
 2023-07-14 14:47:03 +10:00
Gaetan Craig-Riou
60c0c54eb2 Update create_adjustment to create with an amount of 0 
Amount calculation is handled by VoucherAdjustmentService.calculate
 2023-07-14 14:47:03 +10:00
Filipe
308ce9263d Merge pull request #11170 from jibees/11160-bulk-actions-function-not-working-on-safari-mac-browser 
Admin, Orders: Make bulk actions dropdown re-enabled for Safari browser
 2023-07-13 17:17:18 +01:00
Filipe
2f8a056bee Merge pull request #11187 from jibees/10975-white-label-remember-custom-tab-activation-after-error-message 
Admin, White Label: check the custom tab checkbox if any errors on custom tab (ie. title is blank)
 2023-07-13 16:43:18 +01:00
Filipe
448d5ea017 Merge pull request #11135 from Matt-Yorkley/vouchers 
Vouchers part 2
 2023-07-13 12:50:32 +01:00
David Cook
d03b88cf83 Rename variables 
To make it clear they are arrays
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
0fdf7876a6 Instanciate instance variable + use spread operator to be more concise 
and efficient ;)
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
6143f4ce6f Use dropdown controller to manager actions dropdown in orders page 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
7084c53f38 Do not display menu is the dropdown is 'disabled' 
ie. classList contains `disabled`
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
02aea989be Add on_click_outside behavior on dropdown_controller 
"It's a Surprise Tool That Will Help Us Later"
 2023-07-11 10:48:52 +02:00
Jean-Baptiste Bellet
d78af187e0 Allow dropdown controller to toggle more than one class 
"It's a Surprise Tool That Will Help Us Later"
 2023-07-11 10:48:51 +02:00
Jean-Baptiste Bellet
a8b9d9d8af Check the custom tab checkbox if any errors (ie. title is blank) 2023-07-10 16:31:33 +02:00
Filipe
f0bcb79c09 Merge pull request #11169 from openfoodfoundation/11164-admin-orders-actions-dropdown-is-not-well-placed 
Fix container issues introduced by #11123
 2023-07-07 11:15:14 +01:00
Matt-Yorkley
42a3087cdb Remove :available_on attribute from Product class 2023-07-06 14:36:35 +01:00
Jean-Baptiste Bellet
6ee388fe51 Fix container issues 2023-07-06 11:41:54 +02:00
David Cook
05a22b80bc Merge pull request #11123 from dacook/buu-products-table 
[admin_style_v3] Products table with variants
 2023-07-06 09:37:31 +10:00
Matt-Yorkley
652beac73f Drop valid? check from zero_priced_order? method 2023-07-05 15:31:05 +01:00
David Cook
7e0042ea1d Apply code suggestion 
Co-authored-by: Gaetan Craig-Riou <gaetan.riou@gmail.com>

Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com>
 2023-07-05 11:27:03 +10:00
Matt-Yorkley
671dfc7082 Don't flush errors when checking zero priced order validity 2023-07-04 14:42:31 +01:00
Matt-Yorkley
55cc57cf87 Use pre_discount_total when comparing to voucher amount 2023-07-04 13:13:05 +01:00
Matt-Yorkley
f7912a2240 Fix CSS/layout issues 2023-07-04 13:13:05 +01:00
Matt-Yorkley
672400192f Update use of params 2023-07-04 13:13:05 +01:00
Matt-Yorkley
37a4c73a12 Fix rubocop complaint 2023-07-04 13:13:05 +01:00
Matt-Yorkley
9b45b71696 Improve feature toggling 2023-07-04 13:13:05 +01:00
Matt-Yorkley
28795effc3 Clarify named vouchers in UI 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
7a0b83076b Move loading of saved cards out of checkout concern 2023-07-04 13:13:05 +01:00
Matt-Yorkley
1cd38c957d Introduce "zero priced orders" in admin order payments UI and helper 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
d7950617ec Drop superfluous method 2023-07-04 13:13:05 +01:00
Matt-Yorkley
47b5a3fb1d Don't apply tax calculations if there's no tax 2023-07-04 13:13:05 +01:00
Matt-Yorkley
9e5061fc31 Move voucher processing out of checkout controller 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
Matt-Yorkley
75e6ccd580 Simplify voucher controller 2023-07-03 11:03:05 +01:00
Matt-Yorkley
3d44f4bc98 Introduce "zero priced order" concept with no required payment 
This applies to cases where an order contains items with zero price or where applied vouchers have reduced the order's total to zero.
 2023-07-03 11:03:05 +01:00
Matt-Yorkley
fefa9288a4 Remove :permalink attribute from Product 2023-06-30 11:37:57 +01:00
Filipe
b175793b91 Merge pull request #10704 from abdellani/hide-customers-with-no-completed-orders 
Hide users with no completed orders from a hub's customers list
 2023-06-30 10:56:56 +01:00