Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category

Conflicts:
	app/overrides/spree/admin/products/new/replace_form.html.haml.deface
	app/views/spree/order_mailer/confirm_email.text.haml

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)

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