From 7ba366e2a6a7aa9b5bb256bd387f66404f081d85 Mon Sep 17 00:00:00 2001 From: Liv Galendez Date: Tue, 3 Mar 2015 20:46:25 +1100 Subject: [PATCH 1/5] Added select for coordinator since there are 2 now --- spec/features/admin/order_cycles_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb index c84a6d65c7..b1ad3a8843 100644 --- a/spec/features/admin/order_cycles_spec.rb +++ b/spec/features/admin/order_cycles_spec.rb @@ -85,6 +85,7 @@ feature %q{ fill_in 'order_cycle_name', with: 'Plums & Avos' fill_in 'order_cycle_orders_open_at', with: '2012-11-06 06:00:00' fill_in 'order_cycle_orders_close_at', with: '2012-11-13 17:00:00' + select 'My coordinator', from: 'order_cycle_coordinator_id' # And I add a coordinator fee click_button 'Add coordinator fee' From fc63d8719c2ad8960e597dc4d3cba5b11f893a1c Mon Sep 17 00:00:00 2001 From: Liv Galendez Date: Tue, 3 Mar 2015 20:53:39 +1100 Subject: [PATCH 2/5] Used order_cycle_permitted_enterprises helper in order cycles row --- app/views/admin/order_cycles/_row.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml index de18679cf6..9d05ac176d 100644 --- a/app/views/admin/order_cycles/_row.html.haml +++ b/app/views/admin/order_cycles/_row.html.haml @@ -7,12 +7,12 @@ - unless order_cycles_simple_index %td.suppliers - - order_cycle.suppliers.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |s| + - order_cycle.suppliers.merge(order_cycle_permitted_enterprises).each do |s| = s.name %br/ %td= order_cycle.coordinator.name %td.distributors - - order_cycle.distributors.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |d| + - order_cycle.distributors.merge(order_cycle_permitted_enterprises).each do |d| = d.name %br/ From c940a34ec9a182aa1aae2c30814db9826acc6cef Mon Sep 17 00:00:00 2001 From: Liv Galendez Date: Tue, 3 Mar 2015 21:03:01 +1100 Subject: [PATCH 3/5] Created order_cycle_permitted_in helper --- app/helpers/order_cycles_helper.rb | 4 ++++ app/views/admin/order_cycles/_row.html.haml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb index 6e401af0a6..b870f9c985 100644 --- a/app/helpers/order_cycles_helper.rb +++ b/app/helpers/order_cycles_helper.rb @@ -3,6 +3,10 @@ module OrderCyclesHelper @current_order_cycle ||= current_order(false).andand.order_cycle end + def order_cycle_permitted_in(enterprises) + enterprises.merge(order_cycle_permitted_enterprises) + end + def order_cycle_permitted_enterprises OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises end diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml index 9d05ac176d..91191a2a8a 100644 --- a/app/views/admin/order_cycles/_row.html.haml +++ b/app/views/admin/order_cycles/_row.html.haml @@ -7,12 +7,12 @@ - unless order_cycles_simple_index %td.suppliers - - order_cycle.suppliers.merge(order_cycle_permitted_enterprises).each do |s| + - order_cycle_permitted_in(order_cycle.suppliers).each do |s| = s.name %br/ %td= order_cycle.coordinator.name %td.distributors - - order_cycle.distributors.merge(order_cycle_permitted_enterprises).each do |d| + - order_cycle_permitted_in(order_cycle.distributors).each do |d| = d.name %br/ From 266d6ef834d902ae14355ff8d12cbfe90fe6e49b Mon Sep 17 00:00:00 2001 From: Liv Galendez Date: Fri, 6 Mar 2015 11:55:35 +1100 Subject: [PATCH 4/5] Fixed handling of distributors field --- app/views/admin/order_cycles/_row.html.haml | 22 +++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml index 91191a2a8a..a80cb7948a 100644 --- a/app/views/admin/order_cycles/_row.html.haml +++ b/app/views/admin/order_cycles/_row.html.haml @@ -7,13 +7,27 @@ - unless order_cycles_simple_index %td.suppliers - - order_cycle_permitted_in(order_cycle.suppliers).each do |s| - = s.name + - suppliers = order_cycle_permitted_in(order_cycle.suppliers) + - if suppliers.count > 3 + - supplier_list = suppliers.map(&:name).sort.join ', ' + %span.with-tip{'data-powertip' => supplier_list} + = suppliers.count + suppliers + - else + - suppliers.each do |s| + = s.name %br/ %td= order_cycle.coordinator.name %td.distributors - - order_cycle_permitted_in(order_cycle.distributors).each do |d| - = d.name + - distributors = order_cycle_permitted_in(order_cycle.distributors) + - if distributors.count > 3 + - distributor_list = distributors.map(&:name).sort.join ', ' + %span.with-tip{'data-powertip' => distributor_list} + = distributors.count + distributors + - else + - distributors.each do |d| + = d.name %br/ %td.products From c4d4d1087363db7b74a85d374be4777299ae9eb7 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 12 Mar 2015 11:53:13 +1100 Subject: [PATCH 5/5] Reuse supplier/distributor list --- app/views/admin/order_cycles/_row.html.haml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml index a80cb7948a..8c7ce2bbbd 100644 --- a/app/views/admin/order_cycles/_row.html.haml +++ b/app/views/admin/order_cycles/_row.html.haml @@ -8,26 +8,23 @@ - unless order_cycles_simple_index %td.suppliers - suppliers = order_cycle_permitted_in(order_cycle.suppliers) + - supplier_list = suppliers.map(&:name).sort.join ', ' - if suppliers.count > 3 - - supplier_list = suppliers.map(&:name).sort.join ', ' %span.with-tip{'data-powertip' => supplier_list} = suppliers.count suppliers - else - - suppliers.each do |s| - = s.name - %br/ + = supplier_list %td= order_cycle.coordinator.name %td.distributors - distributors = order_cycle_permitted_in(order_cycle.distributors) + - distributor_list = distributors.map(&:name).sort.join ', ' - if distributors.count > 3 - - distributor_list = distributors.map(&:name).sort.join ', ' %span.with-tip{'data-powertip' => distributor_list} = distributors.count distributors - else - - distributors.each do |d| - = d.name + = distributor_list %br/ %td.products