raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,825 Commits 19 Branches 453 Tags
244d532268f8a1065ef8ca8a4e5a28e4aef58825
Commit Graph

6117 Commits

Author SHA1 Message Date
Konrad
7c892b2e9e Merge pull request #11889 from cillian/split-checkout-to-just-checkout 
Replace references to 'split checkout' with just 'checkout'
 2023-12-06 20:42:26 +01:00
David Cook
300998acb6 Merge pull request #11811 from dacook/buu-stock-levels-11062 
[BUU] Stock level popout
 2023-12-05 13:56:01 +11:00
Cillian O'Ruanaidh
b78258c505 Replace references to :split_checkout translation keys with :checkout in views, controllers, etc. 2023-12-01 12:37:13 +00:00
Cillian O'Ruanaidh
def027efb2 Replace references to split_checkout directory in views and specs 2023-12-01 11:32:55 +00:00
Cillian O'Ruanaidh
222c6d8ac5 Rename app/views/split_checkout directory to app/views/checkout 2023-12-01 11:12:00 +00:00
David Cook
2013750732 Rename files to match recommended naming scheme 
This naming scheme removes some duplication which is nice, but it's a little strange and results in a longer name overall. I don't like it very much because:
- filenames don't include the component's actual name. This makes it slightly harder to find them in my text editor (but I'd probably get used to that)
- the namespace and class naming isn't exactly right. This is _the_ vertical_ellipsis_menu, not a subcomponent.
- the stimulus controller name is now longer, adding more cruft to the HTML.

Lots of discussion here: https://github.com/ViewComponent/view_component/discussions/67
People tried to come up with a better way (and I was tempted to try myself). It seems this approach won. I guess it's not so bad if your component names are shorter.
 2023-11-30 12:25:18 +11:00
Konrad
d4cebfdb4f Merge pull request #11837 from binarygit/open-link-in-new-page 
Open external link in product description inside new page
 2023-11-28 11:09:35 +01:00
David Cook
f034e46aed Fix label 
Strangely, the spec passed when run locally, but not in CI. It's a curious case of the wrong letter case.
 2023-11-28 10:44:34 +11:00
David Cook
bc6a83017b Update spec 
Ok that was an afterthought, but better late than never.
 2023-11-28 10:44:34 +11:00
David Cook
69f160ff95 Toggle input disabled when on demand checked 
This introduces a new 'toggle' controller, and we already had three\! So I created a generic interface that could be extended to potentially support all of them. I propose we try to reduce them all into the one controller, but won't go down the rabbit-hole just yet..

I have an idea on how to re-arrange and make it more contained, by assigning the controller only to the checkbox, and defining targets with aria-controls="", but chose to stick with Stimulus conventions for now.
 2023-11-28 10:44:34 +11:00
David Cook
b6045655ee Hide popout when checkbox is checked 2023-11-28 10:44:34 +11:00
David Cook
4560e3728c Show popout on click or down key 
It looks like a select drop-down, so it can behave like one too.
 2023-11-28 10:44:34 +11:00
David Cook
735b5789cc [wip] Style on-hand button 
Had to update the form controller a little bit to handle buttons.

But arrow not showwing on focus.
Getting some weird SCSS behaviour here.. maybe I'm trying to be too clever.
 2023-11-28 10:44:34 +11:00
David Cook
d218565834 Style stock popout 2023-11-28 10:44:34 +11:00
David Cook
d9570cdf32 Update v3 checkbox style 
This doesn't _quite_ match the design, but would require a big CSS hack to customise it further, so I thought let's start with this.
 2023-11-28 10:44:34 +11:00
David Cook
eccfe96a5b Use form hash structure 
The array format is generally fine, but to properly support checkboxes, we need this format with hash keys.
https://guides.rubyonrails.org/form_helpers.html#understanding-parameter-naming-conventions
 2023-11-28 10:44:34 +11:00
David Cook
55cd8a6773 Add on_demand field 
But 'Array parameters do not play well with the check_box helper.'

...
 2023-11-28 10:43:10 +11:00
David Cook
7aefa834bf Add on_hand input 2023-11-28 10:43:10 +11:00
David Cook
4d22123e02 Remove stock level from product row 
It creates the false impression we can handle agregated stock.
 2023-11-28 10:43:10 +11:00
David Cook
d989b8ad2f Remove unnecessary partial 
Yay, now it's compact enough to fit in the table partial.

(Although we should probably try to reduce that one down one day..)
 2023-11-24 16:28:00 +11:00
David Cook
968a224da6 Move vertical ellipsis menu to a ViewComponent 
Javascript hasn't been moved in, as we don't seem to be set up for that yet.

We could make it smarter, and pass in an array of parameters to build the links (as in _order_links.html.haml). But why make it complicated if we don't need to?
 2023-11-24 16:23:18 +11:00
David Cook
2bd2bea7b7 Remove need for class 
Generally, I would say that style rules should have a BEM-style class name, but in this case it's terribly convenient to support a tags directly.
 2023-11-24 16:14:28 +11:00
Rachel Arnould
1088b6b6dd Merge pull request #11785 from chahmedejaz/task/11067-admin_style_v3-product-clone 
Implement product clone
 2023-11-22 16:29:38 +01:00
Yasir Azgar
72089d8213 11612 - pass date args 
fix typo
 2023-11-21 11:15:52 +01:00
binarygit
208cad959a Open external link in product description inside new page 2023-11-21 13:33:48 +05:45
Ahmed Ejaz
29eadedc3a Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-17 03:45:54 +05:00
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
Ahmed Ejaz
2d55322a55 Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-11 16:00:15 +05:00
Ahmed Ejaz
e1e46bcbc2 #11067, hide clone option for variant 2023-11-10 15:36:10 +05:00
Dusan Orlovic
0f30836c1d Check for .present? for ENV GOOGLE variables 2023-11-09 09:45:19 +01:00
Ahmed Ejaz
851ce281ea #11067, implement product clone 2023-11-08 18:36:22 +05: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