diff --git a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface index 974e31f3ee..33c70b728e 100644 --- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface +++ b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface @@ -38,8 +38,6 @@ .twelve.columns.alpha .six.columns.alpha = render 'spree/admin/products/primary_taxon_form', f: f - - if Spree::TaxCategory.any? - = render 'spree/admin/products/tax_category_form', f: f .three.columns = f.field_container :price do = f.label :price, t(:price) @@ -54,6 +52,16 @@ %br/ = f.text_field :on_hand, class: 'fullwidth' = f.error_message_on :on_hand + .twelve.columns.alpha + .six.columns.alpha   + .three.columns + - if Spree::TaxCategory.any? + = render 'spree/admin/products/tax_category_form', f: f + - else +   + .three.columns.omega + = render 'spree/admin/products/shipping_category_form', f: f + .twelve.columns.alpha = f.field_container :description do = f.label :product_description, t(:product_description) diff --git a/app/views/spree/admin/products/_shipping_category_form.html.haml b/app/views/spree/admin/products/_shipping_category_form.html.haml new file mode 100644 index 0000000000..8460f2c32b --- /dev/null +++ b/app/views/spree/admin/products/_shipping_category_form.html.haml @@ -0,0 +1,4 @@ += f.field_container :shipping_categories do + = f.label :shipping_category_id, t(:shipping_categories) + = f.collection_select(:shipping_category_id, Spree::ShippingCategory.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'}) + = f.error_message_on :shipping_category_id