When merging orders, set distributor when target order distributor is nil

.gitignore

@@ -21,8 +21,10 @@ db/development_structure.sql
 db/test_structure.sql
 db/staging_structure.sql
 db/production_structure.sql
+db/backup
 public/system
 public/stylesheets
 public/images
+public/spree
 config/abr.yml
 NERD_tree*

Gemfile

@@ -1,12 +1,12 @@
 source 'http://rubygems.org'
 ruby "1.9.3"
 
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.8'
 
 gem 'pg'
-gem 'spree', '1.1.1'
+gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-1-stable'
 gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git'
-gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git'
+gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git', :branch => '1-1-stable'
 gem 'spree_last_address', :git => 'git://github.com/dancinglightning/spree-last-address.git'
 
 
@@ -47,7 +47,7 @@ group :test, :development do
   gem 'capybara'
   gem 'database_cleaner', '0.7.1', :require => false
   gem 'spork', '~> 1.0rc'
-  gem 'pry'
+  gem 'pry-debugger'
   gem 'awesome_print'
 end
 

Gemfile.lock

@@ -21,6 +21,54 @@ GIT
       aws-sdk (~> 1.3.4)
       spree_core (>= 0.70.0)
 
+GIT
+  remote: git://github.com/spree/spree.git
+  revision: d66ffac9088d0d5d0b0d146f305044ce619f0464
+  branch: 1-1-stable
+  specs:
+    spree (1.1.3)
+      spree_api (= 1.1.3)
+      spree_auth (= 1.1.3)
+      spree_cmd (= 1.1.3)
+      spree_core (= 1.1.3)
+      spree_dash (= 1.1.3)
+      spree_promo (= 1.1.3)
+      spree_sample (= 1.1.3)
+    spree_api (1.1.3)
+      rabl (= 0.6.5)
+      spree_auth (= 1.1.3)
+      spree_core (= 1.1.3)
+    spree_auth (1.1.3)
+      cancan (= 1.6.7)
+      devise (~> 2.0.0)
+      spree_core (= 1.1.3)
+    spree_cmd (1.1.3)
+      thor (>= 0.14.6)
+    spree_core (1.1.3)
+      activemerchant (= 1.28.0)
+      acts_as_list (= 0.1.4)
+      aws-sdk (~> 1.3.4)
+      deface (>= 0.9.0)
+      ffaker (~> 1.12.0)
+      highline (= 1.6.11)
+      jquery-rails (~> 2.0)
+      kaminari (= 0.13.0)
+      nested_set (= 1.7.0)
+      paperclip (~> 2.7)
+      rails (~> 3.2.8)
+      ransack (~> 0.6.0)
+      state_machine (= 1.1.2)
+      stringex (~> 1.3.2)
+    spree_dash (1.1.3)
+      httparty (~> 0.8.1)
+      spree_auth (= 1.1.3)
+      spree_core (= 1.1.3)
+    spree_promo (1.1.3)
+      spree_auth (= 1.1.3)
+      spree_core (= 1.1.3)
+    spree_sample (1.1.3)
+      spree_core (= 1.1.3)
+
 GIT
   remote: git://github.com/spree/spree_i18n.git
   revision: a96bee02340e008e60549295a4f09e047fd2e628
@@ -31,50 +79,52 @@ GIT
 
 GIT
   remote: git://github.com/spree/spree_paypal_express.git
-  revision: d48f4649506e876b88244dcb4e5a86250e4ef8f0
+  revision: 2c61f1700ef853e3d4f39739793dc3308422e94b
+  branch: 1-1-stable
   specs:
     spree_paypal_express (1.1.0)
+      spree_auth (>= 1.0.0)
       spree_core (>= 1.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    active_utils (1.0.3)
+      sprockets (~> 2.1.3)
+    active_utils (1.0.5)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.20.4)
+    activemerchant (1.28.0)
       active_utils (>= 1.0.2)
       activesupport (>= 2.3.11)
-      braintree (>= 2.0.0)
       builder (>= 2.0.0)
       i18n
       json (>= 1.5.1)
-      money (<= 3.7.1)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      money
+      nokogiri
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     acts_as_list (0.1.4)
@@ -93,12 +143,10 @@ GEM
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
-    braintree (2.16.0)
-      builder (>= 2.0.0)
     bugsnag (1.1.2)
       httparty (~> 0.8.3)
       multi_json (~> 1.3.4)
-    builder (3.0.0)
+    builder (3.0.3)
     cancan (1.6.7)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -109,8 +157,8 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
-    cocaine (0.2.1)
-    coderay (1.0.6)
+    cocaine (0.3.0)
+    coderay (1.0.7)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -118,7 +166,15 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    columnize (0.3.6)
     database_cleaner (0.7.1)
+    debugger (1.1.4)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.3)
     deface (0.9.1)
       nokogiri (~> 1.5.0)
       rails (~> 3.1)
@@ -146,12 +202,12 @@ GEM
     httparty (0.8.3)
       multi_json (~> 1.0)
       multi_xml
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
+    jquery-rails (2.1.2)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.3)
+    json (1.7.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -164,16 +220,17 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
-    mime-types (1.18)
-    money (3.7.1)
+    method_source (0.8)
+    mime-types (1.19)
+    money (5.0.0)
       i18n (~> 0.4)
+      json
     multi_json (1.3.6)
     multi_xml (0.5.1)
     nested_set (1.7.0)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
-    nokogiri (1.5.3)
+    nokogiri (1.5.5)
     orm_adapter (0.0.7)
     paperclip (2.7.0)
       activerecord (>= 2.3.0)
@@ -184,10 +241,13 @@ GEM
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
-    pry (0.9.9.6)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    pry-debugger (0.2.0)
+      debugger (~> 1.1.3)
+      pry (~> 0.9.9)
     rabl (0.6.5)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
@@ -198,21 +258,21 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     raindrops (0.9.0)
     rake (0.9.2.2)
     ransack (0.6.0)
@@ -248,49 +308,8 @@ GEM
       rubyzip
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
-    slop (2.4.4)
+    slop (3.3.3)
     spork (1.0.0rc3)
-    spree (1.1.1)
-      spree_api (= 1.1.1)
-      spree_auth (= 1.1.1)
-      spree_cmd (= 1.1.1)
-      spree_core (= 1.1.1)
-      spree_dash (= 1.1.1)
-      spree_promo (= 1.1.1)
-      spree_sample (= 1.1.1)
-    spree_api (1.1.1)
-      rabl (= 0.6.5)
-      spree_auth (= 1.1.1)
-      spree_core (= 1.1.1)
-    spree_auth (1.1.1)
-      cancan (= 1.6.7)
-      devise (~> 2.0.0)
-      spree_core (= 1.1.1)
-    spree_cmd (1.1.1)
-    spree_core (1.1.1)
-      activemerchant (= 1.20.4)
-      acts_as_list (= 0.1.4)
-      aws-sdk (~> 1.3.4)
-      deface (>= 0.8.0)
-      ffaker (~> 1.12.0)
-      highline (= 1.6.11)
-      jquery-rails (~> 2.0.0)
-      kaminari (>= 0.13.0)
-      nested_set (= 1.7.0)
-      paperclip (~> 2.7)
-      rails (>= 3.2.2, <= 3.2.3)
-      ransack (~> 0.6.0)
-      state_machine (= 1.1.2)
-      stringex (~> 1.3.2)
-    spree_dash (1.1.1)
-      httparty (~> 0.8.1)
-      spree_auth (= 1.1.1)
-      spree_core (= 1.1.1)
-    spree_promo (1.1.1)
-      spree_auth (= 1.1.1)
-      spree_core (= 1.1.1)
-    spree_sample (1.1.1)
-      spree_core (= 1.1.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -299,7 +318,7 @@ GEM
     stringex (1.3.3)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thor (0.14.6)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
@@ -315,7 +334,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    uuidtools (2.1.2)
+    uuidtools (2.1.3)
     warden (1.1.1)
       rack (>= 1.0)
     xml-simple (1.1.1)
@@ -338,14 +357,14 @@ DEPENDENCIES
   haml
   jquery-rails
   pg
-  pry
-  rails (= 3.2.3)
+  pry-debugger
+  rails (= 3.2.8)
   rspec-rails
   sass-rails (~> 3.2.3)
   shoulda-matchers
   simple_form!
   spork (~> 1.0rc)
-  spree (= 1.1.1)
+  spree!
   spree_heroku!
   spree_i18n!
   spree_last_address!

app/assets/javascripts/admin/all.js

@@ -5,6 +5,8 @@
 // the compiled file.
 //
 
+//= require jquery
+//= require jquery_ujs
 //= require admin/spree_core
 //= require admin/spree_auth
 //= require admin/spree_promo

app/assets/javascripts/store/products.js

@@ -28,7 +28,7 @@ function products_update_price_without_variant() {
   if(master_price == null) {
     // Store off the master price
     master_price = $("#product-price span.price").html();
-    master_price = master_price.substr(1, master_price.length-2);
+    master_price = master_price.substring(1);
     $("#product-price span.price").data('master-price', master_price);
   }
 

app/assets/stylesheets/admin/openfoodweb.css.scss

@@ -0,0 +1,7 @@
+#header #logo {
+  top: 10px;
+}
+
+#header h1 {
+  left: 275px;
+}

app/assets/stylesheets/store/openfoodweb.css.scss

@@ -1,5 +1,23 @@
 @import "screen";
 
+a:hover {
+  color: lighten($link_text_color, 20) !important;
+}
+
+table {
+  tbody, tfoot {
+    tr {
+      &.alt, &.odd {
+        background-color: lighten($link_text_color, 75) !important;
+      }
+    }
+  }
+}
+
+#header #logo {
+  padding-top: 10px;
+}
+
 /* Style current distributor in main nav bar */
 nav #main-nav-bar {
   li {
@@ -147,6 +165,7 @@ ul.product-listing {
 }
 #empty-cart {
   float: left;
+  margin-top: 15px !important;
 
   p {
     padding: 0;

app/assets/stylesheets/store/variables.css.scss

@@ -0,0 +1,58 @@
+/*--------------------------------------*/
+/* Colors
+/*--------------------------------------*/
+$c_green:       #8dba53;  /* Spree green    */
+$c_red:         #e45353;  /* Error red      */
+
+$layout_background_color:   #FFFFFF;
+$title_text_color:          #404042;
+$body_text_color:           #404042;
+$link_text_color:           #006066;
+
+$product_background_color:  #FFFFFF;
+$product_title_text_color:  #404042;
+$product_body_text_color:   #404042;
+$product_link_text_color:   #BBBBBB;
+
+/*--------------------------------------*/
+/* Fonts import from remote
+/*--------------------------------------*/
+@import url(//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
+
+/*--------------------------------------*/
+/* Font families
+/*--------------------------------------*/
+$ff_base:       'Ubuntu', sans-serif;
+
+/*--------------------------------------
+  | Font sizes
+  |--------------------------------------
+  |- Navigation                         
+  |                                    */
+      $header_navigation_font_size:           14px;
+      $horizontal_navigation_font_size:       16px;
+      $main_navigation_header_font_size:      14px;
+      $main_navigation_font_size:             12px;
+/*|------------------------------------
+  |- Product Listing                         
+  |                                  */
+      $product_list_name_font_size:           12px;
+      $product_list_price_font_size:          16px;
+      $product_list_header_font_size:         20px;
+      $product_list_search_font_size:         14px;
+/*|------------------------------------
+  |- Product Details
+  |                                  */
+      $product_detail_name_font_size:         24px;
+      $product_detail_description_font_size:  12px;
+      $product_detail_price_font_size:        20px;
+      $product_detail_title_font_size:        14px;
+/*|------------------------------------
+  |- Basic
+  |                                  */
+      $heading_font_size:                     24px;
+      $sub_heading_font_size:                 14px;
+      $button_font_size:                      12px;
+      $input_box_font_size:                   13px;
+      $base_font_size:                        12px;
+      $button_border_color:                   rgba(0, 138, 189, .75);

app/controllers/spree/admin/shipping_methods_controller_decorator.rb

@@ -0,0 +1,28 @@
+module Spree
+  module Admin
+    ShippingMethodsController.class_eval do
+      before_filter :do_not_destroy_referenced_shipping_methods, :only => :destroy
+
+      def do_not_destroy_referenced_shipping_methods
+        order = Order.where(:shipping_method_id => @object).first
+        if order
+          flash[:error] = "That shipping method cannot be deleted as it is referenced by an order: #{order.number}."
+          redirect_to collection_url and return
+        end
+
+        product_distribution = ProductDistribution.where(:shipping_method_id => @object).first
+        if product_distribution
+          p = product_distribution.product
+          flash[:error] = "That shipping method cannot be deleted as it is referenced by a product distribution: #{p.id} - #{p.name}."
+          redirect_to collection_url and return
+        end
+
+        line_item = LineItem.where(:shipping_method_id => @object).first
+        if line_item
+          flash[:error] = "That shipping method cannot be deleted as it is referenced by a line item in order: #{line_item.order.number}."
+          redirect_to collection_url and return
+        end
+      end
+    end
+  end
+end

app/controllers/spree/base_controller_decorator.rb

@@ -0,0 +1,25 @@
+module Spree
+  BaseController.class_eval do
+
+    # Override definition in spree/auth/app/controllers/spree/base_controller_decorator.rb
+    # Do not attempt to merge incomplete and current orders when they have differing distributors
+    # Instead, destroy the incomplete orders, otherwise they are restored after checkout, causing much confusion
+    def set_current_order
+      if current_user
+        if current_user.respond_to?(:last_incomplete_order)
+          last_incomplete_order = current_user.last_incomplete_order
+          if session[:order_id].nil? && last_incomplete_order
+            session[:order_id] = last_incomplete_order.id
+          elsif current_order && last_incomplete_order && current_order != last_incomplete_order
+            if current_order.distributor.nil? || current_order.distributor == last_incomplete_order.distributor
+              current_order.set_distributor! last_incomplete_order.distributor if current_order.distributor.nil?
+              current_order.merge!(last_incomplete_order)
+            else
+              last_incomplete_order.destroy
+            end
+          end
+        end
+      end
+    end
+  end
+end

app/controllers/spree/orders_controller_decorator.rb

@@ -1,17 +1,17 @@
 Spree::OrdersController.class_eval do
-  before_filter :populate_order_distributor, :only => :populate
-  after_filter :populate_variant_attributes, :only => :populate
+  before_filter :populate_order_distributor,         :only => :populate
+  after_filter  :populate_variant_attributes,        :only => :populate
 
   def populate_order_distributor
-    @distributor = params.key?(:distributor_id) ? Spree::Distributor.find(params[:distributor_id]) : nil
+    @distributor = params[:distributor_id].present? ? Spree::Distributor.find(params[:distributor_id]) : nil
 
     if populate_valid? @distributor
       order = current_order(true)
-      order.distributor = @distributor
-      order.save!
+      order.set_distributor! @distributor
 
     else
-      redirect_to cart_path
+      flash[:error] = "Please choose a distributor for this order." if @distributor.nil?
+      redirect_populate_to_first_product
     end
   end
 
@@ -32,6 +32,7 @@ Spree::OrdersController.class_eval do
 
 
   private
+
   def populate_valid? distributor
     # -- Distributor must be specified
     return false if distributor.nil?
@@ -55,4 +56,14 @@ Spree::OrdersController.class_eval do
 
     true
   end
+
+  def redirect_populate_to_first_product
+    product = if params[:products].present?
+                Spree::Product.find(params[:products].keys.first)
+              else
+                Spree::Variant.find(params[:variants].keys.first).product
+              end
+
+    redirect_to product
+  end
 end

app/controllers/spree/suppliers_controller.rb

@@ -1,5 +1,7 @@
 module Spree
   class SuppliersController < BaseController
+    helper 'spree/products'
+
     def show
       options = {:supplier_id => params[:id]}
       options.merge(params.reject { |k,v| k == :id })

app/helpers/spree/orders_helper.rb

@@ -0,0 +1,9 @@
+module Spree
+  module OrdersHelper
+    def order_delivery_fee_subtotal(order, options={})
+      options.reverse_merge! :format_as_currency => true
+      amount = order.line_items.map { |li| li.itemwise_shipping_cost }.sum
+      options.delete(:format_as_currency) ? number_to_currency(amount) : amount
+    end
+  end
+end

app/helpers/spree/orders_helper_decorator.rb

@@ -1,7 +0,0 @@
-module Spree
-  module OrdersHelper
-    def order_delivery_fee_subtotal(order)
-      number_to_currency order.line_items.map { |li| li.itemwise_shipping_cost }.sum
-    end
-  end
-end

app/models/spree/line_item_decorator.rb

@@ -1,12 +1,20 @@
 Spree::LineItem.class_eval do
+  belongs_to :shipping_method
+
   attr_accessible :max_quantity
 
-  def shipping_method
-    self.product.shipping_method_for_distributor(self.order.distributor)
-  end
+  before_create :set_itemwise_shipping_method
+
 
   def itemwise_shipping_cost
     order = OpenStruct.new :line_items => [self]
     shipping_method.compute_amount(order)
   end
+
+
+  private
+
+  def set_itemwise_shipping_method
+    self.shipping_method = self.product.shipping_method_for_distributor(self.order.distributor)
+  end
 end

app/models/spree/order_decorator.rb

@@ -1,9 +1,9 @@
 Spree::Order.class_eval do
   belongs_to :distributor
 
+  before_validation :shipping_address_from_distributor
   after_create :set_default_shipping_method
 
-
   def can_change_distributor?
     # Distributor may not be changed once an item has been added to the cart/order
     line_items.empty?
@@ -14,6 +14,12 @@ Spree::Order.class_eval do
     super(distributor)
   end
 
+  def set_distributor!(distributor)
+    self.distributor = distributor
+    save!
+  end
+
+
   def can_add_product_to_cart?(product)
     can_change_distributor? || product.distributors.include?(distributor)
   end
@@ -30,9 +36,6 @@ Spree::Order.class_eval do
   end
 
 
-
-  before_validation :shipping_address_from_distributor
-
   private
 
   # On creation of the order (when the first item is added to the user's cart), set the
@@ -47,6 +50,8 @@ Spree::Order.class_eval do
     if self.shipping_method
       self.save!
       self.create_shipment!
+    else
+      raise 'No default shipping method found'
     end
   end
 

app/views/spree/admin/shared/_tabs.html.erb

@@ -0,0 +1,6 @@
+<%= tab :overview, :route => :admin %>
+<%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, :return_authorizations, {:url => admin_orders_path('q[s]' => 'completed_at desc')} %>
+<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons %>
+<%= tab :reports %>
+<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :label => 'configuration' %>
+<%= tab :users %>

app/views/spree/orders/_distributor_fees.html.haml

@@ -18,6 +18,6 @@
 
   .subtotal{'data-hook' => 'delivery_fees_subtotal'}
     %h5
-      = t(:subtotal)
+      Shipping total
       \:
       %span.order-total= order_delivery_fee_subtotal(@order)

app/views/spree/orders/_inside_cart_form.html.haml

@@ -4,9 +4,17 @@
 
   #subtotal{'data-hook' => ""}
     %h5
-      = t(:subtotal)
+      Item total
       \:
-      %span.order-total= order_subtotal(@order)
+      %span.order-total.item-total= number_to_currency @order.item_total
+    %h5
+      Shipping total
+      \:
+      %span.order-total.shipping-total= order_delivery_fee_subtotal(@order)
+    %h4
+      Total
+      \:
+      %span.order-total.grand-total= order_subtotal(@order)
 
   .links{'data-hook' => "cart_buttons"}
     = button_tag :class => 'primary', :id => 'update-button' do

app/views/spree/products/_add_to_cart.html.haml

@@ -17,7 +17,7 @@
     - order = current_order(false)
     - if order.nil? || order.can_change_distributor?
       %p Distributor
-      = select_tag "distributor_id", options_from_collection_for_select(@product.distributors, "id", "name", current_distributor.andand.id)
+      = select_tag "distributor_id", options_from_collection_for_select([Spree::Distributor.new]+@product.distributors, "id", "name", current_distributor.andand.id)
     - else
       = hidden_field_tag "distributor_id", order.distributor.id
       .distributor-fixed= "Your distributor for this order is #{order.distributor.name}"

config/initializers/spree.rb

@@ -12,6 +12,8 @@ require 'open_food_web/searcher'
 
 Spree.config do |config|
   config.site_name = "Open Food Web"
+  config.logo = 'logo.jpg'
+  config.admin_interface_logo = 'logo.jpg'
 
   config.shipping_instructions = true
   config.checkout_zone = 'Australia'

db/migrate/20120913054657_convert_sales_tax_to_default_tax.spree.rb

@@ -0,0 +1,10 @@
+# This migration comes from spree (originally 20120523061241)
+class ConvertSalesTaxToDefaultTax < ActiveRecord::Migration
+  def up
+    execute "UPDATE spree_calculators SET type='Spree::Calculator::DefaultTax' WHERE type='Spree::Calculator::SalesTax'"
+  end
+
+  def down
+    execute "UPDATE spree_calculators SET type='Spree::Calculator::SalesTax' WHERE type='Spree::Calculator::DefaultTax'"
+ end
+end

db/migrate/20120913054658_add_deleted_at_to_spree_shipping_methods.spree.rb

@@ -0,0 +1,6 @@
+# This migration comes from spree (originally 20120604030249)
+class AddDeletedAtToSpreeShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :deleted_at, :datetime
+  end
+end

db/migrate/20120913054659_make_users_email_index_unique.spree.rb

@@ -0,0 +1,11 @@
+# This migration comes from spree (originally 20120605211305)
+class MakeUsersEmailIndexUnique < ActiveRecord::Migration
+  def up
+    add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
+  end
+
+  def down
+    remove_index "spree_users", :name => "email_idx_unique"
+    add_index "spree_users", ["email"], :name => "email_idx_unique"
+  end
+end

db/migrate/20120913054660_add_counter_cache_to_zone_members.spree.rb

@@ -0,0 +1,15 @@
+# This migration comes from spree (originally 20120712172620)
+class AddCounterCacheToZoneMembers < ActiveRecord::Migration
+  def up
+    add_column :spree_zones, :zone_members_count, :integer, :default => 0
+
+    Spree::Zone.reset_column_information
+    Spree::Zone.find(:all).each do |zone|
+      Spree::Zone.update_counters zone.id, :zone_members_count => zone.zone_members.length
+    end
+  end
+
+  def down
+    remove_column :spree_zones, :zone_members_count
+  end
+end

db/migrate/20120919013335_add_shipping_method_to_line_items.rb

@@ -0,0 +1,20 @@
+class AddShippingMethodToLineItems < ActiveRecord::Migration
+  def up
+    add_column :spree_line_items, :shipping_method_id, :integer
+
+    Spree::LineItem.all.each do |li|
+      begin
+        shipping_method = li.product.shipping_method_for_distributor(li.order.distributor)
+      rescue ArgumentError
+        shipping_method = Spree::ShippingMethod.find_by_name 'Producer Delivery'
+        say "Line item #{li.id} does not have a valid shipping method, setting to '#{shipping_method.name}'"
+      end
+
+      Spree::LineItem.update_all("shipping_method_id = #{shipping_method.id}", "id = #{li.id}")
+    end
+  end
+
+  def down
+    remove_column :spree_line_items, :shipping_method_id
+  end
+end

db/migrate/20121005015852_populate_order_default_shipping_method.rb

@@ -0,0 +1,10 @@
+class PopulateOrderDefaultShippingMethod < ActiveRecord::Migration
+  def up
+    Spree::Order.where(shipping_method_id: nil).each do |order|
+      order.send(:set_default_shipping_method)
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120802031147) do
+ActiveRecord::Schema.define(:version => 20121005015852) do
 
   create_table "distributors", :force => true do |t|
     t.string   "name"
@@ -133,7 +133,7 @@ ActiveRecord::Schema.define(:version => 20120802031147) do
     t.integer "numcode"
   end
 
-  create_table "spree_creditcards", :force => true do |t|
+  create_table "spree_credit_cards", :force => true do |t|
     t.string   "month"
     t.string   "year"
     t.string   "cc_type"
@@ -144,8 +144,8 @@ ActiveRecord::Schema.define(:version => 20120802031147) do
     t.string   "start_year"
     t.string   "issue_number"
     t.integer  "address_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
     t.string   "gateway_customer_profile_id"
     t.string   "gateway_payment_profile_id"
   end
@@ -180,11 +180,12 @@ ActiveRecord::Schema.define(:version => 20120802031147) do
   create_table "spree_line_items", :force => true do |t|
     t.integer  "order_id"
     t.integer  "variant_id"
-    t.integer  "quantity",                                   :null => false
-    t.decimal  "price",        :precision => 8, :scale => 2, :null => false
+    t.integer  "quantity",                                         :null => false
+    t.decimal  "price",              :precision => 8, :scale => 2, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "max_quantity"
+    t.integer  "shipping_method_id"
   end
 
   add_index "spree_line_items", ["order_id"], :name => "index_line_items_on_order_id"
@@ -494,6 +495,7 @@ ActiveRecord::Schema.define(:version => 20120802031147) do
     t.boolean  "match_none"
     t.boolean  "match_all"
     t.boolean  "match_one"
+    t.datetime "deleted_at"
   end
 
   create_table "spree_skrill_transactions", :force => true do |t|
@@ -615,6 +617,7 @@ ActiveRecord::Schema.define(:version => 20120802031147) do
     t.datetime "reset_password_sent_at"
   end
 
+  add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
   add_index "spree_users", ["persistence_token"], :name => "index_users_on_persistence_token"
 
   create_table "spree_variants", :force => true do |t|
@@ -647,7 +650,8 @@ ActiveRecord::Schema.define(:version => 20120802031147) do
     t.string   "description"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "default_tax", :default => false
+    t.boolean  "default_tax",        :default => false
+    t.integer  "zone_members_count", :default => 0
   end
 
   create_table "suppliers", :force => true do |t|

lib/open_food_web/order_and_distributor_report.rb

@@ -22,7 +22,7 @@ module OpenFoodWeb
             order.bill_address.full_name, order.email, order.bill_address.phone, order.bill_address.city,
             line_item.product.sku, line_item.product.name, line_item.variant.options_text, line_item.quantity, line_item.max_quantity, line_item.price * line_item.quantity, line_item.itemwise_shipping_cost,
             order.payments.first.payment_method.andand.name,
-            order.distributor.name, order.distributor.pickup_address.address1, order.distributor.pickup_address.city, order.distributor.pickup_address.zipcode, order.special_instructions ]
+            order.distributor.andand.name, order.distributor.pickup_address.address1, order.distributor.pickup_address.city, order.distributor.pickup_address.zipcode, order.special_instructions ]
         end
       end
       order_and_distributor_details

spec/controllers/distributors_controller_spec.rb

@@ -4,9 +4,11 @@ require 'spree/core/current_order'
 describe Spree::DistributorsController do
   include Spree::Core::CurrentOrder
 
-  before do
+  before :each do
     stub!(:before_save_new_order)
     stub!(:after_save_new_order)
+
+    create(:itemwise_shipping_method)
   end
 
 
@@ -40,9 +42,10 @@ describe Spree::DistributorsController do
       d2 = create(:distributor)
       p = create(:product, :distributors => [d1])
       o = current_order(true)
+
       o.distributor = d1
-      o.add_variant(p.master, 1)
       o.save!
+      o.add_variant(p.master, 1)
 
       # When I attempt to select a distributor
       spree_get :select, :id => d2.id
@@ -58,8 +61,8 @@ describe Spree::DistributorsController do
       p = create(:product, :distributors => [d])
       o = current_order(true)
       o.distributor = d
-      o.add_variant(p.master, 1)
       o.save!
+      o.add_variant(p.master, 1)
 
       # When I attempt to deselect the distributor
       spree_get :deselect

spec/controllers/home_controller_spec.rb

@@ -25,4 +25,39 @@ describe Spree::HomeController do
     assigns(:products_local).should == [p1]
     assigns(:products_remote).should == [p2]
   end
+
+  context "BaseController: merging incomplete orders" do
+    it "does not attempt to merge incomplete and current orders when they have differing distributors" do
+      incomplete_order = double(:order, distributor: 1)
+      current_order = double(:order, distributor: 2)
+
+      user = double(:user, last_incomplete_order: incomplete_order)
+      controller.stub(:current_user).and_return(user)
+      controller.stub(:current_order).and_return(current_order)
+
+      incomplete_order.should_receive(:destroy)
+      incomplete_order.should_receive(:merge!).never
+      current_order.should_receive(:merge!).never
+
+      session[:order_id] = 123
+
+      spree_get :index
+    end
+
+    it "sets the distributor when the target order has no distributor" do
+      incomplete_order = double(:order, distributor: 1)
+      current_order = double(:order, distributor: nil)
+
+      user = double(:user, last_incomplete_order: incomplete_order)
+      controller.stub(:current_user).and_return(user)
+      controller.stub(:current_order).and_return(current_order)
+
+      current_order.should_receive(:set_distributor!).with(1)
+      current_order.should_receive(:merge!)
+
+      session[:order_id] = 123
+
+      spree_get :index
+    end
+  end
 end

spec/factories.rb

@@ -24,7 +24,7 @@ FactoryGirl.define do
   factory :product_distribution, :class => Spree::ProductDistribution do
     product         { |pd| Spree::Product.first        || FactoryGirl.create(:product) }
     distributor     { |pd| Spree::Distributor.first    || FactoryGirl.create(:distributor) }
-    shipping_method { |pd| Spree::ShippingMethod.first || FactoryGirl.create(:shipping_method) }
+    shipping_method { |pd| Spree::ShippingMethod.where("name != 'Delivery'").first || FactoryGirl.create(:shipping_method) }
   end
 
   factory :itemwise_shipping_method, :parent => :shipping_method do
@@ -39,12 +39,34 @@ end
 
 FactoryGirl.modify do
   factory :simple_product do
+    # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
+    # Pull request: https://github.com/spree/spree/pull/1964
+    # When this fix has been merged into a version of Spree that we're using, this line can be removed.
+    sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
+
     supplier { Spree::Supplier.first || FactoryGirl.create(:supplier) }
     on_hand 3
 
     # before(:create) do |product, evaluator|
     #   product.product_distributions = [FactoryGirl.create(:product_distribution, :product => product)]
     # end
+
+    # Do not create products distributed via the 'Delivery' shipping method
+    after(:create) do |product, evaluator|
+      pd = product.product_distributions.first
+      if pd.andand.shipping_method.andand.name == 'Delivery'
+        pd.shipping_method = Spree::ShippingMethod.where("name != 'Delivery'").first || FactoryGirl.create(:shipping_method)
+        pd.save!
+      end
+    end
+  end
+
+  factory :line_item do
+    shipping_method { |li| li.product.shipping_method_for_distributor(li.order.distributor) }
+  end
+
+  factory :shipping_method do
+    display_on ''
   end
 
   factory :address do

spec/models/line_item_spec.rb

@@ -7,12 +7,9 @@ module Spree
       shipping_method = create(:shipping_method)
       shipping_method.calculator.set_preference :amount, 10
 
-      product = double(:product)
-      product.should_receive(:shipping_method_for_distributor).and_return(shipping_method)
-
       order = double(:order, :distributor => nil)
 
-      subject.stub(:product).and_return(product)
+      subject.stub(:shipping_method).and_return(shipping_method)
       subject.stub(:order).and_return(order)
 
       subject.itemwise_shipping_cost.should == 10

spec/models/order_spec.rb

@@ -15,7 +15,11 @@ describe Spree::Order do
   end
 
   it "reveals permission for changing distributor" do
-    p = build(:product)
+    d = create(:distributor)
+    p = create(:product, :distributors => [d])
+
+    subject.distributor = d
+    subject.save!
 
     subject.can_change_distributor?.should be_true
     subject.add_variant(p.master, 1)
@@ -23,9 +27,11 @@ describe Spree::Order do
   end
 
   it "raises an exception if distributor is changed without permission" do
-    d = build(:distributor)
-    p = build(:product, :distributors => [d])
+    d = create(:distributor)
+    p = create(:product, :distributors => [d])
     subject.distributor = d
+    subject.save!
+
     subject.add_variant(p.master, 1)
     subject.can_change_distributor?.should be_false
 
@@ -61,11 +67,12 @@ describe Spree::Order do
   end
 
   it "sets attributes on line items for variants" do
-    subject.save!
     d = create(:distributor)
     p = create(:product, :distributors => [d])
 
     subject.distributor = d
+    subject.save!
+
     subject.add_variant(p.master, 1)
     subject.set_variant_attributes(p.master, {'max_quantity' => '3'})
 

spec/requests/admin/shipping_methods_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+feature 'shipping methods' do
+  include AuthenticationWorkflow
+  include WebHelper
+
+  before :each do
+    login_to_admin_section
+    @sm = create(:shipping_method)
+  end
+
+  scenario "deleting a shipping method" do
+    visit_delete spree.admin_shipping_method_path(@sm)
+
+    page.should have_content "Shipping method \"#{@sm.name}\" has been successfully removed!"
+    Spree::ShippingMethod.where(:id => @sm.id).should be_empty
+  end
+
+  scenario "deleting a shipping method referenced by an order" do
+    o = create(:order, shipping_method: @sm)
+
+    visit_delete spree.admin_shipping_method_path(@sm)
+
+    page.should have_content "That shipping method cannot be deleted as it is referenced by an order: #{o.number}."
+    Spree::ShippingMethod.find(@sm.id).should_not be_nil
+  end
+
+  scenario "deleting a shipping method referenced by a product distribution" do
+    p = create(:product)
+    d = create(:distributor)
+    create(:product_distribution, product: p, distributor: d, shipping_method: @sm)
+
+    visit_delete spree.admin_shipping_method_path(@sm)
+
+    page.should have_content "That shipping method cannot be deleted as it is referenced by a product distribution: #{p.id} - #{p.name}."
+    Spree::ShippingMethod.find(@sm.id).should_not be_nil
+  end
+
+  scenario "deleting a shipping method referenced by a line item" do
+    sm2 = create(:shipping_method)
+    d = create(:distributor)
+
+    p = create(:product)
+    create(:product_distribution, product: p, distributor: d, shipping_method: sm2)
+
+    o = create(:order, distributor: d)
+    o.shipping_method = sm2
+    o.save!
+    li = create(:line_item, order: o, product: p)
+    li.shipping_method = @sm
+    li.save!
+
+    visit_delete spree.admin_shipping_method_path(@sm)
+
+    page.should have_content "That shipping method cannot be deleted as it is referenced by a line item in order: #{o.number}."
+    Spree::ShippingMethod.find(@sm.id).should_not be_nil
+  end
+end

spec/requests/consumer/add_to_cart_spec.rb

@@ -8,25 +8,58 @@ feature %q{
   include AuthenticationWorkflow
   include WebHelper
 
-  scenario "adding the first product to the cart" do
+  scenario "adding a product to the cart with no distributor chosen" do
     # Given a product and some distributors
     d1 = create(:distributor)
     d2 = create(:distributor)
     p = create(:product, :distributors => [d1])
     create(:product, :distributors => [d2])
 
+    # When I add an item to my cart without choosing a distributor
+    visit spree.product_path p
+    click_button 'Add To Cart'
+
+    # Then I should see an error message
+    page.should have_content "Please choose a distributor for this order."
+
+    # And the product should not have been added to my cart
+    Spree::Order.last.should be_nil
+  end
+
+  scenario "adding the first product to the cart" do
+    create(:itemwise_shipping_method)
+
+    # Given a product, some distributors and a defined shipping cost
+    d1 = create(:distributor)
+    d2 = create(:distributor)
+    create(:product, :distributors => [d2])
+    p = create(:product, :price => 12.34)
+    create(:product_distribution, :product => p, :distributor => d1, :shipping_method => create(:shipping_method))
+
+    # ... with a flat rate shipping method of cost $1.23
+    sm = p.product_distributions.first.shipping_method
+    sm.calculator.preferred_amount = 1.23
+    sm.calculator.save!
+
     # When I choose a distributor
     visit spree.root_path
     click_link d2.name
 
-    # When I add an item to my cart from a different distributor
+    # And I add an item to my cart from a different distributor
     visit spree.product_path p
     select d1.name, :from => 'distributor_id'
     click_button 'Add To Cart'
 
-    # Then the item should be in my cart
+    # Then the correct totals should be displayed
+    page.should have_selector 'span.item-total', :text => '$12.34'
+    page.should have_selector 'span.shipping-total', :text => '$1.23'
+    page.should have_selector 'span.grand-total', :text => '$13.57'
+
+    # And the item should be in my cart, with shipping method set for the line item
     order = Spree::Order.last
-    order.line_items.first.product.should == p
+    line_item = order.line_items.first
+    line_item.product.should == p
+    line_item.shipping_method.should == p.product_distributions.first.shipping_method
 
     # And my order should have its distributor set to the chosen distributor
     order.distributor.should == d1
@@ -40,6 +73,7 @@ feature %q{
 
     # When I add a product to my cart (which sets my distributor)
     visit spree.product_path p
+    select d1.name, :from => 'distributor_id'
     click_button 'Add To Cart'
     page.should have_content "You are shopping at #{d1.name}"
 
@@ -58,6 +92,7 @@ feature %q{
 
       # And a product in my cart
       visit spree.product_path p
+      select d.name, :from => 'distributor_id'
       click_button 'Add To Cart'
 
       # When I go to add it again, I should not have a choice of distributor
@@ -75,6 +110,7 @@ feature %q{
 
       # When I add one of them to my cart
       visit spree.product_path p1
+      select d1.name, :from => 'distributor_id'
       click_button 'Add To Cart'
 
       # And I attempt to add the other
@@ -93,6 +129,7 @@ feature %q{
 
       # When I add the first to my cart
       visit spree.product_path p1
+      select d.name, :from => 'distributor_id'
       click_button 'Add To Cart'
 
       # And I add the second
@@ -106,73 +143,77 @@ feature %q{
     end
   end
 
-  scenario "adding a product to the cart for a group buy" do
-    # Given a group buy product and a distributor
-    d = create(:distributor)
-    p = create(:product, :distributors => [d], :group_buy => true)
+  context "group buys" do
+    scenario "adding a product to the cart for a group buy" do
+      # Given a group buy product and a distributor
+      d = create(:distributor)
+      p = create(:product, :distributors => [d], :group_buy => true)
 
-    # When I add the item to my cart
-    visit spree.product_path p
-    fill_in "variants_#{p.master.id}", :with => 2
-    fill_in "variant_attributes_#{p.master.id}_max_quantity", :with => 3
-    click_button 'Add To Cart'
+      # When I add the item to my cart
+      visit spree.product_path p
+      select d.name, :from => 'distributor_id'
+      fill_in "variants_#{p.master.id}", :with => 2
+      fill_in "variant_attributes_#{p.master.id}_max_quantity", :with => 3
+      click_button 'Add To Cart'
 
-    # Then the item should be in my cart with correct quantities
-    order = Spree::Order.last
-    li = order.line_items.first
-    li.product.should == p
-    li.quantity.should == 2
-    li.max_quantity.should == 3
+      # Then the item should be in my cart with correct quantities
+      order = Spree::Order.last
+      li = order.line_items.first
+      li.product.should == p
+      li.quantity.should == 2
+      li.max_quantity.should == 3
+    end
+
+    scenario "adding a product with variants to the cart for a group buy" do
+      # Given a group buy product with variants and a distributor
+      d = create(:distributor)
+      p = create(:product, :distributors => [d], :group_buy => true)
+      create(:variant, :product => p)
+
+      # When I add the item to my cart
+      visit spree.product_path p
+      select d.name, :from => 'distributor_id'
+      fill_in "quantity", :with => 2
+      fill_in "max_quantity", :with => 3
+      click_button 'Add To Cart'
+
+      # Then the item should be in my cart with correct quantities
+      order = Spree::Order.last
+      li = order.line_items.first
+      li.product.should == p
+      li.quantity.should == 2
+      li.max_quantity.should == 3
+    end
+
+    scenario "adding a product to cart that is not a group buy does not show max quantity field" do
+      # Given a group buy product and a distributor
+      d = create(:distributor)
+      p = create(:product, :distributors => [d], :group_buy => false)
+
+      # When I view the add to cart form, there should not be a max quantity field
+      visit spree.product_path p
+
+      page.should_not have_selector "#variant_attributes_#{p.master.id}_max_quantity"
+    end
+
+    scenario "adding a product with a max quantity less than quantity results in max_quantity==quantity" do
+      # Given a group buy product and a distributor
+      d = create(:distributor)
+      p = create(:product, :distributors => [d], :group_buy => true)
+
+      # When I add the item to my cart
+      visit spree.product_path p
+      select d.name, :from => 'distributor_id'
+      fill_in "variants_#{p.master.id}", :with => 2
+      fill_in "variant_attributes_#{p.master.id}_max_quantity", :with => 1
+      click_button 'Add To Cart'
+
+      # Then the item should be in my cart with correct quantities
+      order = Spree::Order.last
+      li = order.line_items.first
+      li.product.should == p
+      li.quantity.should == 2
+      li.max_quantity.should == 2
+    end
   end
-
-  scenario "adding a product with variants to the cart for a group buy" do
-    # Given a group buy product with variants and a distributor
-    d = create(:distributor)
-    p = create(:product, :distributors => [d], :group_buy => true)
-    create(:variant, :product => p)
-
-    # When I add the item to my cart
-    visit spree.product_path p
-    fill_in "quantity", :with => 2
-    fill_in "max_quantity", :with => 3
-    click_button 'Add To Cart'
-
-    # Then the item should be in my cart with correct quantities
-    order = Spree::Order.last
-    li = order.line_items.first
-    li.product.should == p
-    li.quantity.should == 2
-    li.max_quantity.should == 3
-  end
-
-  scenario "adding a product to cart that is not a group buy does not show max quantity field" do
-    # Given a group buy product and a distributor
-    d = create(:distributor)
-    p = create(:product, :distributors => [d], :group_buy => false)
-
-    # When I view the add to cart form, there should not be a max quantity field
-    visit spree.product_path p
-
-    page.should_not have_selector "#variant_attributes_#{p.master.id}_max_quantity"
-  end
-
-  scenario "adding a product with a max quantity less than quantity results in max_quantity==quantity" do
-    # Given a group buy product and a distributor
-    d = create(:distributor)
-    p = create(:product, :distributors => [d], :group_buy => true)
-
-    # When I add the item to my cart
-    visit spree.product_path p
-    fill_in "variants_#{p.master.id}", :with => 2
-    fill_in "variant_attributes_#{p.master.id}_max_quantity", :with => 1
-    click_button 'Add To Cart'
-
-    # Then the item should be in my cart with correct quantities
-    order = Spree::Order.last
-    li = order.line_items.first
-    li.product.should == p
-    li.quantity.should == 2
-    li.max_quantity.should == 2
-  end
-
 end

spec/requests/consumer/checkout_spec.rb

@@ -46,6 +46,7 @@ feature %q{
 
     # When I add some apples and some garlic to my cart
     click_link 'Fuji apples'
+    select @distributor.name, :from => 'distributor_id'
     click_button 'Add To Cart'
     click_link 'Continue shopping'
 
@@ -71,6 +72,7 @@ feature %q{
     login_to_consumer_section
 
     click_link 'Fuji apples'
+    select @distributor.name, :from => 'distributor_id'
     click_button 'Add To Cart'
     click_link 'Continue shopping'
 

spec/requests/consumer/suppliers_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+feature %q{
+    As a consumer
+    I want to see a list of products from a supplier
+    So that I can connect with them (and maybe buy stuff too)
+} do
+  include AuthenticationWorkflow
+  include WebHelper
+
+  scenario "viewing a list of suppliers" do
+    # Given some suppliers
+    s1 = create(:supplier)
+    s2 = create(:supplier)
+    s3 = create(:supplier)
+
+    # When I go to the home page
+    visit spree.root_path
+
+    # Then I should see a list containing all the suppliers
+    [s1, s2, s3].each { |s| page.should have_selector 'a', :text => s.name }
+  end
+
+  scenario "viewing products provided by a supplier" do
+    # Given a supplier with a product
+    s = create(:supplier, :name => 'Murrnong')
+    p = create(:product, :supplier => s)
+
+    # When I select the supplier
+    visit spree.root_path
+    click_link s.name
+
+    # Then I should see the product
+    page.should have_content p.name
+  end
+end

spec/support/request/web_helper.rb

@@ -76,6 +76,11 @@ module WebHelper
     page.find(:xpath, "//div[@class=\"ui-dialog-buttonset\"]//span[contains(text(),\"#{button_content}\")]").click
   end
 
+  def visit_delete(url)
+    response = Capybara.current_session.driver.delete url
+    click_link 'redirected' if response.status == 302
+  end
+
   def trigger_manual_event(field_selector, event = 'change')
     page.execute_script("$('#{field_selector}').trigger('#{event}');")
   end

zeus.json

@@ -0,0 +1,22 @@
+{
+  "command": "ruby -rubygems -rzeus/rails -eZeus.go",
+
+  "plan": {
+    "boot": {
+      "default_bundle": {
+        "development_environment": {
+          "prerake": {"rake": []},
+          "runner": ["r"],
+          "console": ["c"],
+          "server": ["s"],
+          "generate": ["g"],
+          "dbconsole": []
+        },
+        "test_environment": {
+          "cucumber_environment": {"cucumber": []},
+          "test_helper": {"test": ["rspec", "testrb"]}
+        }
+      }
+    }
+  }
+}