From 4360ddde036f648a66a2004dcb1e51ed8f103fd3 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Fri, 19 Apr 2024 13:20:03 +0500 Subject: [PATCH] 11060 - add variant categories dropdown --- app/views/admin/products_v3/_content.html.haml | 2 +- app/views/admin/products_v3/_table.html.haml | 4 ++-- app/views/admin/products_v3/_variant_row.html.haml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/admin/products_v3/_content.html.haml b/app/views/admin/products_v3/_content.html.haml index df6860f6ba..1b50fa3f10 100644 --- a/app/views/admin/products_v3/_content.html.haml +++ b/app/views/admin/products_v3/_content.html.haml @@ -15,7 +15,7 @@ .container.results .sixteen.columns = render partial: 'sort', locals: { pagy: pagy, search_term: search_term, producer_id: producer_id, category_id: category_id } - = render partial: 'table', locals: { products:, producer_options: } + = render partial: 'table', locals: { products:, producer_options:, category_options: } - if pagy.present? && pagy.pages > 1 = render partial: 'admin/shared/stimulus_pagination', locals: { pagy: pagy } - else diff --git a/app/views/admin/products_v3/_table.html.haml b/app/views/admin/products_v3/_table.html.haml index 47fc94fd72..b95c9f5187 100644 --- a/app/views/admin/products_v3/_table.html.haml +++ b/app/views/admin/products_v3/_table.html.haml @@ -72,12 +72,12 @@ - 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, producer_options: } + = render partial: 'variant_row', locals: { variant:, f: variant_form, producer_options:, category_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, producer_options: } + = render partial: 'variant_row', locals: { variant: new_variant_form.object, f: new_variant_form, producer_options:, category_options: } %tr{ 'data-nested-form-target': "target" } %tr.condensed diff --git a/app/views/admin/products_v3/_variant_row.html.haml b/app/views/admin/products_v3/_variant_row.html.haml index a99badd55a..8ea77ca01f 100644 --- a/app/views/admin/products_v3/_variant_row.html.haml +++ b/app/views/admin/products_v3/_variant_row.html.haml @@ -43,7 +43,8 @@ %td.align-left .content= variant.product.supplier&.name # same as product %td.align-left - .content= variant.primary_taxon&.name + = f.select :primary_taxon_id, options_for_select(category_options, variant.primary_taxon_id), {}, + data: { "controller": "tom-select", 'tom-select-placeholder-value': t('admin.products_v3.filters.search_for_categories')} %td.align-left .content= (variant.tax_category_id ? variant.tax_category&.name : t('.none_tax_category')) # TODO: convert to dropdown %td.align-left