Merge remote-tracking branch 'origin/master' into order-confirmation

app/controllers/spree/admin/reports_controller_decorator.rb

@@ -28,7 +28,8 @@ Spree::Admin::ReportsController.class_eval do
       ["Addresses", :addresses]
     ],
     order_cycle_management: [
-      ["Payment Methods Report", :payment_methods_report]
+      ["Payment Methods Report", :payment_methods],
+      ["Delivery Report", :delivery]
     ]
   }
 
@@ -59,7 +60,6 @@ Spree::Admin::ReportsController.class_eval do
     @report_types = REPORT_TYPES[:customers]
     @report_type = params[:report_type]
     @report = OpenFoodNetwork::CustomersReport.new spree_current_user, params
-    
     render_report(@report.header, @report.table, params[:csv], "customers_#{timestamp}.csv")
   end
 
@@ -69,7 +69,6 @@ Spree::Admin::ReportsController.class_eval do
     @report = OpenFoodNetwork::OrderCycleManagementReport.new spree_current_user, params
 
     @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], "order_cycle_management_#{timestamp}.csv")

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

app/models/customer.rb

@@ -0,0 +1,7 @@
+class Customer < ActiveRecord::Base
+  belongs_to :enterprise
+
+  validates :code, presence: true, uniqueness: {scope: :enterprise_id}
+  validates :email, presence: true
+  validates :enterprise_id, presence: true
+end

app/models/spree/shipping_category_decorator.rb

@@ -0,0 +1,3 @@
+Spree::ShippingCategory.class_eval do
+  attr_accessible :temperature_controlled
+end

app/overrides/spree/admin/shipping_categories/_form/add_temperature_controlled_form_element.html.haml.deface

@@ -0,0 +1,5 @@
+/ insert_bottom "div[data-hook='admin_shipping_category_form_fields']"
+
+%div.field.align-center{"data-hook" => "name"}
+  = f.label :temperature_controlled, t(:temperature_controlled)
+  = f.check_box :temperature_controlled

app/overrides/spree/admin/shipping_categories/index/add_temp_controlled_td.html.haml.deface

@@ -0,0 +1,5 @@
+/ insert_after "[data-hook='category_row'] td:first-child"
+
+%td.align-center
+  = shipping_category.temperature_controlled ? 'Yes' : 'No'
+  %br/

app/overrides/spree/admin/shipping_categories/index/add_temp_controlled_th.html.haml.deface

@@ -0,0 +1,4 @@
+/ insert_after "[data-hook='categories_header'] th:first-child"
+
+%th
+  Temperature Controlled

app/views/admin/order_cycles/_row.html.haml

@@ -7,13 +7,24 @@
 
   - unless order_cycles_simple_index
     %td.suppliers
-      - order_cycle.suppliers.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |s|
-        = s.name
-        %br/
+      - suppliers = order_cycle_permitted_in(order_cycle.suppliers)
+      - supplier_list = suppliers.map(&:name).sort.join ', '
+      - if suppliers.count > 3
+        %span.with-tip{'data-powertip' => supplier_list}
+          = suppliers.count
+          suppliers
+      - else
+        = supplier_list
     %td= order_cycle.coordinator.name
     %td.distributors
-      - order_cycle.distributors.merge(OpenFoodNetwork::Permissions.new(spree_current_user).order_cycle_enterprises).each do |d|
-        = d.name
+      - distributors = order_cycle_permitted_in(order_cycle.distributors)
+      - distributor_list = distributors.map(&:name).sort.join ', '
+      - if distributors.count > 3
+        %span.with-tip{'data-powertip' => distributor_list}
+          = distributors.count
+          distributors
+      - else
+        = distributor_list
         %br/
 
   %td.products

config/initializers/spree.rb

@@ -14,8 +14,12 @@ Spree.config do |config|
   config.checkout_zone = ENV["CHECKOUT_ZONE"]
   config.address_requires_state = true
 
-  country = Spree::Country.find_by_name(ENV["DEFAULT_COUNTRY"])
-  config.default_country_id = country.id if country.present?
+  if Spree::Country.table_exists?
+    country = Spree::Country.find_by_name(ENV["DEFAULT_COUNTRY"])
+    config.default_country_id = country.id if country.present?
+  else
+    config.default_country_id = 12  # Australia
+  end
 
   # -- spree_paypal_express
   # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface.

db/migrate/20150122145607_create_customers.rb

@@ -0,0 +1,18 @@
+class CreateCustomers < ActiveRecord::Migration
+  def change
+    create_table :customers do |t|
+      t.string :email, null: false
+      t.references :enterprise, null: false
+      t.string :code, null: false
+      t.references :user
+
+      t.timestamps
+    end
+    add_index :customers, [:enterprise_id, :code], unique: true
+    add_index :customers, :email
+    add_index :customers, :user_id
+
+    add_foreign_key :customers, :enterprises, column: :enterprise_id
+    add_foreign_key :customers, :spree_users, column: :user_id
+  end
+end

db/migrate/20150216075336_add_temperature_controlled_to_spree_shipping_categories.rb

@@ -0,0 +1,5 @@
+class AddTemperatureControlledToSpreeShippingCategories < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_categories, :temperature_controlled, :boolean, null: false, default: false
+  end
+end

db/schema.rb

@@ -155,6 +155,19 @@ ActiveRecord::Schema.define(:version => 20150225232938) do
   add_index "coordinator_fees", ["enterprise_fee_id"], :name => "index_coordinator_fees_on_enterprise_fee_id"
   add_index "coordinator_fees", ["order_cycle_id"], :name => "index_coordinator_fees_on_order_cycle_id"
 
+  create_table "customers", :force => true do |t|
+    t.string   "email",         :null => false
+    t.integer  "enterprise_id", :null => false
+    t.string   "code",          :null => false
+    t.integer  "user_id"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
+  add_index "customers", ["email"], :name => "index_customers_on_email"
+  add_index "customers", ["enterprise_id", "code"], :name => "index_customers_on_enterprise_id_and_code", :unique => true
+  add_index "customers", ["user_id"], :name => "index_customers_on_user_id"
+
   create_table "distributors_payment_methods", :id => false, :force => true do |t|
     t.integer "distributor_id"
     t.integer "payment_method_id"
@@ -588,9 +601,9 @@ ActiveRecord::Schema.define(:version => 20150225232938) do
     t.string   "email"
     t.text     "special_instructions"
     t.integer  "distributor_id"
-    t.integer  "order_cycle_id"
     t.string   "currency"
     t.string   "last_ip_address"
+    t.integer  "order_cycle_id"
     t.integer  "cart_id"
   end
 
@@ -851,8 +864,9 @@ ActiveRecord::Schema.define(:version => 20150225232938) do
 
   create_table "spree_shipping_categories", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",                                :null => false
+    t.datetime "updated_at",                                :null => false
+    t.boolean  "temperature_controlled", :default => false, :null => false
   end
 
   create_table "spree_shipping_methods", :force => true do |t|
@@ -1084,6 +1098,9 @@ ActiveRecord::Schema.define(:version => 20150225232938) do
   add_foreign_key "coordinator_fees", "enterprise_fees", name: "coordinator_fees_enterprise_fee_id_fk"
   add_foreign_key "coordinator_fees", "order_cycles", name: "coordinator_fees_order_cycle_id_fk"
 
+  add_foreign_key "customers", "enterprises", name: "customers_enterprise_id_fk"
+  add_foreign_key "customers", "spree_users", name: "customers_user_id_fk", column: "user_id"
+
   add_foreign_key "distributors_payment_methods", "enterprises", name: "distributors_payment_methods_distributor_id_fk", column: "distributor_id"
   add_foreign_key "distributors_payment_methods", "spree_payment_methods", name: "distributors_payment_methods_payment_method_id_fk", column: "payment_method_id"
 

lib/open_food_network/order_cycle_management_report.rb

@@ -1,3 +1,5 @@
+require 'open_food_network/user_balance_calculator'
+
 module OpenFoodNetwork
   class OrderCycleManagementReport
     attr_reader :params
@@ -7,23 +9,19 @@ module OpenFoodNetwork
     end
 
     def header
-      ["First Name", "Last Name", "Email", "Phone", "Hub", "Shipping Method", "Payment Method", "Amount"]
+      if is_payment_methods?
+        ["First Name", "Last Name", "Hub", "Hub Code", "Email", "Phone", "Shipping Method", "Payment Method", "Amount", "Balance"]
+      else
+        ["First Name", "Last Name", "Hub", "Hub Code", "Delivery Address", "Delivery Postcode", "Phone", "Shipping Method", "Payment Method", "Amount", "Balance", "Temp Controlled Items?", "Special Instructions"]
+      end
     end
 
     def table
-      orders.map do |order|
-        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
-        ]
-      end
+      if is_payment_methods?
+        orders.map { |o| payment_method_row o }
+      else
+        orders.map { |o| delivery_row o }
+      end     
     end
 
     def orders
@@ -34,6 +32,44 @@ module OpenFoodNetwork
       filter_to_order_cycle filter_to_payment_method filter_to_shipping_method orders
     end
 
+
+    private 
+
+    def payment_method_row(order)
+      ba = order.billing_address
+      da = order.distributor.andand.address
+      [ba.firstname,
+       ba.lastname,
+       order.distributor.andand.name,
+       customer_code(order.email),
+       order.email,
+       ba.phone,
+       order.shipping_method.andand.name,
+       order.payments.first.andand.payment_method.andand.name,
+       order.payments.first.amount,
+       OpenFoodNetwork::UserBalanceCalculator.new(order.user, order.distributor).balance
+      ]
+    end
+
+    def delivery_row(order)
+      ba = order.billing_address
+      da = order.distributor.andand.address
+      [ba.firstname,
+       ba.lastname,
+       order.distributor.andand.name,
+       customer_code(order.email),
+       "#{ba.address1} #{ba.address2} #{ba.city}",
+       ba.zipcode,
+       ba.phone,
+       order.shipping_method.andand.name,
+       order.payments.first.andand.payment_method.andand.name,
+       order.payments.first.amount,
+       OpenFoodNetwork::UserBalanceCalculator.new(order.user, order.distributor).balance,
+       has_temperature_controlled_items?(order),
+       order.special_instructions
+      ]
+    end
+
     def filter_to_payment_method(orders)
       if params[:payment_method_name].present?
         orders.with_payment_method_name(params[:payment_method_name])
@@ -57,5 +93,18 @@ module OpenFoodNetwork
         orders
       end
     end
+
+    def has_temperature_controlled_items?(order)
+      order.line_items.any? { |line_item| line_item.product.shipping_category.andand.temperature_controlled }
+    end
+
+    def is_payment_methods?
+      params[:report_type] == "payment_methods"
+    end
+
+    def customer_code(email)
+      customer = Customer.where(email: email).first
+      customer.nil? ? "" : customer.code
+    end
   end
 end

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'

spec/features/admin/reports_spec.rb

@@ -65,12 +65,21 @@ feature %q{
       click_link "Reports"
     end
 
-    scenario "order payment method report" do
-      click_link "Order Cycle Management"
+    scenario "payment method report" do
+      click_link "Payment Methods Report"
       rows = find("table#listing_order_payment_methods").all("thead tr")
       table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
       table.sort.should == [
-        ["First Name", "Last Name", "Email", "Phone", "Hub", "Shipping Method", "Payment Method", "Amount"]
+        ["First Name", "Last Name", "Hub", "Hub Code", "Email", "Phone", "Shipping Method", "Payment Method", "Amount", "Balance"]
+      ].sort
+    end
+
+    scenario "delivery report" do
+      click_link "Delivery Report"
+      rows = find("table#listing_order_payment_methods").all("thead tr")
+      table = rows.map { |r| r.all("th").map { |c| c.text.strip } }
+      table.sort.should == [
+        ["First Name", "Last Name", "Hub", "Hub Code", "Delivery Address", "Delivery Postcode", "Phone", "Shipping Method", "Payment Method", "Amount", "Balance", "Temp Controlled Items?", "Special Instructions"]
       ].sort
     end
   end