Merge pull request #2766 from HugsDaniel/2744_add_require_ship_addres…

…s_to_shipping_methods_form

[Spree Upgrade] Add require_shipping_address to shipping_methods_form

app/views/spree/admin/shipping_methods/_form.html.haml

@@ -21,6 +21,20 @@
         = select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }, {}, {class: 'select2 fullwidth'})
         = error_message_on :shipping_method, :display_on
 
+  .row
+    .alpha.three.columns
+      -# The 'Category' label here is just a logical descriptor for the data we are trying to collect for 'requires_ship_address'
+      -# and does not relate to shipping categories in any way.
+      = f.label :require_ship_address, t(:category)
+    .two.columns
+      = f.radio_button :require_ship_address, true
+       
+      = f.label :delivery, t(:delivery)
+    .omega.six.columns
+      = f.radio_button :require_ship_address, false
+       
+      = f.label :pick_up, t(:pick_up)
+
   .row
     .alpha.three.columns
       = f.label :tags, t(:tags)
@@ -43,7 +57,7 @@
             = category.name
             %br/
         = error_message_on :shipping_method, :shipping_category_id
-        
+
   .alpha.six.columns
     %fieldset.no-border-bottom
       %legend{align: "center"}= Spree.t(:zones)