raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,893 Commits 16 Branches 456 Tags
652beac73f92619ed9f3bbda8089ff545615c4dc
Commit Graph

27893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
66a546027f Add test coverage for handling zero priced orders 2023-07-04 13:13:05 +01:00
Gaetan Craig-Riou
74073946e6 Move VoucherAdjustmentsController to request specs 2023-07-04 13:13:05 +01:00
Matt-Yorkley
55cc57cf87 Use pre_discount_total when comparing to voucher amount 2023-07-04 13:13:05 +01:00
Matt-Yorkley
ad6d0c1c73 Add nil safety in reports for zero priced orders with no payment method 2023-07-04 13:13:05 +01:00
Matt-Yorkley
2aa3f8eb89 Fix flaky test 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
2f0f3e0820 Re-enable voucher test 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
a65b3b8b60 Extract voucher tests to separate controller spec 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
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
v4.4.1 		2023-06-30 10:56:56 +01:00
filipefurtad0
efb5132ac2 Update all locales with the latest Transifex translations 2023-06-29 23:28:28 +01:00
Filipe
54a85a504d Merge pull request #11101 from mkllnk/dfc-api-key 
Allow access to DFC API with OFN API token
 2023-06-29 17:20:21 +01:00
Filipe
d27a632a38 Merge pull request #11079 from abdellani/fix-distributors-listing-on-checkout-options 
filter distributors before listing on checkout options
 2023-06-29 17:02:34 +01:00
Filipe
36f4b2e7f9 Merge pull request #11107 from jibees/11085-edit-variant-cant-update-values-on-the-variant-edit-page 
Admin, Edit variant: remove unwanted extra space on price (added in certain specific conditions)
 2023-06-29 16:46:42 +01:00
Filipe
97f131e556 Merge pull request #11089 from jibees/11049-invoices-actions-dropdown-menu-disappears-after-creating-the-first-invoice 
[Invoices] Actions dropdown menu disappears after creating the first invoice
 2023-06-29 16:23:35 +01:00
Filipe
da226ea021 Merge pull request #11109 from mkllnk/image-urls 
Gracefully deal with missing S3 config
 2023-06-29 12:50:36 +01:00
Filipe
d92c7f89bd Merge pull request #11022 from Matt-Yorkley/matomo 
Call matomo manually on asynchronous page visits
 2023-06-29 12:02:48 +01:00
Jean-Baptiste Bellet
045435e9cc use the variant price itself 2023-06-29 11:02:56 +02:00
Jean-Baptiste Bellet
3286094804 number_to_currency can be nil: use a safe operator 2023-06-29 10:47:00 +02:00
Maikel Linke
8b3f45263c Remove unnecessary spec clean-up 
And clarify locale setup.
 2023-06-29 10:40:01 +02:00
Jean-Baptiste Bellet
2fcf706aa3 Remove unwanted space at the end of the price 
This `number_to_currency` method seems to display an extra space, not necessary when unit is `''`
Strip it.

Update specs as well. Thanks @filipefurtad0 for specs!!!
 2023-06-29 10:40:01 +02:00
filipefurtad0
6b84fbf2b8 Adds after block, to remove configurations 
Sets pending shared examples
 2023-06-29 10:40:01 +02:00
filipefurtad0
504ee50dd4 Sets up a spec for #11085 2023-06-29 10:40:00 +02:00
David Cook
0ba342bf11 Merge pull request #10965 from macanudo527/fix_linelength_bundle2 
Fix Layout/LineLength - Bundle 2
 2023-06-29 15:27:08 +10:00
Maikel
dd1e1328cc Merge pull request #11080 from rioug/fix-bulk-order-cancelation-spec 
Fix bulk order cancellation test
 2023-06-29 14:44:04 +10:00
Maikel
46ddab3781 Merge pull request #11088 from Matt-Yorkley/deployments-check 
Update workflow permissions check to latest version
 2023-06-29 14:34:46 +10:00
Maikel
6392c2c115 Merge pull request #11075 from mkllnk/test-cache 
Use Redis for caching in test environment
 2023-06-29 14:33:09 +10:00
Maikel Linke
029364d4a3 Express spec intent with DSL instead of comment 2023-06-29 14:25:50 +10:00
David Cook
714642f331 Use different Redis database for test environment 2023-06-29 14:15:18 +10:00
Filipe
ba99f85f5c Merge pull request #10914 from abdellani/fix-stripe-sca-failure 
redirect user to payment when the card doesn't have enough credit
 2023-06-28 19:58:18 +01:00
Matt-Yorkley
ace2c5778f Call matomo manually on Turbo page visits 2023-06-28 12:52:54 +01:00