Fix form local var naming for admin shared address form

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

@@ -33,4 +33,4 @@
       %td Regular pickup times:
       %td= f.text_field :pickup_times
     = f.fields_for :pickup_address do |pickup_address_form|
-      = render 'spree/admin/shared/address_form', :form => pickup_address_form
+      = render 'spree/admin/shared/address_form', :f => pickup_address_form

app/views/spree/admin/shared/_address_form.html.haml

@@ -1,18 +1,18 @@
 %tr{"data-hook" => "address1"}
   %td Address:
-  %td= form.text_field :address1
+  %td= f.text_field :address1
 %tr{"data-hook" => "address2"}
   %td Address (cont.):
-  %td= form.text_field :address2
+  %td= f.text_field :address2
 %tr{"data-hook" => "city"}
   %td City:
-  %td= form.text_field :city
+  %td= f.text_field :city
 %tr{"data-hook" => "zipcode"}
   %td Postcode:
-  %td= form.text_field :zipcode
+  %td= f.text_field :zipcode
 %tr{"data-hook" => "country"}
   %td Country:
-  %td= form.collection_select(:country_id, available_countries, :id, :name)
+  %td= f.collection_select(:country_id, available_countries, :id, :name)
 %tr{"data-hook" => "state"}
   %td State:
-  %td= form.collection_select(:state_id, form.object.country.states, :id, :name)
+  %td= f.collection_select(:state_id, f.object.country.states, :id, :name)

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

@@ -6,7 +6,7 @@
     %td Description:
     %td= f.text_field :description
   = f.fields_for :address do |address_form|
-    = render 'spree/admin/shared/address_form', :form => address_form
+    = render 'spree/admin/shared/address_form', :f => address_form
   %tr{'data-hook' => "email"}
     %td Email:
     %td= f.text_field :email