From ea45462e507d28904a88c0bd82a31262cc1037d6 Mon Sep 17 00:00:00 2001 From: ijdershem-jf Date: Tue, 13 Dec 2022 18:17:49 -0700 Subject: [PATCH 1/2] [9834-PT3] Add placeholder/default select option for new product supplier field --- app/views/spree/admin/products/new.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index 97c5e0dbf3..02a45de3b2 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -9,8 +9,9 @@ .sixteen.columns.alpha .eight.columns.alpha = f.field_container :supplier do - = f.label :supplier_id, t(".supplier") - = f.select :supplier_id, options_from_collection_for_select(@producers, :id, :name, @product.supplier_id), {}, { "data-controller": "tom-select", class: "primary" } + = f.label :supplier, t(".supplier") + %span.required * + = f.select :supplier_id, options_from_collection_for_select(@producers, :id, :name, @product.supplier_id), { include_blank: "Select a supplier" }, { "data-controller": "tom-select", class: "primary" } = f.error_message_on :supplier .eight.columns.omega = f.field_container :name do From 741dc0e29c1139322b8e4e5d629ff599c2448eae Mon Sep 17 00:00:00 2001 From: ijdershem-jf Date: Wed, 14 Dec 2022 20:35:19 -0700 Subject: [PATCH 2/2] [9834-PT3] Add en translation for new product supplier select placeholder --- app/views/spree/admin/products/new.html.haml | 2 +- config/locales/en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/spree/admin/products/new.html.haml b/app/views/spree/admin/products/new.html.haml index 02a45de3b2..d16c2da79f 100644 --- a/app/views/spree/admin/products/new.html.haml +++ b/app/views/spree/admin/products/new.html.haml @@ -11,7 +11,7 @@ = f.field_container :supplier do = f.label :supplier, t(".supplier") %span.required * - = f.select :supplier_id, options_from_collection_for_select(@producers, :id, :name, @product.supplier_id), { include_blank: "Select a supplier" }, { "data-controller": "tom-select", class: "primary" } + = f.select :supplier_id, options_from_collection_for_select(@producers, :id, :name, @product.supplier_id), { include_blank: t("spree.admin.products.new.supplier_select_placeholder") }, { "data-controller": "tom-select", class: "primary" } = f.error_message_on :supplier .eight.columns.omega = f.field_container :name do diff --git a/config/locales/en.yml b/config/locales/en.yml index 9c38d6b867..cb619465a3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4035,6 +4035,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using title: "New Product" new_product: "New Product" supplier: "Supplier" + supplier_select_placeholder: "Select a supplier" product_name: "Product Name" units: "Unit Size" value: "Value"