raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

11060 - implement scenario 1

Browse Source
This commit is contained in:
Ahmed Ejaz
2024-04-19 02:09:29 +05:00
committed by Rachel Arnould
parent 2fdaa8b9ec
commit ec4b920f8b
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/admin/products_v3/_product_row.html.haml
View File

@@ -27,9 +27,10 @@
-# empty
%td.align-right
-# empty
%td.naked_inputs.align-left
= f.select :supplier_id, options_for_select(producer_options, product.supplier&.id), {},
data: { "controller": "tom-select", 'tom-select-placeholder-value': t('admin.products_v3.filters.search_for_producers')}
- if producer_options.many?
%td.naked_inputs.align-left
= f.select :supplier_id, options_for_select(producer_options, product.supplier&.id), {},
data: { "controller": "tom-select", 'tom-select-placeholder-value': t('admin.products_v3.filters.search_for_producers')}
%td.align-left
-# empty
%td.align-left

9
app/views/admin/products_v3/_table.html.haml
View File

@@ -55,7 +55,8 @@
%th.align-left.with-input= t('admin.products_page.columns.unit')
%th.align-left.with-input= t('admin.products_page.columns.price')
%th.align-left.with-input= t('admin.products_page.columns.on_hand')
%th.align-left= t('admin.products_page.columns.producer')
- if producer_options.many?
%th.align-left= t('admin.products_page.columns.producer')
%th.align-left= t('admin.products_page.columns.category')
%th.align-left= t('admin.products_page.columns.tax_category')
%th.align-left= t('admin.products_page.columns.inherits_properties')
@@ -71,17 +72,17 @@
- product.variants.each_with_index do |variant, variant_index|
= form.fields_for("products][#{product_index}][variants_attributes][", variant, index: variant_index) do |variant_form|
%tr.condensed{ 'data-controller': "variant" }
= render partial: 'variant_row', locals: { variant:, f: variant_form }
= render partial: 'variant_row', locals: { variant:, f: variant_form, producer_options: }
= form.fields_for("products][#{product_index}][variants_attributes][NEW_RECORD", product.variants.build) do |new_variant_form|
%template{ 'data-nested-form-target': "template" }
%tr.condensed{ 'data-controller': "variant" }
= render partial: 'variant_row', locals: { variant: new_variant_form.object, f: new_variant_form }
= render partial: 'variant_row', locals: { variant: new_variant_form.object, f: new_variant_form, producer_options: }
%tr{ 'data-nested-form-target': "target" }
%tr.condensed
%td
%td{ colspan: 11 }
%td{ colspan: producer_options.many? ? 11 : 10 }
%button.secondary.condensed.naked.icon-plus{ 'data-action': "nested-form#add",
'aria-label': t('.new_variant') }
=t('.new_variant')

5
app/views/admin/products_v3/_variant_row.html.haml
View File

@@ -39,8 +39,9 @@
= f.label :on_demand do
= f.check_box :on_demand, 'data-action': 'change->toggle-control#disableIfPresent change->popout#closeIfChecked'
= t(:on_demand)
%td.align-left
.content= variant.product.supplier&.name # same as product
- if producer_options.many?
%td.align-left
.content= variant.product.supplier&.name # same as product
%td.align-left
.content= variant.primary_taxon&.name
%td.align-left