From 57caeb64c51537919f521ce39a2dee98816f05ab Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 3 Sep 2015 12:24:57 +1000 Subject: [PATCH 1/3] Remove unused product form partial --- .../_supplier_and_group_buy_for_new.html.haml | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 app/views/spree/admin/products/_supplier_and_group_buy_for_new.html.haml diff --git a/app/views/spree/admin/products/_supplier_and_group_buy_for_new.html.haml b/app/views/spree/admin/products/_supplier_and_group_buy_for_new.html.haml deleted file mode 100644 index d17a45fa6c..0000000000 --- a/app/views/spree/admin/products/_supplier_and_group_buy_for_new.html.haml +++ /dev/null @@ -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" From 0fdd00058959728f07654ea64c09af0491ed7ccb Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 3 Sep 2015 12:26:40 +1000 Subject: [PATCH 2/3] Showing Bulk Unit Size in BulkCoopReport The group_buy_unit_size field is now shown even if 'group buy' is not enabled. And "Group By Unit Size" is now displayed as "Bulk Unit Size". --- app/views/spree/admin/products/_group_buy_form.html.haml | 2 +- lib/open_food_network/bulk_coop_report.rb | 2 +- .../reports/bulk_coop_allocation_report.rb | 2 +- lib/open_food_network/reports/bulk_coop_report.rb | 6 +----- lib/open_food_network/reports/bulk_coop_supplier_report.rb | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/views/spree/admin/products/_group_buy_form.html.haml b/app/views/spree/admin/products/_group_buy_form.html.haml index 6669563d15..71e8b20485 100644 --- a/app/views/spree/admin/products/_group_buy_form.html.haml +++ b/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 :bulk_unit_size %br = f.text_field :group_buy_unit_size diff --git a/lib/open_food_network/bulk_coop_report.rb b/lib/open_food_network/bulk_coop_report.rb index d6bf23f85b..4e01553274 100644 --- a/lib/open_food_network/bulk_coop_report.rb +++ b/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 diff --git a/lib/open_food_network/reports/bulk_coop_allocation_report.rb b/lib/open_food_network/reports/bulk_coop_allocation_report.rb index 52efbc677c..313c92fe71 100644 --- a/lib/open_food_network/reports/bulk_coop_allocation_report.rb +++ b/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 } diff --git a/lib/open_food_network/reports/bulk_coop_report.rb b/lib/open_food_network/reports/bulk_coop_report.rb index 5c0916585d..dbce047963 100644 --- a/lib/open_food_network/reports/bulk_coop_report.rb +++ b/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) diff --git a/lib/open_food_network/reports/bulk_coop_supplier_report.rb b/lib/open_food_network/reports/bulk_coop_supplier_report.rb index b40557ea1a..df3b40c519 100644 --- a/lib/open_food_network/reports/bulk_coop_supplier_report.rb +++ b/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 } From 93f6667c4be733ec12b58aeed133b1030d683cda Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 3 Sep 2015 15:01:28 +1000 Subject: [PATCH 3/3] Update products group by spec --- app/views/spree/admin/products/_group_buy_form.html.haml | 2 +- spec/features/admin/products_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/spree/admin/products/_group_buy_form.html.haml b/app/views/spree/admin/products/_group_buy_form.html.haml index 71e8b20485..8f1de2a884 100644 --- a/app/views/spree/admin/products/_group_buy_form.html.haml +++ b/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 :bulk_unit_size + = f.label :group_buy_unit_size, "Bulk unit size" %br = f.text_field :group_buy_unit_size diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb index 59748091b3..2aafc82b02 100644 --- a/spec/features/admin/products_spec.rb +++ b/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'