raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,630 Commits 18 Branches 451 Tags
e6e4e014dc95da76a6d96cea21fa2fa45380cf21
Commit Graph

6088 Commits

Author SHA1 Message Date
Filipe
8a3fbf92b9 Merge pull request #11776 from rioug/11775-fix-hidden-input 
Fix hidden input showing on Producer registration
 2023-11-16 17:26:28 +00:00
Dusan Orlovic
0f30836c1d Check for .present? for ENV GOOGLE variables 2023-11-09 09:45:19 +01:00
Gaetan Craig-Riou
c42d9d7d54 Use type="hidden" to hide input 
It looks some CSS we use is breaking the use of "hidden"
 2023-11-06 16:54:48 +11:00
Rachel Arnould
1e15d32a24 Merge pull request #11679 from abdellani/new_and_unique_invoice_template 
New and unique invoice template
 2023-11-03 16:49:19 +01:00
David Cook
38296eb967 Merge pull request #11755 from mkllnk/cleaning 
Remove orphaned JSON data in admin pages
 2023-11-03 16:02:10 +11:00
Maikel Linke
f6903518c3 Remove orphaned JSON data in admin pages 
This was left over data from commit:

- 79ba223e12
 2023-11-03 15:16:22 +11:00
David Cook
f63f37fd3b Wrap form element in a form 
This makes it easier to control in the next commit.
 2023-11-03 14:32:58 +11:00
David Cook
d0abbc5d2c Ensure error summary always shows when error 
Best viewed with whitespace ignored.
 2023-11-03 14:32:58 +11:00
David Cook
f05d27b58b Show error message summary at top of form 2023-11-03 14:32:58 +11:00
Maikel
e6e2f27ed4 Merge pull request #11736 from dacook/registration-noindex 
Print robots tag for registration layout
 2023-11-01 13:53:07 +11:00
Maikel
25a3149f48 Merge pull request #11702 from dacook/buu-editing-part5b-11059 
[BUU] Mark changed fields, when error
 2023-11-01 13:01:08 +11:00
David Cook
435bf6e6b0 Print robots tag for registration layout 
This is copied from the darkswarm layout.
 2023-10-31 14:03:32 +11:00
Mohamed ABDELLANI
23a56d35a0 add tax_adjustment total to the invoice 2023-10-30 22:09:22 +01:00
Mohamed ABDELLANI
c8f69c8778 always render shipment on the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
15aeb2f8e5 remove legacy template (used when invoice feature enable) 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
da89860f35 fix price per unit 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
c1ed8ed67c update the adjustments rows 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
716cf3e522 reorder the totals section 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b7f601d140 show tax rate column regardless of the tax amount on the order 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a08a2fd5f6 [skip ci] add terms of service link to the invoice. 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a5fd0608c3 align the columns of the totals rows 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
a8f9b29a6d [skip ci]add the total price columns to the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
30537f7743 add "Weight/VOL." column to the invoice 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
b64058a71d swap tax rate with total price (incl tax) 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
1182544c47 update the view used when the invoice feature is enabled 2023-10-30 19:43:57 +01:00
Mohamed ABDELLANI
affecf53c6 add order cycle name to the invoice number section 2023-10-30 19:43:57 +01:00
Filipe
f1d4ec9fe7 Merge pull request #11684 from ccozkan/issue-11609 
Fix content aligning in subscriptions table
 2023-10-26 16:20:33 +01:00
Filipe
b67acaae21 Merge pull request #11694 from prateek0411999/bugfix/11666-warning_forfeit_remaining_amount 
add condition on warning_forfeit_remaining_amount note
 2023-10-26 13:44:22 +01:00
Çağrı Özkan
7b21126a9c Use both onchange and oninput on ng_form.html.haml 2023-10-25 17:32:25 +03:00
Çağrı Özkan
38d1de896c Use oninput on ng_form.html.haml instead of onchange 2023-10-25 17:11:30 +03:00
David Cook
671dc570ec Refactor: with form builder 2023-10-24 15:21:14 +11:00
David Cook
aa4630d74c Mark fields as changed if they contain unsaved values. 
This can happen when there's a validation error. The field with error will also be marked changed, but the error style will override it.

I'd like to move this into a FormBuilder. Existing formbuilder gems don't seem to support it (though I didn't look very hard).
 2023-10-24 15:21:14 +11:00
David Cook
fdad45bb46 Rename 'modified' state to 'changed' 
This conveniently matches the terminology used in both JavaScript and ActiveModel::Dirty.
 2023-10-24 15:21:13 +11:00
prateek0411999
a113b5ba01 add condition on warning_forfeit_remaining_amount note 2023-10-23 10:45:35 +05:30
Çağrı Özkan
e465015184 Add oninput:"make form dirty" to enterprise_form/name text field 2023-10-21 01:19:41 +03:00
Konrad
2ba5ab7dc1 Merge pull request #11577 from jibees/10956-use-cable_ready-instead-of-morph 
Admin, Orders list: when capturing an order, fix an issue that makes the tooltip invisible (+ errors in the console)
 2023-10-20 11:56:53 +02:00
Çağrı Özkan
a6bcac8a7d Remove text-center from subscription table td's 2023-10-19 05:16:20 +03:00
Konrad
448eb8b3b1 Merge branch 'openfoodfoundation:master' into master 2023-10-18 12:41:12 +02:00
Rachel Arnould
aecb55beb3 Merge pull request #11660 from dacook/products_v3_path 
Hide old products screen when admin_style_v3 enabled
 2023-10-17 10:45:01 +02:00
Gaetan Craig-Riou
7ce3fea7d5 Refactor tooltip on the backoffice orders page 2023-10-17 13:35:01 +11:00
Gaetan Craig-Riou
6a1664d2fd Refactor "What's this" tooltip 2023-10-17 13:33:15 +11:00
Gaetan Craig-Riou
01a13a814a Improve tooltip partial 2023-10-17 13:33:15 +11:00
David Cook
ad9048c595 Merge pull request #11627 from dacook/reflex-locale 
Ensure dynamic modals always use selected locale
 2023-10-17 10:23:58 +11:00
Maikel Linke
c0938d1607 Simplify view with number helpers 2023-10-16 16:37:47 +11:00
drummer83
c2b82651ee Don't show credit owed when = 0 2023-10-13 20:51:12 +02:00
David Cook
6e6854f564 Fix payment state indicator 
Now the correct class is added, we can see the little coloured circles again.
 2023-10-13 19:25:12 +02:00
lauriejefferson
2020a9fa76 changed table row alignment to align-left and removed padding from table header 2023-10-13 19:25:12 +02:00
Konrad
5859d2ff78 Merge pull request #11114 from lauriejefferson/not-paid-order-confirmations-resemble-paid-orders-7603 
Not paid order confirmations resemble paid orders 7603
 2023-10-13 18:52:10 +02:00
David Cook
8f30b27b58 Guard against nil values 
These are validated and shouldn't be nil, but I suspect we have corrupt data causing problems here.
 2023-10-13 15:54:24 +02:00
David Cook
655c16cca0 New bulk products screen shares path with old 
The feature toggle will determine which bulk products screen shows. An additional products_old path is also temporarily added for easy reference.

Later, when the old screen is full removed, we'll probably rename the _v3 classes to tidy up.
 2023-10-13 10:39:45 +11:00