From e9f04c3c15cde465d6574edcdfa110f9860b501c Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 18 Dec 2014 17:17:24 +1100 Subject: [PATCH] Clean up whitespace --- .../admin/reports_controller_decorator.rb | 2 +- app/helpers/spree/reports_helper.rb | 4 ++-- ...der_cycle_management_description.html.haml | 2 +- .../reports/order_cycle_management.html.haml | 8 +++---- config/routes.rb | 2 +- .../order_cycle_management_report.rb | 24 ++++++++----------- .../order_cycle_management_report_spec.rb | 12 +++++----- spec/models/spree/order_spec.rb | 6 ++--- 8 files changed, 28 insertions(+), 32 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index eab6d7d162..6da368eff1 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -68,7 +68,7 @@ Spree::Admin::ReportsController.class_eval do @search = Spree::Order.complete.not_state(:canceled).managed_by(spree_current_user).search(params[:q]) @orders = @search.result - + render_report(@report.header, @report.table, params[:csv], "customers.csv") end diff --git a/app/helpers/spree/reports_helper.rb b/app/helpers/spree/reports_helper.rb index 6a1e206a24..81310b6c62 100644 --- a/app/helpers/spree/reports_helper.rb +++ b/app/helpers/spree/reports_helper.rb @@ -13,8 +13,8 @@ module Spree end def report_shipping_method_options(orders) - orders.map { |o| o.shipping_method.andand.name }.uniq - end + orders.map { |o| o.shipping_method.andand.name }.uniq + end end end diff --git a/app/views/spree/admin/reports/_order_cycle_management_description.html.haml b/app/views/spree/admin/reports/_order_cycle_management_description.html.haml index d4d20ae66e..0a1ee7f69c 100644 --- a/app/views/spree/admin/reports/_order_cycle_management_description.html.haml +++ b/app/views/spree/admin/reports/_order_cycle_management_description.html.haml @@ -1,4 +1,4 @@ %ul{style: "margin-left: 12pt"} - report_types.each do |report_type| - %li + %li = link_to report_type[0], "#{order_cycle_management_admin_reports_url}?report_type=#{report_type[1]}" diff --git a/app/views/spree/admin/reports/order_cycle_management.html.haml b/app/views/spree/admin/reports/order_cycle_management.html.haml index aa59e5a046..fbe365c742 100644 --- a/app/views/spree/admin/reports/order_cycle_management.html.haml +++ b/app/views/spree/admin/reports/order_cycle_management.html.haml @@ -9,15 +9,15 @@ = label_tag nil, "Payment Methods (hold Ctrl to select multiple payment methods)" %br - = select_tag(:payment_method_name, - options_for_select(report_payment_method_options(@orders), params[:payment_method_name]), + = select_tag(:payment_method_name, + options_for_select(report_payment_method_options(@orders), params[:payment_method_name]), multiple: true, include_blank: true, size: 10) %br %br = label_tag nil, "Shipping Method: " - = select_tag(:shipping_method_name, + = select_tag(:shipping_method_name, options_for_select(report_shipping_method_options(@orders), params[:shipping_method_name]), - include_blank: true) + include_blank: true) %br %br = check_box_tag :csv diff --git a/config/routes.rb b/config/routes.rb index 15025cf88c..37c1974875 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -116,7 +116,7 @@ end Spree::Core::Engine.routes.prepend do match '/admin/reports/orders_and_distributors' => 'admin/reports#orders_and_distributors', :as => "orders_and_distributors_admin_reports", :via => [:get, :post] - match '/admin/reports/order_cycle_management' => 'admin/reports#order_cycle_management', :as => "order_cycle_management_admin_reports", :via => [:get, :post] + match '/admin/reports/order_cycle_management' => 'admin/reports#order_cycle_management', :as => "order_cycle_management_admin_reports", :via => [:get, :post] match '/admin/reports/group_buys' => 'admin/reports#group_buys', :as => "group_buys_admin_reports", :via => [:get, :post] match '/admin/reports/bulk_coop' => 'admin/reports#bulk_coop', :as => "bulk_coop_admin_reports", :via => [:get, :post] match '/admin/reports/payments' => 'admin/reports#payments', :as => "payments_admin_reports", :via => [:get, :post] diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb index ae5f9bf7fa..06a90bfe25 100644 --- a/lib/open_food_network/order_cycle_management_report.rb +++ b/lib/open_food_network/order_cycle_management_report.rb @@ -8,7 +8,6 @@ module OpenFoodNetwork def header ["First Name", "Last Name", "Email", "Phone", "Hub", "Shipping Method", "Payment Method", "Amount"] - end def table @@ -16,14 +15,14 @@ module OpenFoodNetwork ba = order.billing_address da = order.distributor.andand.address [ba.firstname, - ba.lastname, - order.email, - ba.phone, - order.distributor.andand.name, - order.shipping_method.andand.name, - order.payments.first.andand.payment_method.andand.name, - order.payments.first.amount - ] + ba.lastname, + order.email, + ba.phone, + order.distributor.andand.name, + order.shipping_method.andand.name, + order.payments.first.andand.payment_method.andand.name, + order.payments.first.amount + ] end end @@ -35,7 +34,7 @@ module OpenFoodNetwork filter_to_order_cycle filter_to_payment_method filter_to_shipping_method orders end - def filter_to_payment_method (orders) + def filter_to_payment_method(orders) if params[:payment_method_name].present? orders.with_payment_method_name(params[:payment_method_name]) else @@ -43,7 +42,7 @@ module OpenFoodNetwork end end - def filter_to_shipping_method (orders) + def filter_to_shipping_method(orders) if params[:shipping_method_name].present? orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:shipping_method_name]) else @@ -58,8 +57,5 @@ module OpenFoodNetwork orders end end - - end end - diff --git a/spec/lib/open_food_network/order_cycle_management_report_spec.rb b/spec/lib/open_food_network/order_cycle_management_report_spec.rb index bdf6ad3bca..e0e7cb40bf 100644 --- a/spec/lib/open_food_network/order_cycle_management_report_spec.rb +++ b/spec/lib/open_food_network/order_cycle_management_report_spec.rb @@ -72,7 +72,7 @@ module OpenFoodNetwork let!(:order1) { create(:order, shipping_method: sm1, order_cycle: oc1) } let!(:payment1) { create(:payment, order: order1, payment_method: pm1) } - it "returns all orders sans-params" do + it "returns all orders sans-params" do subject.filter(orders).should == orders end @@ -84,16 +84,16 @@ module OpenFoodNetwork subject.filter(orders).should == [order1] end - it "filters to a payment method" do - pm2 = create(:payment_method, name: "PM2") - order2 = create(:order) - payment2 = create(:payment, order: order2, payment_method: pm2) + it "filters to a payment method" do + pm2 = create(:payment_method, name: "PM2") + order2 = create(:order) + payment2 = create(:payment, order: order2, payment_method: pm2) subject.stub(:params).and_return(payment_method_name: pm1.name) subject.filter(orders).should == [order1] end - it "filters to a shipping method" do + it "filters to a shipping method" do sm2 = create(:shipping_method, name: "ship2") order2 = create(:order, shipping_method: sm2) diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb index 28c4997032..114f774a1d 100644 --- a/spec/models/spree/order_spec.rb +++ b/spec/models/spree/order_spec.rb @@ -77,7 +77,7 @@ describe Spree::Order do subject.update_distribution_charge! end - it "ensures the correct adjustment(s) are created for order cycles" do + it "ensures the correct adjustment(s) are created for order cycles" do EnterpriseFee.stub(:clear_all_adjustments_on_order) line_item = double(:line_item) subject.stub(:line_items) { [line_item] } @@ -348,12 +348,12 @@ describe Spree::Order do it "returns the order with payment method name" do Spree::Order.with_payment_method_name('foo').should == [o1] end - + it "doesn't return rows with a different payment method name" do Spree::Order.with_payment_method_name('foobar').should_not include o1 Spree::Order.with_payment_method_name('foobar').should_not include o2 end - + it "doesn't return duplicate rows" do p2 = FactoryGirl.create(:payment, :order => o1, :payment_method => pm1) Spree::Order.with_payment_method_name('foo').length.should == 1