Merge branch 'group-by-unit-size-display' into combined/shopfront_group-buy_customer-contact

app/views/spree/admin/products/_group_buy_form.html.haml

@@ -9,6 +9,6 @@
     = f.label :group_buy_0, 'No'
 %br.clear
 = f.field_container :group_buy_unit_size do
-  = f.label :group_buy_unit_size
+  = f.label :group_buy_unit_size, "Bulk unit size"
   %br
   = f.text_field :group_buy_unit_size

app/views/spree/admin/products/_supplier_and_group_buy_for_new.html.haml

@@ -1,20 +0,0 @@
-.row
-  .alpha.six.columns
-    = f.field_container :supplier do
-      = f.label :supplier
-      = f.collection_select(:supplier_id, Enterprise.is_primary_producer.managed_by(spree_current_user).by_name, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
-      = f.error_message_on :supplier
-  .four.columns
-    = f.field_container :group_buy do
-      = f.label :group_buy, 'Group buy?'
-      %br
-      .alpha.two.columns
-        = f.radio_button :group_buy, '1', :checked => f.object.group_buy
-        = f.label :group_buy_1, 'Yes'
-      .omega.two.columns
-        = f.radio_button :group_buy, '0', :checked => !f.object.group_buy
-        = f.label :group_buy_0, 'No'
-  .omega.six.columns
-    = f.field_container :group_buy_unit_size do
-      = f.label :group_buy_unit_size
-      = f.text_field :group_buy_unit_size, :class => "fullwidth"

lib/open_food_network/bulk_coop_report.rb

@@ -23,7 +23,7 @@ module OpenFoodNetwork
       when "bulk_coop_customer_payments"
         ["Customer", "Date of Order", "Total Cost", "Amount Owing", "Amount Paid"]
       else
-        ["Supplier", "Product", "Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total", "Units Required", "Remainder"]
+        ["Supplier", "Product", "Bulk Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total", "Units Required", "Remainder"]
       end
     end
 

lib/open_food_network/reports/bulk_coop_allocation_report.rb

@@ -2,7 +2,7 @@ require 'open_food_network/reports/bulk_coop_report'
 
 module OpenFoodNetwork::Reports
   class BulkCoopAllocationReport < BulkCoopReport
-    header "Customer", "Product", "Unit Size", "Variant", "Variant value", "Variant unit", "Weight", "Sum Total", "Total Available", "Unallocated", "Max quantity excess"
+    header "Customer", "Product", "Bulk Unit Size", "Variant", "Variant value", "Variant unit", "Weight", "Sum Total", "Total Available", "Unallocated", "Max quantity excess"
 
     organise do
         group { |li| li.variant.product }

lib/open_food_network/reports/bulk_coop_report.rb

@@ -22,11 +22,7 @@ module OpenFoodNetwork::Reports
       end
 
       def group_buy_unit_size_f(lis)
-        if lis.first.variant.product.group_buy
-          group_buy_unit_size(lis)
-        else
-          ""
-        end
+        group_buy_unit_size(lis)
       end
 
       def total_amount(lis)

lib/open_food_network/reports/bulk_coop_supplier_report.rb

@@ -2,7 +2,7 @@ require 'open_food_network/reports/bulk_coop_report'
 
 module OpenFoodNetwork::Reports
   class BulkCoopSupplierReport < BulkCoopReport
-    header "Supplier", "Product", "Unit Size", "Variant", "Variant value", "Variant unit", "Weight", "Sum Total", "Units Required", "Unallocated", "Max quantity excess"
+    header "Supplier", "Product", "Bulk Unit Size", "Variant", "Variant value", "Variant unit", "Weight", "Sum Total", "Units Required", "Unallocated", "Max quantity excess"
 
     organise do
       group { |li| li.variant.product.supplier }

spec/features/admin/products_spec.rb

@@ -82,7 +82,7 @@ feature %q{
       visit spree.edit_admin_product_path(product)
 
       choose 'product_group_buy_1'
-      fill_in 'Group buy unit size', :with => '10'
+      fill_in 'Bulk unit size', :with => '10'
 
       click_button 'Update'