From a8a12d6d04525eac6e19fed6e2937f05b7abc101 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 29 Nov 2013 16:11:56 +1100
Subject: [PATCH 001/100] Adding some magical guard unicorn sparkles

---
 Gemfile      |  5 +++++
 Gemfile.lock | 39 +++++++++++++++++++++++++++++++++++++++
 Guardfile    | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 Guardfile

diff --git a/Gemfile b/Gemfile
index d6d772203f..e91e4dda38 100644
--- a/Gemfile
+++ b/Gemfile
@@ -86,4 +86,9 @@ end
 group :development do
   gem 'pry-debugger'
   gem 'debugger-linecache'
+  gem 'guard'
+  gem 'guard-livereload'
+  gem 'guard-rails'
+  gem 'guard-zeus'
+  gem 'guard-rspec'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 82921527d5..c28af0d90f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,6 +189,8 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     chunky_png (1.2.8)
@@ -237,6 +239,9 @@ GEM
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
     diff-lcs (1.2.4)
+    em-websocket (0.5.0)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.5.3)
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.25.3)
@@ -267,6 +272,24 @@ GEM
     fssm (0.2.10)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
+    guard (2.2.4)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-livereload (2.0.1)
+      em-websocket (~> 0.5)
+      guard (~> 2.0)
+      multi_json (~> 1.8)
+    guard-rails (0.4.7)
+      guard (>= 0.2.2)
+    guard-rspec (4.0.4)
+      guard (>= 2.1.1)
+      rspec (~> 2.14)
+    guard-zeus (0.0.1)
+      guard
+      zeus
     haml (4.0.4)
       tilt
     highline (1.6.18)
@@ -294,6 +317,11 @@ GEM
     letter_opener (1.0.0)
       launchy (>= 2.0.4)
     libv8 (3.16.14.3)
+    listen (2.2.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -364,6 +392,9 @@ GEM
       actionpack (~> 3.0)
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
@@ -427,6 +458,7 @@ GEM
     thor (0.18.1)
     tilt (1.4.1)
     timecop (0.6.2.2)
+    timers (1.1.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -460,6 +492,8 @@ GEM
     websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)
+    zeus (0.13.3)
+      method_source (>= 0.6.7)
 
 PLATFORMS
   ruby
@@ -484,6 +518,11 @@ DEPENDENCIES
   faker
   geocoder
   gmaps4rails
+  guard
+  guard-livereload
+  guard-rails
+  guard-rspec
+  guard-zeus
   haml
   jquery-rails
   json_spec
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000000..19f09f30d4
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,50 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'livereload' do
+  watch(%r{app/views/.+\.(erb|haml|slim)$})
+  watch(%r{app/helpers/.+\.rb})
+  watch(%r{public/.+\.(css|js|html)})
+  watch(%r{config/locales/.+\.yml})
+  # Rails Assets Pipeline
+  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
+end
+
+
+guard 'rails' do
+  watch('Gemfile.lock')
+  watch(%r{^(config|lib)/.*})
+end
+
+
+guard 'zeus' do
+  # uses the .rspec file
+  # --colour --fail-fast --format documentation --tag ~slow
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.+)\.haml$})                         { |m| "spec/#{m[1]}.haml_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
+end
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

From 175cd86976a26518ae1746856e27230edb025125 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 29 Nov 2013 16:38:14 +1100
Subject: [PATCH 002/100] Adding darkswarm basics

---
 app/assets/stylesheets/darkswarm/all.css | 12 ++++++++++++
 app/views/layouts/darkswarm.html.haml    | 10 ++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 app/assets/stylesheets/darkswarm/all.css
 create mode 100644 app/views/layouts/darkswarm.html.haml

diff --git a/app/assets/stylesheets/darkswarm/all.css b/app/assets/stylesheets/darkswarm/all.css
new file mode 100644
index 0000000000..d9bcccc9cc
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/all.css
@@ -0,0 +1,12 @@
+/*
+   * This is a manifest file that'll automatically include all the stylesheets available in this directory
+   * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+   * the top of the compiled file, but it's generally better to create a new file per style scope.
+   
+   *= require_self
+    
+   * Stuff we haven't yet ported from search
+   
+   *= require ../search/foundation_and_overrides
+   *= require_tree .
+*/
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
new file mode 100644
index 0000000000..348ce11d49
--- /dev/null
+++ b/app/views/layouts/darkswarm.html.haml
@@ -0,0 +1,10 @@
+!!!
+%html
+  %head
+    %meta{charset: 'utf-8'}/
+    %meta{name: 'viewport', content: "width=device-width,initial-scale=1.0"}/
+
+    %title= content_for?(:title) ? yield(:title) : 'Welcome to Open Food Network'
+    = favicon_link_tag "favicon.png"
+
+    = stylesheet_link_tag "darkswarm/all"

From 3d019bdcd5f7d3607f64933346278f289e2ee363 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 29 Nov 2013 16:52:14 +1100
Subject: [PATCH 003/100] Starting to partialise things

---
 app/assets/stylesheets/application.css.scss |  2 +-
 app/views/layouts/darkswarm.html.haml       | 22 +++++++++++++++++++++
 app/views/shared/_login.html.haml           | 12 +++++++++++
 app/views/shared/_menu.html.haml            | 11 +++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 app/views/shared/_login.html.haml
 create mode 100644 app/views/shared/_menu.html.haml

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 60db6ad7e5..db803ee40a 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -4,4 +4,4 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require_tree .
-*/
\ No newline at end of file
+*/
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 348ce11d49..230f54e0da 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -8,3 +8,25 @@
     = favicon_link_tag "favicon.png"
 
     = stylesheet_link_tag "darkswarm/all"
+    = javascript_include_tag "darkswarm/all"
+
+    = render "layouts/bugherd_script"
+    = csrf_meta_tags
+
+
+  %body.off-canvas
+    = render partial: "shared/menu"
+
+    %section{ role: "main" }
+      = yield
+
+    %section#sidebar{ role: "complementary" }
+      .login-panel
+        #login-content.hide
+          = render "home/login"
+        #sign-up-content.hide
+          = render "home/signup"
+
+
+    = yield :scripts
+
diff --git a/app/views/shared/_login.html.haml b/app/views/shared/_login.html.haml
new file mode 100644
index 0000000000..67249aeb26
--- /dev/null
+++ b/app/views/shared/_login.html.haml
@@ -0,0 +1,12 @@
+- if spree_current_user.nil?
+  %li#login-link= link_to "Login", "#sidebar", id: "sidebarLoginButton", class: "sidebar-button"
+  %li#login-name.hide
+  %li.divider
+  %li#sign-up-link= link_to "Sign Up", "#sidebar", id: "sidebarSignUpButton", class: "sidebar-button"
+  %li#sign-out-link.hide= link_to "Sign Out", "/logout"
+- else
+  %li#login-link.hide= link_to "Login", "#sidebar", id: "sidebarLoginButton", class: "sidebar-button"
+  %li#login-name= link_to "#{spree_current_user.email}", "#"
+  %li.divider
+  %li#sign-up-link.hide= link_to "Sign Up", "#"
+  %li#sign-out-link= link_to "Sign Out", "/logout"
diff --git a/app/views/shared/_menu.html.haml b/app/views/shared/_menu.html.haml
new file mode 100644
index 0000000000..0531afcdcb
--- /dev/null
+++ b/app/views/shared/_menu.html.haml
@@ -0,0 +1,11 @@
+%nav.top-bar
+  %section.top-bar-section
+    %ul.left
+      %li= link_to image_tag("ofn_logo_small.png"), new_landing_page_path
+      %li.divider
+      = render partial: "shared/login"
+
+    %ul.right
+      %li= link_to "Distributors", "#", :data => { "reveal-id" => "become-distributor" }
+      %li.divider
+      %li= link_to "Farmers", "#", :data => { "reveal-id" => "become-farmer" }

From 9efd7c2d69f8085245bacbd55e26ace9fea1d397 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 4 Dec 2013 13:09:30 +1100
Subject: [PATCH 004/100] Getting the darkswarm build flow up and running. Like
 a boss

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  3 +
 Guardfile                                     | 66 +++++++++----------
 .../darkswarm/{all.css => all.scss}           |  4 +-
 .../stylesheets/darkswarm/header.css.scss     |  0
 app/controllers/darkswarm_controller.rb       |  5 ++
 app/views/darkswarm/index.html.haml           |  1 +
 app/views/home/_login.html.haml               |  2 +-
 app/views/layouts/darkswarm.html.haml         |  8 +--
 app/views/shared/_login_panel.html.haml       |  5 ++
 config/routes.rb                              |  2 +
 11 files changed, 54 insertions(+), 43 deletions(-)
 rename app/assets/stylesheets/darkswarm/{all.css => all.scss} (79%)
 create mode 100644 app/assets/stylesheets/darkswarm/header.css.scss
 create mode 100644 app/controllers/darkswarm_controller.rb
 create mode 100644 app/views/darkswarm/index.html.haml
 create mode 100644 app/views/shared/_login_panel.html.haml

diff --git a/Gemfile b/Gemfile
index e91e4dda38..ddeaf0a5ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,6 +88,7 @@ group :development do
   gem 'debugger-linecache'
   gem 'guard'
   gem 'guard-livereload'
+  gem 'rack-livereload'
   gem 'guard-rails'
   gem 'guard-zeus'
   gem 'guard-rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index c28af0d90f..c38dcc9ee2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -367,6 +367,8 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-livereload (0.3.15)
+      rack
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
@@ -535,6 +537,7 @@ DEPENDENCIES
   poltergeist
   pry-debugger
   rabl
+  rack-livereload
   rack-ssl
   rails (= 3.2.14)
   representative_view
diff --git a/Guardfile b/Guardfile
index 19f09f30d4..52b9faac02 100644
--- a/Guardfile
+++ b/Guardfile
@@ -2,49 +2,49 @@
 # More info at https://github.com/guard/guard#readme
 
 guard 'livereload' do
-  watch(%r{app/views/.+\.(erb|haml|slim)$})
-  watch(%r{app/helpers/.+\.rb})
+  #watch(%r{app/views/.+\.(erb|haml|slim)$})
+  #watch(%r{app/helpers/.+\.rb})
   watch(%r{public/.+\.(css|js|html)})
-  watch(%r{config/locales/.+\.yml})
+  #watch(%r{config/locales/.+\.yml})
   # Rails Assets Pipeline
   watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
 end
 
 
-guard 'rails' do
-  watch('Gemfile.lock')
-  watch(%r{^(config|lib)/.*})
-end
+#guard 'rails' do
+  #watch('Gemfile.lock')
+  #watch(%r{^(config|lib)/.*})
+#end
 
 
-guard 'zeus' do
-  # uses the .rspec file
-  # --colour --fail-fast --format documentation --tag ~slow
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.+)\.haml$})                         { |m| "spec/#{m[1]}.haml_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
-end
+#guard 'zeus' do
+  ## uses the .rspec file
+  ## --colour --fail-fast --format documentation --tag ~slow
+  #watch(%r{^spec/.+_spec\.rb$})
+  #watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  #watch(%r{^app/(.+)\.haml$})                         { |m| "spec/#{m[1]}.haml_spec.rb" }
+  #watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  #watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
+#end
 
-guard :rspec do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+#guard :rspec do
+  #watch(%r{^spec/.+_spec\.rb$})
+  #watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  #watch('spec/spec_helper.rb')  { "spec" }
 
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  ## Rails example
+  #watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  #watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  #watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  #watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  #watch('config/routes.rb')                           { "spec/routing" }
+  #watch('app/controllers/application_controller.rb')  { "spec/controllers" }
 
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+  ## Capybara features specs
+  #watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
 
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
+  ## Turnip features and steps
+  #watch(%r{^spec/acceptance/(.+)\.feature$})
+  #watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+#end
 
diff --git a/app/assets/stylesheets/darkswarm/all.css b/app/assets/stylesheets/darkswarm/all.scss
similarity index 79%
rename from app/assets/stylesheets/darkswarm/all.css
rename to app/assets/stylesheets/darkswarm/all.scss
index d9bcccc9cc..b5d1542d11 100644
--- a/app/assets/stylesheets/darkswarm/all.css
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -5,8 +5,6 @@
    
    *= require_self
     
-   * Stuff we haven't yet ported from search
-   
-   *= require ../search/foundation_and_overrides
+   *= require foundation
    *= require_tree .
 */
diff --git a/app/assets/stylesheets/darkswarm/header.css.scss b/app/assets/stylesheets/darkswarm/header.css.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/controllers/darkswarm_controller.rb b/app/controllers/darkswarm_controller.rb
new file mode 100644
index 0000000000..b1a7422e02
--- /dev/null
+++ b/app/controllers/darkswarm_controller.rb
@@ -0,0 +1,5 @@
+class DarkswarmController < ApplicationController
+  def index
+
+  end
+end
diff --git a/app/views/darkswarm/index.html.haml b/app/views/darkswarm/index.html.haml
new file mode 100644
index 0000000000..5938185c06
--- /dev/null
+++ b/app/views/darkswarm/index.html.haml
@@ -0,0 +1 @@
+TESTING
diff --git a/app/views/home/_login.html.haml b/app/views/home/_login.html.haml
index e5b9aa5c20..31fafd05d9 100644
--- a/app/views/home/_login.html.haml
+++ b/app/views/home/_login.html.haml
@@ -15,4 +15,4 @@
       %label
         = f.check_box :remember_me
         = f.label :remember_me, t(:remember_me)
-    %p= f.submit t(:login), :class => 'button primary', :tabindex => 3, :id => "login_spree_user_remember_me"
\ No newline at end of file
+    %p= f.submit t(:login), :class => 'button primary', :tabindex => 3, :id => "login_spree_user_remember_me"
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 230f54e0da..b7835bcac2 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -21,12 +21,8 @@
       = yield
 
     %section#sidebar{ role: "complementary" }
-      .login-panel
-        #login-content.hide
-          = render "home/login"
-        #sign-up-content.hide
-          = render "home/signup"
-
+      = render partial: "shared/login_panel"
+      = yield :sidebar
 
     = yield :scripts
 
diff --git a/app/views/shared/_login_panel.html.haml b/app/views/shared/_login_panel.html.haml
new file mode 100644
index 0000000000..8266eaf0b5
--- /dev/null
+++ b/app/views/shared/_login_panel.html.haml
@@ -0,0 +1,5 @@
+.login-panel
+  #login-content.hide
+    = render "home/login"
+  #sign-up-content.hide
+    = render "home/signup"
diff --git a/config/routes.rb b/config/routes.rb
index d96ba028e9..91fbf0eb73 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,7 @@
 Openfoodnetwork::Application.routes.draw do
   root :to => 'home#temp_landing_page'
 
+
   resources :enterprises do
     collection do
       get :suppliers
@@ -37,6 +38,7 @@ Openfoodnetwork::Application.routes.draw do
   end
 
   get "new_landing_page", :controller => 'home', :action => "new_landing_page"
+  get "darkswarm", controller: :darkswarm, action: :index
   get "about_us", :controller => 'home', :action => "about_us"
 
   namespace :open_food_network do

From 0032a806b5e8f2a6ff7d351e2877bda376187fc9 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 4 Dec 2013 14:12:13 +1100
Subject: [PATCH 005/100] Further work on Darkswarm

---
 app/assets/javascripts/darkswarm/all.js.coffee   | 11 +++++++++++
 app/assets/stylesheets/darkswarm/header.css.scss |  1 +
 app/views/layouts/darkswarm.html.haml            |  2 --
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/all.js.coffee

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
new file mode 100644
index 0000000000..8bf79626c9
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -0,0 +1,11 @@
+#= require jquery
+#= require jquery_ujs
+#= require jquery-ui
+#= require spin
+#= require ../shared/angular
+#= require ../shared/angular-resource
+#= require foundation
+#= require_tree .
+
+$ ->
+  $(document).foundation()
diff --git a/app/assets/stylesheets/darkswarm/header.css.scss b/app/assets/stylesheets/darkswarm/header.css.scss
index e69de29bb2..945966dfb7 100644
--- a/app/assets/stylesheets/darkswarm/header.css.scss
+++ b/app/assets/stylesheets/darkswarm/header.css.scss
@@ -0,0 +1 @@
+/*body { background: #ff0000; }*/
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index b7835bcac2..823d2d7350 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -9,11 +9,9 @@
 
     = stylesheet_link_tag "darkswarm/all"
     = javascript_include_tag "darkswarm/all"
-
     = render "layouts/bugherd_script"
     = csrf_meta_tags
 
-
   %body.off-canvas
     = render partial: "shared/menu"
 

From f525b7aea1474696fe81928c3544493b99147c9d Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 4 Dec 2013 15:58:25 +1100
Subject: [PATCH 006/100] Adding the distributors controller

---
 app/assets/javascripts/distributors.js.coffee    |  3 +++
 app/assets/stylesheets/distributors.css.scss     |  3 +++
 app/controllers/distributors_controller.rb       |  3 +++
 app/controllers/enterprises_controller.rb        |  1 -
 app/helpers/distributors_helper.rb               |  2 ++
 spec/controllers/distributors_controller_spec.rb |  5 +++++
 spec/helpers/distributors_helper_spec.rb         | 15 +++++++++++++++
 7 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/distributors.js.coffee
 create mode 100644 app/assets/stylesheets/distributors.css.scss
 create mode 100644 app/controllers/distributors_controller.rb
 create mode 100644 app/helpers/distributors_helper.rb
 create mode 100644 spec/controllers/distributors_controller_spec.rb
 create mode 100644 spec/helpers/distributors_helper_spec.rb

diff --git a/app/assets/javascripts/distributors.js.coffee b/app/assets/javascripts/distributors.js.coffee
new file mode 100644
index 0000000000..761567942f
--- /dev/null
+++ b/app/assets/javascripts/distributors.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/distributors.css.scss b/app/assets/stylesheets/distributors.css.scss
new file mode 100644
index 0000000000..de8cd669a0
--- /dev/null
+++ b/app/assets/stylesheets/distributors.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the distributors controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/distributors_controller.rb b/app/controllers/distributors_controller.rb
new file mode 100644
index 0000000000..a2081da542
--- /dev/null
+++ b/app/controllers/distributors_controller.rb
@@ -0,0 +1,3 @@
+class DistributorsController < ApplicationController
+  layout "darkswarm"
+end
diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb
index dd4b30a206..383c52df07 100644
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -2,7 +2,6 @@ class EnterprisesController < BaseController
   helper Spree::ProductsHelper
   include OrderCyclesHelper
 
-
   def index
     @enterprises = Enterprise.all
   end
diff --git a/app/helpers/distributors_helper.rb b/app/helpers/distributors_helper.rb
new file mode 100644
index 0000000000..0206363d57
--- /dev/null
+++ b/app/helpers/distributors_helper.rb
@@ -0,0 +1,2 @@
+module DistributorsHelper
+end
diff --git a/spec/controllers/distributors_controller_spec.rb b/spec/controllers/distributors_controller_spec.rb
new file mode 100644
index 0000000000..84d9c2923e
--- /dev/null
+++ b/spec/controllers/distributors_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe DistributorsController do
+
+end
diff --git a/spec/helpers/distributors_helper_spec.rb b/spec/helpers/distributors_helper_spec.rb
new file mode 100644
index 0000000000..3599f42962
--- /dev/null
+++ b/spec/helpers/distributors_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the DistributorsHelper. For example:
+#
+# describe DistributorsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe DistributorsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 4543e08872b9b5848e42933ded0888a7fb5f9eef Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 13:40:05 +1100
Subject: [PATCH 007/100] Renaming everything to Shop

---
 Guardfile                                     |  4 +-
 app/controllers/distributors_controller.rb    |  3 --
 app/controllers/shop_controller.rb            |  9 ++++
 app/helpers/distributors_helper.rb            |  2 -
 app/helpers/shop_helper.rb                    |  3 ++
 app/views/enterprises/_about_us.html.haml     |  1 +
 app/views/enterprises/_contact_us.html.haml   |  1 +
 app/views/products/_list.html.haml            | 13 ++++++
 app/views/shop/index.html.haml                | 10 +++++
 config/routes.rb                              |  2 +
 .../distributors_controller_spec.rb           |  5 ---
 spec/controllers/shop_controller_spec.rb      |  7 +++
 spec/features/consumer/shopping_spec.rb       | 43 +++++++++++++++++++
 13 files changed, 91 insertions(+), 12 deletions(-)
 delete mode 100644 app/controllers/distributors_controller.rb
 create mode 100644 app/controllers/shop_controller.rb
 delete mode 100644 app/helpers/distributors_helper.rb
 create mode 100644 app/helpers/shop_helper.rb
 create mode 100644 app/views/enterprises/_about_us.html.haml
 create mode 100644 app/views/enterprises/_contact_us.html.haml
 create mode 100644 app/views/products/_list.html.haml
 create mode 100644 app/views/shop/index.html.haml
 delete mode 100644 spec/controllers/distributors_controller_spec.rb
 create mode 100644 spec/controllers/shop_controller_spec.rb
 create mode 100644 spec/features/consumer/shopping_spec.rb

diff --git a/Guardfile b/Guardfile
index 52b9faac02..5205fdcf62 100644
--- a/Guardfile
+++ b/Guardfile
@@ -2,8 +2,8 @@
 # More info at https://github.com/guard/guard#readme
 
 guard 'livereload' do
-  #watch(%r{app/views/.+\.(erb|haml|slim)$})
-  #watch(%r{app/helpers/.+\.rb})
+  watch(%r{app/views/.+\.(erb|haml|slim)$})
+  watch(%r{app/helpers/.+\.rb})
   watch(%r{public/.+\.(css|js|html)})
   #watch(%r{config/locales/.+\.yml})
   # Rails Assets Pipeline
diff --git a/app/controllers/distributors_controller.rb b/app/controllers/distributors_controller.rb
deleted file mode 100644
index a2081da542..0000000000
--- a/app/controllers/distributors_controller.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class DistributorsController < ApplicationController
-  layout "darkswarm"
-end
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
new file mode 100644
index 0000000000..777b7b26c7
--- /dev/null
+++ b/app/controllers/shop_controller.rb
@@ -0,0 +1,9 @@
+class ShopController < BaseController
+  layout "darkswarm"
+
+  def index
+    @distributor = current_distributor 
+  end
+
+  
+end
diff --git a/app/helpers/distributors_helper.rb b/app/helpers/distributors_helper.rb
deleted file mode 100644
index 0206363d57..0000000000
--- a/app/helpers/distributors_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module DistributorsHelper
-end
diff --git a/app/helpers/shop_helper.rb b/app/helpers/shop_helper.rb
new file mode 100644
index 0000000000..6d2457ec16
--- /dev/null
+++ b/app/helpers/shop_helper.rb
@@ -0,0 +1,3 @@
+module ShopHelper
+
+end
diff --git a/app/views/enterprises/_about_us.html.haml b/app/views/enterprises/_about_us.html.haml
new file mode 100644
index 0000000000..24cffec25e
--- /dev/null
+++ b/app/views/enterprises/_about_us.html.haml
@@ -0,0 +1 @@
+About Us
diff --git a/app/views/enterprises/_contact_us.html.haml b/app/views/enterprises/_contact_us.html.haml
new file mode 100644
index 0000000000..bb7297252b
--- /dev/null
+++ b/app/views/enterprises/_contact_us.html.haml
@@ -0,0 +1 @@
+Contact Us
diff --git a/app/views/products/_list.html.haml b/app/views/products/_list.html.haml
new file mode 100644
index 0000000000..3770387175
--- /dev/null
+++ b/app/views/products/_list.html.haml
@@ -0,0 +1,13 @@
+%table#product-list
+  %thead
+    %th Item
+    %th Description
+    %th Variant
+    %th Quantity
+    %th Available?
+    %th Price
+
+  - list.each do |product|
+    %tr
+      %td= product.name
+      %td= product.description
diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
new file mode 100644
index 0000000000..029f130512
--- /dev/null
+++ b/app/views/shop/index.html.haml
@@ -0,0 +1,10 @@
+= @distributor.name
+
+%description
+  = @distributor.long_description.andand.html_safe
+
+
+
+= render partial: "enterprises/contact_us"
+= render partial: "enterprises/about_us"
+
diff --git a/config/routes.rb b/config/routes.rb
index 91fbf0eb73..3c6b0b26cc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,8 @@ Openfoodnetwork::Application.routes.draw do
   root :to => 'home#temp_landing_page'
 
 
+  resources :shop
+
   resources :enterprises do
     collection do
       get :suppliers
diff --git a/spec/controllers/distributors_controller_spec.rb b/spec/controllers/distributors_controller_spec.rb
deleted file mode 100644
index 84d9c2923e..0000000000
--- a/spec/controllers/distributors_controller_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe DistributorsController do
-
-end
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
new file mode 100644
index 0000000000..bf5c8008b6
--- /dev/null
+++ b/spec/controllers/shop_controller_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe DistributorsController do
+  it "should set the distributor when loading show" 
+
+  it "should create/load an order when loading show"
+end
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
new file mode 100644
index 0000000000..fb3b0c3e55
--- /dev/null
+++ b/spec/features/consumer/shopping_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+feature "As a consumer I want to shop with a distributor" do
+  include AuthenticationWorkflow
+  include WebHelper
+
+  describe "Viewing a distributor" do
+    let(:distributor) { create(:distributor_enterprise) }
+
+    before do #temporarily using the old way to select distributor
+      create_enterprise_group_for distributor
+      visit "/"
+      click_link distributor.name
+    end
+    it "shows a distributor" do
+      visit shop_index_path
+      page.should have_text distributor.name
+    end
+
+    describe "selecting an order cycle" do
+      it "selects an order cycle if only one is open" do
+        # create order cycle
+        oc1 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
+        exchange = Exchange.find(oc1.exchanges.to_enterprises(d).outgoing.first.id) 
+        exchange.update_attribute :pickup_time, "turtles" 
+        
+        visit shop_index_path
+        page.should have_selector "option[selected]", text: 'Packing'
+        
+        # Should see order cycle selected in dropdown
+        # (Should also render products)
+      end
+
+      context "when no order cycles are available" do
+        it "shows the last order cycle, if any"
+        it "shows the next order cycle, if any"
+      end
+
+      it "renders the order cycle selector when multiple order cycles are available"
+      it "allows the user to select an order cycle"
+    end
+  end
+end

From ec72e9137abfdba1fd4383d7c042e076eb546fbe Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 15:07:46 +1100
Subject: [PATCH 008/100] We can now hit the index page

---
 app/controllers/shop_controller.rb       | 17 ++++++++++++++++-
 app/helpers/order_cycles_helper.rb       |  4 ++--
 app/helpers/shop_helper.rb               |  9 ++++++++-
 app/views/shop/index.html.haml           |  4 +++-
 spec/controllers/shop_controller_spec.rb | 19 +++++++++++++++++--
 spec/features/consumer/shopping_spec.rb  |  4 ++--
 spec/helpers/distributors_helper_spec.rb | 15 ---------------
 spec/helpers/order_cycles_helper_spec.rb | 13 +++++++++++++
 spec/helpers/shop_helper_spec.rb         | 11 +++++++++++
 spec/models/order_cycle_spec.rb          |  7 +++++++
 10 files changed, 79 insertions(+), 24 deletions(-)
 delete mode 100644 spec/helpers/distributors_helper_spec.rb
 create mode 100644 spec/helpers/shop_helper_spec.rb

diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 777b7b26c7..0df04edb50 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -1,9 +1,24 @@
 class ShopController < BaseController
   layout "darkswarm"
 
+  before_filter :set_distributor
+  before_filter :set_order_cycles
+
   def index
+  end
+
+  private
+
+  def set_distributor
     @distributor = current_distributor 
   end
 
-  
+  def set_order_cycles
+    @order_cycles = OrderCycle.with_distributor(@distributor).active
+    
+    # And default to the only order cycle if there's only the one
+    if @order_cycles.count == 1
+      current_order(true).set_order_cycle! @order_cycles.first
+    end
+  end
 end
diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb
index af5f16e10c..8f1e0ae930 100644
--- a/app/helpers/order_cycles_helper.rb
+++ b/app/helpers/order_cycles_helper.rb
@@ -52,8 +52,8 @@ module OrderCyclesHelper
     OpenFoodNetwork::FeatureToggle.enabled? :order_cycles
   end
 
-  def pickup_time
-    current_order_cycle.exchanges.to_enterprises(current_distributor).outgoing.first.pickup_time
+  def pickup_time(order_cycle = current_order_cycle)
+    order_cycle.exchanges.to_enterprises(current_distributor).outgoing.first.pickup_time
   end
 
 end
diff --git a/app/helpers/shop_helper.rb b/app/helpers/shop_helper.rb
index 6d2457ec16..3066bfbe05 100644
--- a/app/helpers/shop_helper.rb
+++ b/app/helpers/shop_helper.rb
@@ -1,3 +1,10 @@
 module ShopHelper
-
+  def order_cycles_name_and_pickup_times(order_cycles)
+    order_cycles.map do |oc|
+      [
+        pickup_time(oc),
+        oc.id
+      ]
+    end
+  end
 end
diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
index 029f130512..9ce7b3af3a 100644
--- a/app/views/shop/index.html.haml
+++ b/app/views/shop/index.html.haml
@@ -1,10 +1,12 @@
 = @distributor.name
 
+Ready for:
+= select_tag :order_cycle_id, options_for_select(order_cycles_name_and_pickup_times(@order_cycles), current_order_cycle.id)
+
 %description
   = @distributor.long_description.andand.html_safe
 
 
-
 = render partial: "enterprises/contact_us"
 = render partial: "enterprises/about_us"
 
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index bf5c8008b6..1747dcff5c 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -1,7 +1,22 @@
 require 'spec_helper'
 
-describe DistributorsController do
-  it "should set the distributor when loading show" 
+describe ShopController do
+  it "should select an order cycle when only one order cycle is open" do
+    d = create(:distributor_enterprise)
+    oc1 = create(:order_cycle, distributors: [d])
+    controller.stub(:current_distributor).and_return d
+    spree_get :index
+    controller.current_order_cycle.should == oc1
+  end
+
+  it "should not set an order cycle when multiple order cycles are open" do
+    d = create(:distributor_enterprise)
+    oc1 = create(:order_cycle, distributors: [d])
+    oc2 = create(:order_cycle, distributors: [d])
+    controller.stub(:current_distributor).and_return d
+    spree_get :index
+    controller.current_order_cycle.should == nil
+  end
 
   it "should create/load an order when loading show"
 end
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index fb3b0c3e55..81aa9e12d7 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -21,11 +21,11 @@ feature "As a consumer I want to shop with a distributor" do
       it "selects an order cycle if only one is open" do
         # create order cycle
         oc1 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
-        exchange = Exchange.find(oc1.exchanges.to_enterprises(d).outgoing.first.id) 
+        exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
         exchange.update_attribute :pickup_time, "turtles" 
         
         visit shop_index_path
-        page.should have_selector "option[selected]", text: 'Packing'
+        page.should have_selector "option[selected]", text: 'turtles'
         
         # Should see order cycle selected in dropdown
         # (Should also render products)
diff --git a/spec/helpers/distributors_helper_spec.rb b/spec/helpers/distributors_helper_spec.rb
deleted file mode 100644
index 3599f42962..0000000000
--- a/spec/helpers/distributors_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-# Specs in this file have access to a helper object that includes
-# the DistributorsHelper. For example:
-#
-# describe DistributorsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-describe DistributorsHelper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/helpers/order_cycles_helper_spec.rb b/spec/helpers/order_cycles_helper_spec.rb
index df5c11982d..fce1095591 100644
--- a/spec/helpers/order_cycles_helper_spec.rb
+++ b/spec/helpers/order_cycles_helper_spec.rb
@@ -32,4 +32,17 @@ describe OrderCyclesHelper do
       helper.stub!(:current_distributor).and_return d
       helper.pickup_time.should == "turtles"
   end
+
+  it "should give me the pickup time for any order cycle" do
+      d = create(:distributor_enterprise, name: 'Green Grass')
+      oc1 = create(:simple_order_cycle, name: 'oc 1', distributors: [d])
+      oc2= create(:simple_order_cycle, name: 'oc 1', distributors: [d])
+
+      exchange = Exchange.find(oc2.exchanges.to_enterprises(d).outgoing.first.id) 
+      exchange.update_attribute :pickup_time, "turtles" 
+
+      helper.stub!(:current_order_cycle).and_return oc1
+      helper.stub!(:current_distributor).and_return d
+      helper.pickup_time(oc2).should == "turtles"
+  end
 end
diff --git a/spec/helpers/shop_helper_spec.rb b/spec/helpers/shop_helper_spec.rb
new file mode 100644
index 0000000000..39ef99ba65
--- /dev/null
+++ b/spec/helpers/shop_helper_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+describe ShopHelper do
+
+  it "should build order cycle select options" do
+    d = create(:distributor_enterprise)
+    o1 = create(:simple_order_cycle, distributors: [d])
+    helper.stub(:current_distributor).and_return d
+
+    helper.order_cycles_name_and_pickup_times([o1]).should == [[helper.pickup_time(o1), o1.id]]
+  end
+end
diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb
index 1f3f4a0ad2..bae4516447 100644
--- a/spec/models/order_cycle_spec.rb
+++ b/spec/models/order_cycle_spec.rb
@@ -30,6 +30,13 @@ describe OrderCycle do
     oc.exchanges.count.should == 3
   end
 
+  it "gives me the outgoing exchange" do
+    d = create(:distributor_enterprise)
+    oc = create(:simple_order_cycle), distributors: [d])
+    
+    oc.sender.should == d
+  end
+
   it "finds order cycles in various stages of their lifecycle" do
     oc_active = create(:simple_order_cycle, orders_open_at: 1.week.ago, orders_close_at: 1.week.from_now)
     oc_not_yet_open = create(:simple_order_cycle, orders_open_at: 1.week.from_now, orders_close_at: 2.weeks.from_now)

From 7e9f38990089046638d5e60ed9543744cdd35493 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 15:15:15 +1100
Subject: [PATCH 009/100] Getting the order cycles dropdown rendering correctly

---
 app/views/shop/index.html.haml          |  2 +-
 spec/features/consumer/shopping_spec.rb | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
index 9ce7b3af3a..5c1c49f621 100644
--- a/app/views/shop/index.html.haml
+++ b/app/views/shop/index.html.haml
@@ -1,7 +1,7 @@
 = @distributor.name
 
 Ready for:
-= select_tag :order_cycle_id, options_for_select(order_cycles_name_and_pickup_times(@order_cycles), current_order_cycle.id)
+= select_tag :order_cycle_id, options_for_select(order_cycles_name_and_pickup_times(@order_cycles), current_order_cycle.andand.id), :prompt => "Select an Order Cycle!"
 
 %description
   = @distributor.long_description.andand.html_safe
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 81aa9e12d7..72a97bc1f6 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -31,6 +31,21 @@ feature "As a consumer I want to shop with a distributor" do
         # (Should also render products)
       end
 
+      it "shows a select with all order cycles" do
+        oc1 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
+        oc2 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
+
+        exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
+        exchange.update_attribute :pickup_time, "frogs" 
+        exchange = Exchange.find(oc2.exchanges.to_enterprises(distributor).outgoing.first.id) 
+        exchange.update_attribute :pickup_time, "turtles" 
+
+        visit shop_index_path
+        page.should have_selector "option", text: 'frogs'
+        page.should have_selector "option", text: 'turtles'
+        page.should_not have_selector "option[selected]"
+      end
+
       context "when no order cycles are available" do
         it "shows the last order cycle, if any"
         it "shows the next order cycle, if any"

From 3f4f5143ff889dfc1155aea371d71ef30c55f088 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 16:30:39 +1100
Subject: [PATCH 010/100] Refactoring the order cycle partials

---
 app/views/shop/index.html.haml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
index 5c1c49f621..084d435779 100644
--- a/app/views/shop/index.html.haml
+++ b/app/views/shop/index.html.haml
@@ -1,11 +1,12 @@
 = @distributor.name
 
-Ready for:
-= select_tag :order_cycle_id, options_for_select(order_cycles_name_and_pickup_times(@order_cycles), current_order_cycle.andand.id), :prompt => "Select an Order Cycle!"
+= render partial: "shop/order_cycles"
 
 %description
   = @distributor.long_description.andand.html_safe
 
+%div{"ng-app" => "Shop", "ng-controller" => "ProductsCtrl"}
+  {{ products | json }}
 
 = render partial: "enterprises/contact_us"
 = render partial: "enterprises/about_us"

From 165513fdea40557e7f1b76971a3b0d9bc67f298c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 16:30:59 +1100
Subject: [PATCH 011/100] Adding some feature tests for the basic products page

---
 spec/features/consumer/shopping_spec.rb | 52 +++++++++++++++++--------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 72a97bc1f6..93870dd6b5 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -20,7 +20,7 @@ feature "As a consumer I want to shop with a distributor" do
     describe "selecting an order cycle" do
       it "selects an order cycle if only one is open" do
         # create order cycle
-        oc1 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
+        oc1 = create(:simple_order_cycle, distributors: [distributor])
         exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
         exchange.update_attribute :pickup_time, "turtles" 
         
@@ -31,28 +31,48 @@ feature "As a consumer I want to shop with a distributor" do
         # (Should also render products)
       end
 
-      it "shows a select with all order cycles" do
-        oc1 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
-        oc2 = create(:simple_order_cycle, name: 'oc 1', distributors: [distributor])
+      describe "with multiple order cycles" do
+        let(:oc1) {create(:simple_order_cycle, distributors: [distributor])} 
+        let(:oc2) {create(:simple_order_cycle, distributors: [distributor])} 
+        before do
+          exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
+          exchange.update_attribute :pickup_time, "frogs" 
+          exchange = Exchange.find(oc2.exchanges.to_enterprises(distributor).outgoing.first.id) 
+          exchange.update_attribute :pickup_time, "turtles" 
+        end
 
-        exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
-        exchange.update_attribute :pickup_time, "frogs" 
-        exchange = Exchange.find(oc2.exchanges.to_enterprises(distributor).outgoing.first.id) 
-        exchange.update_attribute :pickup_time, "turtles" 
+        it "shows a select with all order cycles" do
+          visit shop_index_path
+          page.should have_selector "option", text: 'frogs'
+          page.should have_selector "option", text: 'turtles'
+          page.should_not have_selector "option[selected]"
+        end
 
-        visit shop_index_path
-        page.should have_selector "option", text: 'frogs'
-        page.should have_selector "option", text: 'turtles'
-        page.should_not have_selector "option[selected]"
+        it "allows the user to select an order cycle" do
+          visit shop_index_path
+
+          select "frogs", :from => "order_cycle_id"
+          page.should have_content "Products"
+        end
       end
 
       context "when no order cycles are available" do
-        it "shows the last order cycle, if any"
-        it "shows the next order cycle, if any"
+        it "tells us orders are closed" do
+          visit shop_index_path
+          page.should have_content "Orders are currently closed for this hub"
+        end
+        it "shows the last order cycle" do
+          oc1 = create(:simple_order_cycle, distributors: [distributor], orders_close_at: 10.days.ago)
+          visit shop_index_path
+          page.should have_content "The last cycle closed 10 days ago"
+        end
+        it "shows the next order cycle" do
+          oc1 = create(:simple_order_cycle, distributors: [distributor], orders_open_at: 10.days.from_now)
+          visit shop_index_path
+          page.should have_content "The next cycle opens in 10 days"
+        end
       end
 
-      it "renders the order cycle selector when multiple order cycles are available"
-      it "allows the user to select an order cycle"
     end
   end
 end

From 3cda12b8dda4ab6572200bfb1f1f022c31244a27 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 16:31:12 +1100
Subject: [PATCH 012/100] Refactoring the order cycle partials

---
 app/views/shop/_last_order_cycle.html.haml |  4 ++++
 app/views/shop/_next_order_cycle.html.haml |  3 +++
 app/views/shop/_order_cycles.html.haml     | 10 ++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 app/views/shop/_last_order_cycle.html.haml
 create mode 100644 app/views/shop/_next_order_cycle.html.haml
 create mode 100644 app/views/shop/_order_cycles.html.haml

diff --git a/app/views/shop/_last_order_cycle.html.haml b/app/views/shop/_last_order_cycle.html.haml
new file mode 100644
index 0000000000..353529e60a
--- /dev/null
+++ b/app/views/shop/_last_order_cycle.html.haml
@@ -0,0 +1,4 @@
+- if most_recently_closed = OrderCycle.most_recently_closed_for(@distributor)
+  The last cycle closed
+  = distance_of_time_in_words_to_now most_recently_closed.orders_close_at
+  ago
diff --git a/app/views/shop/_next_order_cycle.html.haml b/app/views/shop/_next_order_cycle.html.haml
new file mode 100644
index 0000000000..f4b3e5172f
--- /dev/null
+++ b/app/views/shop/_next_order_cycle.html.haml
@@ -0,0 +1,3 @@
+- if next_oc = OrderCycle.first_opening_for(@distributor)
+  The next cycle opens in
+  = distance_of_time_in_words_to_now next_oc.orders_open_at
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
new file mode 100644
index 0000000000..21c4af6825
--- /dev/null
+++ b/app/views/shop/_order_cycles.html.haml
@@ -0,0 +1,10 @@
+- if @order_cycles.empty?
+  Orders are currently closed for this hub
+  %p Please contact your hub directly to see if they accept late orders, or wait until the next cycle opens.
+
+  = render partial: "shop/next_order_cycle"
+  = render partial: "shop/last_order_cycle"
+
+- else
+  Ready for:
+  = select_tag :order_cycle_id, options_for_select(order_cycles_name_and_pickup_times(@order_cycles), current_order_cycle.andand.id), :prompt => "Select an Order Cycle!"

From 102cb62b6077e97f759841fd4bf580d62dbbc6b7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 16:31:22 +1100
Subject: [PATCH 013/100] Starting to build out the Angular.js app

---
 app/assets/javascripts/darkswarm/all.js.coffee            | 3 +++
 .../darkswarm/controllers/products_controller.js.coffee   | 5 +++++
 .../javascripts/darkswarm/services/product.js.coffee      | 8 ++++++++
 app/assets/javascripts/darkswarm/shop.js.coffee           | 1 +
 4 files changed, 17 insertions(+)
 create mode 100644 app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
 create mode 100644 app/assets/javascripts/darkswarm/services/product.js.coffee
 create mode 100644 app/assets/javascripts/darkswarm/shop.js.coffee

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 8bf79626c9..96486a4a69 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -5,7 +5,10 @@
 #= require ../shared/angular
 #= require ../shared/angular-resource
 #= require foundation
+#= require ./shop
 #= require_tree .
 
 $ ->
   $(document).foundation()
+
+
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
new file mode 100644
index 0000000000..0f4448b32b
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -0,0 +1,5 @@
+angular.module("Shop").controller "ProductsCtrl", ($scope, Product) ->
+  $scope.products = Product.all()
+  #console.log Product
+
+
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
new file mode 100644
index 0000000000..e0f6658c8f
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -0,0 +1,8 @@
+Shop.factory 'Product', ($resource) ->
+  #return $resource("/shop/products")
+  class Product
+    @all: ->
+      $resource("/shop/products").query()
+
+  #new Product
+
diff --git a/app/assets/javascripts/darkswarm/shop.js.coffee b/app/assets/javascripts/darkswarm/shop.js.coffee
new file mode 100644
index 0000000000..b8e26d5abd
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/shop.js.coffee
@@ -0,0 +1 @@
+window.Shop = angular.module("Shop", ["ngResource"])

From 3670d68265e9aeed84a3683dd9a6c5a2141cbb68 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 5 Dec 2013 16:48:29 +1100
Subject: [PATCH 014/100] Correctly failing tests forcing us to build out
 OrderCycle switching in Angular

---
 .../controllers/products_controller.js.coffee |  1 -
 app/views/shop/index.html.haml                |  2 +-
 spec/features/consumer/shopping_spec.rb       | 27 ++++++++++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 0f4448b32b..d6de5cb96e 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -1,5 +1,4 @@
 angular.module("Shop").controller "ProductsCtrl", ($scope, Product) ->
   $scope.products = Product.all()
-  #console.log Product
 
 
diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
index 084d435779..23760a8c94 100644
--- a/app/views/shop/index.html.haml
+++ b/app/views/shop/index.html.haml
@@ -5,7 +5,7 @@
 %description
   = @distributor.long_description.andand.html_safe
 
-%div{"ng-app" => "Shop", "ng-controller" => "ProductsCtrl"}
+%products{"ng-app" => "Shop", "ng-controller" => "ProductsCtrl"}
   {{ products | json }}
 
 = render partial: "enterprises/contact_us"
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 93870dd6b5..132896d680 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -48,12 +48,31 @@ feature "As a consumer I want to shop with a distributor" do
           page.should_not have_selector "option[selected]"
         end
 
-        it "allows the user to select an order cycle" do
-          visit shop_index_path
+        describe "with products in our order cycle" do
+          let(:product) { create(:simple_product) }
+          before do
+            exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
+            exchange.variants << product.master
 
-          select "frogs", :from => "order_cycle_id"
-          page.should have_content "Products"
+            visit shop_index_path
+          end
+          
+          it "allows us to select an order cycle" do
+            select "frogs", :from => "order_cycle_id"
+            page.should have_selector "products"
+            Spree::Order.last.order_cycle.should == oc1
+          end
+
+          it "doesn't show products before an order cycle is selected" do
+            page.should_not have_content product.name 
+          end
+
+          it "shows products when an order cycle has been selected" do
+            select "frogs", :from => "order_cycle_id"
+            page.should have_content product.name 
+          end
         end
+
       end
 
       context "when no order cycles are available" do

From 63dfa0b6963c684582e48e8429a8918ea714388c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 6 Dec 2013 15:24:42 +1100
Subject: [PATCH 015/100] Getting the test framework set up for Angular,
 setting up a products fetch stub

---
 .../javascripts/darkswarm/all.js.coffee       |  4 +-
 .../order_cycle_controller.js.coffee          |  5 ++
 .../darkswarm/services/order_cycle.js.coffee  |  6 +++
 .../darkswarm/services/product.js.coffee      |  5 +-
 app/controllers/shop_controller.rb            | 10 +++-
 app/views/shop/_order_cycles.html.haml        | 20 ++++----
 app/views/shop/index.html.haml                | 13 -----
 app/views/shop/show.html.haml                 | 14 ++++++
 config/ng-test.conf.js                        |  2 +
 config/routes.rb                              |  4 +-
 spec/controllers/shop_controller_spec.rb      | 48 ++++++++++++++-----
 .../unit/order_cycle_spec.js.coffee           |  2 +-
 spec/javascripts/unit/product_spec.js.coffee  | 15 ++++++
 spec/javascripts/unit/shop_spec.js.coffee     | 18 +++++++
 14 files changed, 123 insertions(+), 43 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
 create mode 100644 app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
 delete mode 100644 app/views/shop/index.html.haml
 create mode 100644 app/views/shop/show.html.haml
 create mode 100644 spec/javascripts/unit/product_spec.js.coffee
 create mode 100644 spec/javascripts/unit/shop_spec.js.coffee

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 96486a4a69..4b8269dedd 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -8,7 +8,7 @@
 #= require ./shop
 #= require_tree .
 
-$ ->
-  $(document).foundation()
+#$ ->
+  #$(document).foundation()
 
 
diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
new file mode 100644
index 0000000000..eee5bb0175
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -0,0 +1,5 @@
+#Shop.controller "OrderCycleCtrl", ($scope, OrderCycle) ->
+
+  #$scope.setOrderCycle = ()->
+    #console.log "foo"
+    ##OrderCycle.
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
new file mode 100644
index 0000000000..2b285c64bc
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -0,0 +1,6 @@
+Shop.factory 'OrderCycle', ($resource) ->
+  class OrderCycle
+    @set_order_cycle: (id)->
+      new $resource("/shop/order_cycle").$save () ->
+        console.log "pushed"
+      # Push id to endpoint
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index e0f6658c8f..5fc09dae54 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -1,8 +1,5 @@
 Shop.factory 'Product', ($resource) ->
-  #return $resource("/shop/products")
   class Product
     @all: ->
-      $resource("/shop/products").query()
-
-  #new Product
+      response = $resource("/shop/products").query()
 
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 0df04edb50..5d3f8caf02 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -4,7 +4,15 @@ class ShopController < BaseController
   before_filter :set_distributor
   before_filter :set_order_cycles
 
-  def index
+  def show
+  end
+  
+  def products
+    if current_order_cycle
+      render json: Spree::Product.all.to_json
+    else
+      render json: "", status: 404 
+    end
   end
 
   private
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 21c4af6825..f485ad3d21 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -1,10 +1,14 @@
-- if @order_cycles.empty?
-  Orders are currently closed for this hub
-  %p Please contact your hub directly to see if they accept late orders, or wait until the next cycle opens.
+%ordercycle
+  - if @order_cycles.empty?
+    Orders are currently closed for this hub
+    %p Please contact your hub directly to see if they accept late orders, or wait until the next cycle opens.
 
-  = render partial: "shop/next_order_cycle"
-  = render partial: "shop/last_order_cycle"
+    = render partial: "shop/next_order_cycle"
+    = render partial: "shop/last_order_cycle"
+
+  - else
+    Ready for:
+    = select_tag  :order_cycle_id, 
+      options_for_select(order_cycles_name_and_pickup_times(@order_cycles), 
+      current_order_cycle.andand.id), :prompt => "Select an Order Cycle!"
 
-- else
-  Ready for:
-  = select_tag :order_cycle_id, options_for_select(order_cycles_name_and_pickup_times(@order_cycles), current_order_cycle.andand.id), :prompt => "Select an Order Cycle!"
diff --git a/app/views/shop/index.html.haml b/app/views/shop/index.html.haml
deleted file mode 100644
index 23760a8c94..0000000000
--- a/app/views/shop/index.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-= @distributor.name
-
-= render partial: "shop/order_cycles"
-
-%description
-  = @distributor.long_description.andand.html_safe
-
-%products{"ng-app" => "Shop", "ng-controller" => "ProductsCtrl"}
-  {{ products | json }}
-
-= render partial: "enterprises/contact_us"
-= render partial: "enterprises/about_us"
-
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
new file mode 100644
index 0000000000..59fed17c5b
--- /dev/null
+++ b/app/views/shop/show.html.haml
@@ -0,0 +1,14 @@
+%shop{"ng-app" => "Shop"}
+  = @distributor.name
+
+  = render partial: "shop/order_cycles"
+
+  %description
+    = @distributor.long_description.andand.html_safe
+
+  %products{"ng-controller" => "ProductsCtrl"}
+    {{ products }}
+
+  = render partial: "enterprises/contact_us"
+  = render partial: "enterprises/about_us"
+
diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js
index cc03b1588c..95d05a75fc 100644
--- a/config/ng-test.conf.js
+++ b/config/ng-test.conf.js
@@ -11,6 +11,8 @@ module.exports = function(config) {
 
       'app/assets/javascripts/admin/order_cycle.js.erb.coffee',
       'app/assets/javascripts/admin/bulk_product_update.js',
+      'app/assets/javascripts/darkswarm/*.js*',
+      'app/assets/javascripts/darkswarm/**/*.js*',
 
       'spec/javascripts/unit/**/*.js*'
     ],
diff --git a/config/routes.rb b/config/routes.rb
index 3c6b0b26cc..7991f605ff 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,9 @@ Openfoodnetwork::Application.routes.draw do
   root :to => 'home#temp_landing_page'
 
 
-  resources :shop
+  resource :shop, controller: :shop do
+    get :products
+  end
 
   resources :enterprises do
     collection do
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 1747dcff5c..49257e5de0 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -1,22 +1,44 @@
 require 'spec_helper'
 
 describe ShopController do
-  it "should select an order cycle when only one order cycle is open" do
-    d = create(:distributor_enterprise)
-    oc1 = create(:order_cycle, distributors: [d])
+  let(:d) { create(:distributor_enterprise) }
+  before do
     controller.stub(:current_distributor).and_return d
-    spree_get :index
-    controller.current_order_cycle.should == oc1
   end
 
-  it "should not set an order cycle when multiple order cycles are open" do
-    d = create(:distributor_enterprise)
-    oc1 = create(:order_cycle, distributors: [d])
-    oc2 = create(:order_cycle, distributors: [d])
-    controller.stub(:current_distributor).and_return d
-    spree_get :index
-    controller.current_order_cycle.should == nil
+  describe "Selecting order cycles" do
+    it "should select an order cycle when only one order cycle is open" do
+      oc1 = create(:order_cycle, distributors: [d])
+      spree_get :show
+      controller.current_order_cycle.should == oc1
+    end
+
+    it "should not set an order cycle when multiple order cycles are open" do
+      oc1 = create(:order_cycle, distributors: [d])
+      oc2 = create(:order_cycle, distributors: [d])
+      spree_get :show
+      controller.current_order_cycle.should == nil
+    end
   end
 
-  it "should create/load an order when loading show"
+  describe "returning products" do
+    let(:product) { create(:product) }
+    let(:order_cycle) { create(:order_cycle, distributors: [d]) }
+    before do
+      Spree::Product.stub(:all).and_return([product])
+    end
+
+    it "returns products via json" do
+      controller.stub(:current_order_cycle).and_return order_cycle
+      xhr :get, :products
+      response.should be_success
+      response.body.should_not be_empty
+    end
+
+    it "does not return products if no order_cycle is selected" do
+      xhr :get, :products
+      response.status.should == 404
+      response.body.should be_empty
+    end
+  end
 end
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 6d75d2b8ea..53f451dd54 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -754,4 +754,4 @@ describe 'OrderCycle services', ->
         expect(data.incoming_exchanges[0].enterprise_fees).toBeUndefined()
         expect(data.outgoing_exchanges[0].enterprise_fees).toBeUndefined()
         expect(data.incoming_exchanges[0].enterprise_fee_ids).toEqual [1, 2]
-        expect(data.outgoing_exchanges[0].enterprise_fee_ids).toEqual [3, 4]
\ No newline at end of file
+        expect(data.outgoing_exchanges[0].enterprise_fee_ids).toEqual [3, 4]
diff --git a/spec/javascripts/unit/product_spec.js.coffee b/spec/javascripts/unit/product_spec.js.coffee
new file mode 100644
index 0000000000..d48d09244f
--- /dev/null
+++ b/spec/javascripts/unit/product_spec.js.coffee
@@ -0,0 +1,15 @@
+describe 'Shop services', ->
+  $httpBackend = null
+  Product = null
+
+  beforeEach ->
+    module 'Shop'
+    inject ($injector, _$httpBackend_)->
+      Product = $injector.get("Product")
+      $httpBackend = _$httpBackend_
+
+  it "Fetches products from the backend", ->
+    $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
+    products = Product.all()
+    $httpBackend.flush()
+    expect(products[0].test).toEqual "cats"
diff --git a/spec/javascripts/unit/shop_spec.js.coffee b/spec/javascripts/unit/shop_spec.js.coffee
new file mode 100644
index 0000000000..d29c83b35c
--- /dev/null
+++ b/spec/javascripts/unit/shop_spec.js.coffee
@@ -0,0 +1,18 @@
+describe 'Shop controllers', ->
+  describe 'ProductsCtrl', ->
+    ctrl = null
+    scope = null
+    event = null
+    Product = null
+
+    beforeEach ->
+      module('Shop')
+      scope = {}
+      Product = 
+        all: ->
+          'testy mctest'
+      inject ($controller) ->
+        ctrl = $controller 'ProductsCtrl', {$scope: scope, Product : Product} 
+
+    it 'Fetches products from Product', ->
+      expect(scope.products).toEqual 'testy mctest'

From 4db8f755bfea2292739c138212e2112f199453b2 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 12:42:02 +1100
Subject: [PATCH 016/100] Getting an order cycle update function in place like
 a boss

---
 app/controllers/shop_controller.rb            |  9 ++++++
 config/routes.rb                              |  1 +
 spec/controllers/shop_controller_spec.rb      | 21 +++++++++++++
 .../unit/darkswarm/controllers_spec.js.coffee | 30 +++++++++++++++++++
 .../unit/darkswarm/product_spec.js.coffee     | 15 ++++++++++
 5 files changed, 76 insertions(+)
 create mode 100644 spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
 create mode 100644 spec/javascripts/unit/darkswarm/product_spec.js.coffee

diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 5d3f8caf02..1862dfd0c6 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -15,6 +15,15 @@ class ShopController < BaseController
     end
   end
 
+  def order_cycle
+    if oc = OrderCycle.with_distributor(@distributor).active.find_by_id(params[:order_cycle_id])
+      current_order(true).set_order_cycle! oc
+      render status: 200, json: ""
+    else
+      render status: 404, json: ""
+    end
+  end
+
   private
 
   def set_distributor
diff --git a/config/routes.rb b/config/routes.rb
index 7991f605ff..7a67be8d06 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -4,6 +4,7 @@ Openfoodnetwork::Application.routes.draw do
 
   resource :shop, controller: :shop do
     get :products
+    post :order_cycle
   end
 
   resources :enterprises do
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 49257e5de0..7dfc43d289 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -19,8 +19,29 @@ describe ShopController do
       spree_get :show
       controller.current_order_cycle.should == nil
     end
+    
+    it "should allow the user to post to select the current order cycle" do
+      oc1 = create(:order_cycle, distributors: [d])
+      oc2 = create(:order_cycle, distributors: [d])
+      
+      spree_post :order_cycle, order_cycle_id: oc2.id
+      response.should be_success
+      controller.current_order_cycle.should == oc2
+    end
+
+    it "should not allow the user to select an invalid order cycle" do
+      oc1 = create(:order_cycle, distributors: [d])
+      oc2 = create(:order_cycle, distributors: [d])
+      oc3 = create(:order_cycle, distributors: [create(:distributor_enterprise)])
+      
+      spree_post :order_cycle, order_cycle_id: oc3.id
+      response.status.should == 404
+      controller.current_order_cycle.should == nil
+
+    end
   end
 
+
   describe "returning products" do
     let(:product) { create(:product) }
     let(:order_cycle) { create(:order_cycle, distributors: [d]) }
diff --git a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
new file mode 100644
index 0000000000..c01481005f
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
@@ -0,0 +1,30 @@
+describe 'Shop controllers', ->
+  describe 'ProductsCtrl', ->
+    ctrl = null
+    scope = null
+    event = null
+    Product = null
+
+    beforeEach ->
+      module('Shop')
+      scope = {}
+      Product = 
+        all: ->
+          'testy mctest'
+      inject ($controller) ->
+        ctrl = $controller 'ProductsCtrl', {$scope: scope, Product : Product} 
+
+    it 'Fetches products from Product', ->
+      expect(scope.products).toEqual 'testy mctest'
+  
+  describe 'OrderCycleCtrl', ->
+    ctrl = null
+    scope = null
+    event = null
+    OrderCycle = null
+
+    beforeEach ->
+      module 'Shop'
+      scope = {}
+      inject ($controller) ->
+        ctrl = $controller 'OrderCycleCtrl'
diff --git a/spec/javascripts/unit/darkswarm/product_spec.js.coffee b/spec/javascripts/unit/darkswarm/product_spec.js.coffee
new file mode 100644
index 0000000000..05e0961ca9
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/product_spec.js.coffee
@@ -0,0 +1,15 @@
+describe 'Product service', ->
+  $httpBackend = null
+  Product = null
+
+  beforeEach ->
+    module 'Shop'
+    inject ($injector, _$httpBackend_)->
+      Product = $injector.get("Product")
+      $httpBackend = _$httpBackend_
+
+  it "Fetches products from the backend", ->
+    $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
+    products = Product.all()
+    $httpBackend.flush()
+    expect(products[0].test).toEqual "cats"

From 44fe304efbb68b1eff522cb1951734457f255066 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 12:42:33 +1100
Subject: [PATCH 017/100] Building out and testing our Product and OrderCycle
 Angular stuff

---
 .../order_cycle_controller.js.coffee          |  9 +++----
 .../controllers/products_controller.js.coffee | 10 ++++++-
 .../darkswarm/services/order_cycle.js.coffee  | 16 +++++++-----
 .../darkswarm/services/product.js.coffee      | 10 ++++---
 app/views/shop/_order_cycles.html.haml        |  8 +++---
 app/views/shop/show.html.haml                 |  3 ++-
 .../unit/darkswarm/controllers_spec.js.coffee | 26 +++++++++++++++----
 .../unit/darkswarm/order_cycle_spec.js.coffee | 23 ++++++++++++++++
 .../unit/darkswarm/product_spec.js.coffee     |  2 +-
 spec/javascripts/unit/product_spec.js.coffee  | 15 -----------
 spec/javascripts/unit/shop_spec.js.coffee     | 18 -------------
 11 files changed, 80 insertions(+), 60 deletions(-)
 create mode 100644 spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
 delete mode 100644 spec/javascripts/unit/product_spec.js.coffee
 delete mode 100644 spec/javascripts/unit/shop_spec.js.coffee

diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
index eee5bb0175..262b965373 100644
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -1,5 +1,4 @@
-#Shop.controller "OrderCycleCtrl", ($scope, OrderCycle) ->
-
-  #$scope.setOrderCycle = ()->
-    #console.log "foo"
-    ##OrderCycle.
+Shop.controller "OrderCycleCtrl", ($scope, $rootScope, OrderCycle) ->
+  $scope.order_cycle = OrderCycle.order_cycle
+  $scope.changeOrderCycle = ->
+    OrderCycle.set_order_cycle()
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index d6de5cb96e..a6ca84bc84 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -1,4 +1,12 @@
-angular.module("Shop").controller "ProductsCtrl", ($scope, Product) ->
+angular.module("Shop").controller "ProductsCtrl", ($scope, $rootScope, Product) ->
   $scope.products = Product.all()
 
 
+  #$scope.order_cycle = OrderCycle.order_cycle
+  #$scope.updateProducts = ->
+    #$scope.products = Product.all()
+  #$scope.$watch "order_cycle.order_cycle_id", $scope.updateProducts
+  #$scope.updateProducts()
+
+
+
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 2b285c64bc..680cf48631 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,6 +1,10 @@
-Shop.factory 'OrderCycle', ($resource) ->
-  class OrderCycle
-    @set_order_cycle: (id)->
-      new $resource("/shop/order_cycle").$save () ->
-        console.log "pushed"
-      # Push id to endpoint
+Shop.factory 'OrderCycle', ($resource, Product) ->
+  new class OrderCycle
+    @order_cycle = {
+      order_cycle_id: null
+    }
+
+    set_order_cycle: (id = null)->
+      new $resource("/shop/order_cycle").save {order_cycle_id: id}, ->
+        Product.update() 
+        
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index 5fc09dae54..1e328c52a7 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -1,5 +1,7 @@
 Shop.factory 'Product', ($resource) ->
-  class Product
-    @all: ->
-      response = $resource("/shop/products").query()
-
+  new class Product
+    @products: null
+    update: ->
+      @products = $resource("/shop/products").query()
+    all: ->
+      @products || @update()
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index f485ad3d21..1d2eb1bff8 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -1,4 +1,4 @@
-%ordercycle
+%ordercycle{"ng-controller" => "OrderCycleCtrl"}
   - if @order_cycles.empty?
     Orders are currently closed for this hub
     %p Please contact your hub directly to see if they accept late orders, or wait until the next cycle opens.
@@ -8,7 +8,7 @@
 
   - else
     Ready for:
-    = select_tag  :order_cycle_id, 
-      options_for_select(order_cycles_name_and_pickup_times(@order_cycles), 
-      current_order_cycle.andand.id), :prompt => "Select an Order Cycle!"
+    %select{"ng-model" => "order_cycle.order_cycle_id", 
+            "ng-change" => "changeOrderCycle()",
+            "ng-options" => "c for c in #{@order_cycles.map {|oc| oc.id}.to_json}"}
 
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 59fed17c5b..57c58883f7 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -7,8 +7,9 @@
     = @distributor.long_description.andand.html_safe
 
   %products{"ng-controller" => "ProductsCtrl"}
-    {{ products }}
+    %pre {{ products | json }}
 
   = render partial: "enterprises/contact_us"
   = render partial: "enterprises/about_us"
 
+
diff --git a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
index c01481005f..1218c83982 100644
--- a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
@@ -1,30 +1,46 @@
-describe 'Shop controllers', ->
+describe 'All controllers', ->
   describe 'ProductsCtrl', ->
     ctrl = null
     scope = null
     event = null
+    rootScope = null
     Product = null
 
     beforeEach ->
       module('Shop')
-      scope = {}
       Product = 
         all: ->
           'testy mctest'
-      inject ($controller) ->
+      inject ($controller, $rootScope) ->
+        rootScope = $rootScope
+        scope = $rootScope.$new()
         ctrl = $controller 'ProductsCtrl', {$scope: scope, Product : Product} 
 
     it 'Fetches products from Product', ->
       expect(scope.products).toEqual 'testy mctest'
+
+    #it "updates products when the changeOrderCycle event is seen", ->
+      #spyOn(scope, "updateProducts")
+      #rootScope.$emit "changeOrderCycle"
+      #expect(scope.updateProducts).toHaveBeenCalled()
   
   describe 'OrderCycleCtrl', ->
     ctrl = null
     scope = null
     event = null
+    rootScope = null
+    product_ctrl = null
     OrderCycle = null
 
     beforeEach ->
       module 'Shop'
       scope = {}
-      inject ($controller) ->
-        ctrl = $controller 'OrderCycleCtrl'
+      inject ($controller, $rootScope) ->
+        rootScope = $rootScope
+        scope = $rootScope.$new()
+        ctrl = $controller 'OrderCycleCtrl', {$scope: scope}
+
+    #it "triggers an event when the order cycle changes", ->
+      #spyOn(rootScope, "$emit")
+      #scope.changeOrderCycle()
+      #expect(scope.$emit).toHaveBeenCalledWith "changeOrderCycle"
diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
new file mode 100644
index 0000000000..43df2d628d
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
@@ -0,0 +1,23 @@
+describe 'OrderCycle service', ->
+  $httpBackend = null
+  OrderCycle = null
+  mockProduct = {
+    update: ->
+  }
+
+  beforeEach ->
+    module 'Shop', ($provide)->
+      $provide.value "Product", mockProduct
+      null # IMPORTANT
+      # You must return null because module() is a bit dumb
+    inject (_OrderCycle_, _$httpBackend_)->
+      $httpBackend = _$httpBackend_
+      OrderCycle = _OrderCycle_
+
+  
+  it "posts the order_cycle ID and tells product to update", ->
+    $httpBackend.expectPOST("/shop/order_cycle", {"order_cycle_id" : 10}).respond(200)
+    spyOn(mockProduct, "update")
+    OrderCycle.set_order_cycle(10)
+    $httpBackend.flush()
+    expect(mockProduct.update).toHaveBeenCalled()
diff --git a/spec/javascripts/unit/darkswarm/product_spec.js.coffee b/spec/javascripts/unit/darkswarm/product_spec.js.coffee
index 05e0961ca9..1b25ded9e1 100644
--- a/spec/javascripts/unit/darkswarm/product_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/product_spec.js.coffee
@@ -8,7 +8,7 @@ describe 'Product service', ->
       Product = $injector.get("Product")
       $httpBackend = _$httpBackend_
 
-  it "Fetches products from the backend", ->
+  it "Fetches products from the backend on init", ->
     $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
     products = Product.all()
     $httpBackend.flush()
diff --git a/spec/javascripts/unit/product_spec.js.coffee b/spec/javascripts/unit/product_spec.js.coffee
deleted file mode 100644
index d48d09244f..0000000000
--- a/spec/javascripts/unit/product_spec.js.coffee
+++ /dev/null
@@ -1,15 +0,0 @@
-describe 'Shop services', ->
-  $httpBackend = null
-  Product = null
-
-  beforeEach ->
-    module 'Shop'
-    inject ($injector, _$httpBackend_)->
-      Product = $injector.get("Product")
-      $httpBackend = _$httpBackend_
-
-  it "Fetches products from the backend", ->
-    $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
-    products = Product.all()
-    $httpBackend.flush()
-    expect(products[0].test).toEqual "cats"
diff --git a/spec/javascripts/unit/shop_spec.js.coffee b/spec/javascripts/unit/shop_spec.js.coffee
deleted file mode 100644
index d29c83b35c..0000000000
--- a/spec/javascripts/unit/shop_spec.js.coffee
+++ /dev/null
@@ -1,18 +0,0 @@
-describe 'Shop controllers', ->
-  describe 'ProductsCtrl', ->
-    ctrl = null
-    scope = null
-    event = null
-    Product = null
-
-    beforeEach ->
-      module('Shop')
-      scope = {}
-      Product = 
-        all: ->
-          'testy mctest'
-      inject ($controller) ->
-        ctrl = $controller 'ProductsCtrl', {$scope: scope, Product : Product} 
-
-    it 'Fetches products from Product', ->
-      expect(scope.products).toEqual 'testy mctest'

From 04d894917734657e9abd75a95052618dd63ebe32 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 12:53:50 +1100
Subject: [PATCH 018/100] Tweaks to the JS, redirection on the controller

---
 .../darkswarm/services/order_cycle.js.coffee  |   3 +-
 app/controllers/shop_controller.rb            |   4 +-
 spec/controllers/shop_controller_spec.rb      | 110 ++++++++++--------
 3 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 680cf48631..053447fc3e 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,8 +1,7 @@
 Shop.factory 'OrderCycle', ($resource, Product) ->
   new class OrderCycle
-    @order_cycle = {
+    @order_cycle:
       order_cycle_id: null
-    }
 
     set_order_cycle: (id = null)->
       new $resource("/shop/order_cycle").save {order_cycle_id: id}, ->
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 1862dfd0c6..dca51d71b5 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -27,7 +27,9 @@ class ShopController < BaseController
   private
 
   def set_distributor
-    @distributor = current_distributor 
+    unless @distributor = current_distributor 
+      redirect_to root_path
+    end
   end
 
   def set_order_cycles
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 7dfc43d289..0622910a6f 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -2,64 +2,72 @@ require 'spec_helper'
 
 describe ShopController do
   let(:d) { create(:distributor_enterprise) }
-  before do
-    controller.stub(:current_distributor).and_return d
+
+  it "redirects to the home page if no distributor is selected" do
+    spree_get :show
+    response.should redirect_to root_path
   end
 
-  describe "Selecting order cycles" do
-    it "should select an order cycle when only one order cycle is open" do
-      oc1 = create(:order_cycle, distributors: [d])
-      spree_get :show
-      controller.current_order_cycle.should == oc1
-    end
-
-    it "should not set an order cycle when multiple order cycles are open" do
-      oc1 = create(:order_cycle, distributors: [d])
-      oc2 = create(:order_cycle, distributors: [d])
-      spree_get :show
-      controller.current_order_cycle.should == nil
-    end
-    
-    it "should allow the user to post to select the current order cycle" do
-      oc1 = create(:order_cycle, distributors: [d])
-      oc2 = create(:order_cycle, distributors: [d])
-      
-      spree_post :order_cycle, order_cycle_id: oc2.id
-      response.should be_success
-      controller.current_order_cycle.should == oc2
-    end
-
-    it "should not allow the user to select an invalid order cycle" do
-      oc1 = create(:order_cycle, distributors: [d])
-      oc2 = create(:order_cycle, distributors: [d])
-      oc3 = create(:order_cycle, distributors: [create(:distributor_enterprise)])
-      
-      spree_post :order_cycle, order_cycle_id: oc3.id
-      response.status.should == 404
-      controller.current_order_cycle.should == nil
-
-    end
-  end
-
-
-  describe "returning products" do
-    let(:product) { create(:product) }
-    let(:order_cycle) { create(:order_cycle, distributors: [d]) }
+  describe "with a distributor in place" do
     before do
-      Spree::Product.stub(:all).and_return([product])
+      controller.stub(:current_distributor).and_return d
     end
 
-    it "returns products via json" do
-      controller.stub(:current_order_cycle).and_return order_cycle
-      xhr :get, :products
-      response.should be_success
-      response.body.should_not be_empty
+    describe "Selecting order cycles" do
+      it "should select an order cycle when only one order cycle is open" do
+        oc1 = create(:order_cycle, distributors: [d])
+        spree_get :show
+        controller.current_order_cycle.should == oc1
+      end
+
+      it "should not set an order cycle when multiple order cycles are open" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        spree_get :show
+        controller.current_order_cycle.should == nil
+      end
+      
+      it "should allow the user to post to select the current order cycle" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        
+        spree_post :order_cycle, order_cycle_id: oc2.id
+        response.should be_success
+        controller.current_order_cycle.should == oc2
+      end
+
+      it "should not allow the user to select an invalid order cycle" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        oc3 = create(:order_cycle, distributors: [create(:distributor_enterprise)])
+        
+        spree_post :order_cycle, order_cycle_id: oc3.id
+        response.status.should == 404
+        controller.current_order_cycle.should == nil
+      end
     end
 
-    it "does not return products if no order_cycle is selected" do
-      xhr :get, :products
-      response.status.should == 404
-      response.body.should be_empty
+
+    describe "returning products" do
+      let(:product) { create(:product) }
+      let(:order_cycle) { create(:order_cycle, distributors: [d]) }
+      before do
+        Spree::Product.stub(:all).and_return([product])
+      end
+
+      it "returns products via json" do
+        controller.stub(:current_order_cycle).and_return order_cycle
+        xhr :get, :products
+        response.should be_success
+        response.body.should_not be_empty
+      end
+
+      it "does not return products if no order_cycle is selected" do
+        xhr :get, :products
+        response.status.should == 404
+        response.body.should be_empty
+      end
     end
+
   end
 end

From 3903173848e275796fbc12255fd4e6cea5a7317f Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 13:36:12 +1100
Subject: [PATCH 019/100] Working reloading of products, changing order cycles,
 sticky state

---
 .../javascripts/darkswarm/services/order_cycle.js.coffee | 9 +++++----
 .../javascripts/darkswarm/services/product.js.coffee     | 2 ++
 app/assets/javascripts/darkswarm/shop.js.coffee          | 3 ++-
 app/views/shop/_order_cycles.html.haml                   | 6 ++++--
 spec/controllers/shop_controller_spec.rb                 | 7 +++++++
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 053447fc3e..bbf7714311 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,9 +1,10 @@
 Shop.factory 'OrderCycle', ($resource, Product) ->
-  new class OrderCycle
-    @order_cycle:
+  class OrderCycle
+    @order_cycle = {
       order_cycle_id: null
+    }
 
-    set_order_cycle: (id = null)->
-      new $resource("/shop/order_cycle").save {order_cycle_id: id}, ->
+    @set_order_cycle: ->
+      new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, ->
         Product.update() 
         
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index 1e328c52a7..5b7df226af 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -3,5 +3,7 @@ Shop.factory 'Product', ($resource) ->
     @products: null
     update: ->
       @products = $resource("/shop/products").query()
+      console.log @products
+      @products
     all: ->
       @products || @update()
diff --git a/app/assets/javascripts/darkswarm/shop.js.coffee b/app/assets/javascripts/darkswarm/shop.js.coffee
index b8e26d5abd..faffd0e6c4 100644
--- a/app/assets/javascripts/darkswarm/shop.js.coffee
+++ b/app/assets/javascripts/darkswarm/shop.js.coffee
@@ -1 +1,2 @@
-window.Shop = angular.module("Shop", ["ngResource"])
+window.Shop = angular.module("Shop", ["ngResource"]).config ($httpProvider) ->
+  $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 1d2eb1bff8..d48fb5149d 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -1,7 +1,9 @@
 %ordercycle{"ng-controller" => "OrderCycleCtrl"}
   - if @order_cycles.empty?
     Orders are currently closed for this hub
-    %p Please contact your hub directly to see if they accept late orders, or wait until the next cycle opens.
+    %p 
+      Please contact your hub directly to see if they accept late orders, 
+      or wait until the next cycle opens.
 
     = render partial: "shop/next_order_cycle"
     = render partial: "shop/last_order_cycle"
@@ -9,6 +11,6 @@
   - else
     Ready for:
     %select{"ng-model" => "order_cycle.order_cycle_id", 
+            "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.id}",
             "ng-change" => "changeOrderCycle()",
             "ng-options" => "c for c in #{@order_cycles.map {|oc| oc.id}.to_json}"}
-
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 0622910a6f..6f57add80c 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -13,6 +13,13 @@ describe ShopController do
       controller.stub(:current_distributor).and_return d
     end
 
+    describe "Fetching products" do
+      it "should return products for the current order cycle" do
+        spree_get :products
+      end
+      it "should not return other products"
+    end
+
     describe "Selecting order cycles" do
       it "should select an order cycle when only one order cycle is open" do
         oc1 = create(:order_cycle, distributors: [d])

From 71a5d84a1da0817b3fe058d797b1a03dc96001bc Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 15:06:07 +1100
Subject: [PATCH 020/100] Filtering the products to the current order cycle

---
 app/controllers/enterprises_controller.rb |  1 -
 app/controllers/shop_controller.rb        |  4 ++--
 spec/controllers/shop_controller_spec.rb  | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb
index 383c52df07..d4b6ade04b 100644
--- a/app/controllers/enterprises_controller.rb
+++ b/app/controllers/enterprises_controller.rb
@@ -65,7 +65,6 @@ class EnterprisesController < BaseController
 
     order_cycle_options = OrderCycle.active.with_distributor(distributor)
     order.order_cycle = order_cycle_options.first if order_cycle_options.count == 1
-
     order.save!
 
     redirect_to main_app.enterprise_path(distributor)
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index dca51d71b5..880e66e8e0 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -8,8 +8,8 @@ class ShopController < BaseController
   end
   
   def products
-    if current_order_cycle
-      render json: Spree::Product.all.to_json
+    if products = current_order_cycle.andand.products_distributed_by(@distributor)
+      render json: products.to_json 
     else
       render json: "", status: 404 
     end
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 6f57add80c..0c8575231c 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -13,13 +13,6 @@ describe ShopController do
       controller.stub(:current_distributor).and_return d
     end
 
-    describe "Fetching products" do
-      it "should return products for the current order cycle" do
-        spree_get :products
-      end
-      it "should not return other products"
-    end
-
     describe "Selecting order cycles" do
       it "should select an order cycle when only one order cycle is open" do
         oc1 = create(:order_cycle, distributors: [d])
@@ -57,24 +50,31 @@ describe ShopController do
 
     describe "returning products" do
       let(:product) { create(:product) }
-      let(:order_cycle) { create(:order_cycle, distributors: [d]) }
+      let(:order_cycle) { create(:order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
+
       before do
-        Spree::Product.stub(:all).and_return([product])
+        exchange = Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id) 
+        exchange.variants << product.master
       end
 
       it "returns products via json" do
         controller.stub(:current_order_cycle).and_return order_cycle
         xhr :get, :products
         response.should be_success
-        response.body.should_not be_empty
       end
 
       it "does not return products if no order_cycle is selected" do
+        controller.stub(:current_order_cycle).and_return nil
         xhr :get, :products
         response.status.should == 404
         response.body.should be_empty
       end
-    end
 
+      it "only returns products for the current order cycle" do
+        controller.stub(:current_order_cycle).and_return order_cycle
+        xhr :get, :products
+        response.body.should == [product].to_json
+      end
+    end
   end
 end

From bc4f47252333cc40e23ad4cdcac3c8c8b6507917 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 15:33:57 +1100
Subject: [PATCH 021/100] Fixing up the tests with some refactoring

---
 .../controllers/products_controller.js.coffee        |  3 ++-
 .../darkswarm/services/order_cycle.js.coffee         |  5 +++--
 .../javascripts/darkswarm/services/product.js.coffee | 12 +++++++-----
 app/views/shop/show.html.haml                        |  2 +-
 .../unit/darkswarm/controllers_spec.js.coffee        |  6 ++++--
 .../unit/darkswarm/order_cycle_spec.js.coffee        |  2 ++
 .../unit/darkswarm/product_spec.js.coffee            |  1 -
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index a6ca84bc84..8f21390a7f 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -1,5 +1,6 @@
 angular.module("Shop").controller "ProductsCtrl", ($scope, $rootScope, Product) ->
-  $scope.products = Product.all()
+  $scope.data = Product.data
+  Product.update()
 
 
   #$scope.order_cycle = OrderCycle.order_cycle
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index bbf7714311..6c98b7a57a 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -4,7 +4,8 @@ Shop.factory 'OrderCycle', ($resource, Product) ->
       order_cycle_id: null
     }
 
-    @set_order_cycle: ->
-      new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, ->
+    @set_order_cycle: (id)->
+      @order_cycle.order_cycle_id = id
+      new $resource("/shop/order_cycle").save {order_cycle_id: id}, ->
         Product.update() 
         
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index 5b7df226af..f8f139ad32 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -1,9 +1,11 @@
 Shop.factory 'Product', ($resource) ->
   new class Product
-    @products: null
+    data: {
+      products: null
+    }
     update: ->
-      @products = $resource("/shop/products").query()
-      console.log @products
-      @products
+      @data.products = $resource("/shop/products").query =>
+        #console.log @products
+      @data
     all: ->
-      @products || @update()
+      @data.products || @update()
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 57c58883f7..f617e4ca9d 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -7,7 +7,7 @@
     = @distributor.long_description.andand.html_safe
 
   %products{"ng-controller" => "ProductsCtrl"}
-    %pre {{ products | json }}
+    %pre {{ data.products | json }}
 
   = render partial: "enterprises/contact_us"
   = render partial: "enterprises/about_us"
diff --git a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
index 1218c83982..784973f175 100644
--- a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
@@ -10,14 +10,16 @@ describe 'All controllers', ->
       module('Shop')
       Product = 
         all: ->
-          'testy mctest'
+        update: ->
+        data: "testy mctest"
+          
       inject ($controller, $rootScope) ->
         rootScope = $rootScope
         scope = $rootScope.$new()
         ctrl = $controller 'ProductsCtrl', {$scope: scope, Product : Product} 
 
     it 'Fetches products from Product', ->
-      expect(scope.products).toEqual 'testy mctest'
+      expect(scope.data).toEqual 'testy mctest'
 
     #it "updates products when the changeOrderCycle event is seen", ->
       #spyOn(scope, "updateProducts")
diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
index 43df2d628d..0a00cd60d4 100644
--- a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
@@ -21,3 +21,5 @@ describe 'OrderCycle service', ->
     OrderCycle.set_order_cycle(10)
     $httpBackend.flush()
     expect(mockProduct.update).toHaveBeenCalled()
+
+
diff --git a/spec/javascripts/unit/darkswarm/product_spec.js.coffee b/spec/javascripts/unit/darkswarm/product_spec.js.coffee
index 1b25ded9e1..fd2a8f4edb 100644
--- a/spec/javascripts/unit/darkswarm/product_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/product_spec.js.coffee
@@ -12,4 +12,3 @@ describe 'Product service', ->
     $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
     products = Product.all()
     $httpBackend.flush()
-    expect(products[0].test).toEqual "cats"

From 8f41078c0cc883f72db73947b3ac8cef0abc9517 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 11 Dec 2013 15:39:50 +1100
Subject: [PATCH 022/100] Reworking our bindings so everything stacks on
 objects and automagically updates

---
 .../darkswarm/controllers/order_cycle_controller.js.coffee   | 2 +-
 .../javascripts/darkswarm/services/order_cycle.js.coffee     | 5 ++---
 spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee   | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
index 262b965373..d16d31603c 100644
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -1,4 +1,4 @@
 Shop.controller "OrderCycleCtrl", ($scope, $rootScope, OrderCycle) ->
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.changeOrderCycle = ->
-    OrderCycle.set_order_cycle()
+    OrderCycle.push_order_cycle()
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 6c98b7a57a..cdb98e9f7b 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -4,8 +4,7 @@ Shop.factory 'OrderCycle', ($resource, Product) ->
       order_cycle_id: null
     }
 
-    @set_order_cycle: (id)->
-      @order_cycle.order_cycle_id = id
-      new $resource("/shop/order_cycle").save {order_cycle_id: id}, ->
+    @push_order_cycle: ->
+      new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, ->
         Product.update() 
         
diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
index 0a00cd60d4..ed40d6347b 100644
--- a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
@@ -18,7 +18,8 @@ describe 'OrderCycle service', ->
   it "posts the order_cycle ID and tells product to update", ->
     $httpBackend.expectPOST("/shop/order_cycle", {"order_cycle_id" : 10}).respond(200)
     spyOn(mockProduct, "update")
-    OrderCycle.set_order_cycle(10)
+    OrderCycle.order_cycle.order_cycle_id = 10
+    OrderCycle.push_order_cycle()
     $httpBackend.flush()
     expect(mockProduct.update).toHaveBeenCalled()
 

From 36694822db0b591532a635a83ea29ec0bdb0f0b7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 12 Dec 2013 10:28:43 +1100
Subject: [PATCH 023/100] Starting to prettify

---
 .../javascripts/darkswarm/services/order_cycle.js.coffee  | 3 +--
 app/assets/stylesheets/darkswarm/header.css.scss          | 2 ++
 app/views/shop/_order_cycles.html.haml                    | 2 +-
 app/views/shop/show.html.haml                             | 4 ++++
 .../javascripts/unit/darkswarm/controllers_spec.js.coffee | 8 --------
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index cdb98e9f7b..4c941df9e6 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -6,5 +6,4 @@ Shop.factory 'OrderCycle', ($resource, Product) ->
 
     @push_order_cycle: ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, ->
-        Product.update() 
-        
+        Product.update()
diff --git a/app/assets/stylesheets/darkswarm/header.css.scss b/app/assets/stylesheets/darkswarm/header.css.scss
index 945966dfb7..e7df510621 100644
--- a/app/assets/stylesheets/darkswarm/header.css.scss
+++ b/app/assets/stylesheets/darkswarm/header.css.scss
@@ -1 +1,3 @@
 /*body { background: #ff0000; }*/
+
+
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index d48fb5149d..d99ec34d15 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -11,6 +11,6 @@
   - else
     Ready for:
     %select{"ng-model" => "order_cycle.order_cycle_id", 
-            "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.id}",
+            "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id}",
             "ng-change" => "changeOrderCycle()",
             "ng-options" => "c for c in #{@order_cycles.map {|oc| oc.id}.to_json}"}
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index f617e4ca9d..19467e091b 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -7,6 +7,10 @@
     = @distributor.long_description.andand.html_safe
 
   %products{"ng-controller" => "ProductsCtrl"}
+    %product{"ng-repeat" => "product in data.products "}
+      {{ product.product.name }}
+      {{ product.product.description }}
+
     %pre {{ data.products | json }}
 
   = render partial: "enterprises/contact_us"
diff --git a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
index 784973f175..0ea7488225 100644
--- a/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers_spec.js.coffee
@@ -21,10 +21,6 @@ describe 'All controllers', ->
     it 'Fetches products from Product', ->
       expect(scope.data).toEqual 'testy mctest'
 
-    #it "updates products when the changeOrderCycle event is seen", ->
-      #spyOn(scope, "updateProducts")
-      #rootScope.$emit "changeOrderCycle"
-      #expect(scope.updateProducts).toHaveBeenCalled()
   
   describe 'OrderCycleCtrl', ->
     ctrl = null
@@ -42,7 +38,3 @@ describe 'All controllers', ->
         scope = $rootScope.$new()
         ctrl = $controller 'OrderCycleCtrl', {$scope: scope}
 
-    #it "triggers an event when the order cycle changes", ->
-      #spyOn(rootScope, "$emit")
-      #scope.changeOrderCycle()
-      #expect(scope.$emit).toHaveBeenCalledWith "changeOrderCycle"

From d5081e4cc54a40c603e9cfb7ed078758f512d35c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 13 Dec 2013 09:19:54 +1100
Subject: [PATCH 024/100] Working on the pretties

---
 .../javascripts/darkswarm/all.js.coffee       |   4 +-
 .../{header.css.scss => header.css.sass}      |   4 +-
 .../stylesheets/darkswarm/overrides.css.sass  |   2 +
 .../stylesheets/darkswarm/shop.css.sass       |  59 ++++++++++++++++++
 .../stylesheets/darkswarm/typography.css.sass |  29 +++++++++
 app/views/shop/_order_cycles.html.haml        |  16 +++--
 app/views/shop/_products.html.haml            |  22 +++++++
 app/views/shop/show.html.haml                 |  24 +++----
 public/AveniBla.eot                           | Bin 0 -> 21527 bytes
 public/AveniMed.eot                           | Bin 0 -> 21593 bytes
 public/AvenirLTStd-Black.otf                  | Bin 0 -> 28688 bytes
 public/AvenirLTStd-Medium.otf                 | Bin 0 -> 28132 bytes
 12 files changed, 139 insertions(+), 21 deletions(-)
 rename app/assets/stylesheets/darkswarm/{header.css.scss => header.css.sass} (50%)
 create mode 100644 app/assets/stylesheets/darkswarm/overrides.css.sass
 create mode 100644 app/assets/stylesheets/darkswarm/shop.css.sass
 create mode 100644 app/assets/stylesheets/darkswarm/typography.css.sass
 create mode 100644 app/views/shop/_products.html.haml
 create mode 100644 public/AveniBla.eot
 create mode 100644 public/AveniMed.eot
 create mode 100644 public/AvenirLTStd-Black.otf
 create mode 100644 public/AvenirLTStd-Medium.otf

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 4b8269dedd..96486a4a69 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -8,7 +8,7 @@
 #= require ./shop
 #= require_tree .
 
-#$ ->
-  #$(document).foundation()
+$ ->
+  $(document).foundation()
 
 
diff --git a/app/assets/stylesheets/darkswarm/header.css.scss b/app/assets/stylesheets/darkswarm/header.css.sass
similarity index 50%
rename from app/assets/stylesheets/darkswarm/header.css.scss
rename to app/assets/stylesheets/darkswarm/header.css.sass
index e7df510621..a33fa1b30d 100644
--- a/app/assets/stylesheets/darkswarm/header.css.scss
+++ b/app/assets/stylesheets/darkswarm/header.css.sass
@@ -1,3 +1,3 @@
 /*body { background: #ff0000; }*/
-
-
+nav.top-bar
+  margin-bottom: 0px
diff --git a/app/assets/stylesheets/darkswarm/overrides.css.sass b/app/assets/stylesheets/darkswarm/overrides.css.sass
new file mode 100644
index 0000000000..fcec6b455d
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/overrides.css.sass
@@ -0,0 +1,2 @@
+.row
+  max-width: 74em
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
new file mode 100644
index 0000000000..7637ff28c6
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -0,0 +1,59 @@
+product
+  display: block 
+
+
+shop
+  color: #999
+  display: block
+  navigation
+    display: block
+    background: #F4EBDE
+    distributor.details
+      display: block
+      height: 150px
+      select
+        width: 200px
+      position: relative
+      img, h3
+        display: inline
+      location
+        display: block
+        padding-left: 28px
+
+      ordercycle
+        display: block
+        position: absolute
+        right: 20px
+        top: 12px
+
+        form.custom 
+          width: 400px
+          strong
+            line-height: 37px
+            padding-right: 8px
+          closing
+            font-size: 80%
+            display: block
+          .custom.dropdown
+            width: 200px
+            display: inline-block
+            background: transparent
+            font-weight: bold
+            border-color: #888
+
+  products
+    display: block
+    padding-top: 36px
+    table
+      width: 100%
+      font-size: 1.2em
+      border-collapse: collapse
+      border: none
+      td, th
+        background: #fff
+        border: 1px solid #bbb
+        border-left: 0px
+        border-right: 0px
+      
+
+
diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass
new file mode 100644
index 0000000000..7b4ba55d7c
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/typography.css.sass
@@ -0,0 +1,29 @@
+@font-face
+  font-family: 'AvenirBla_IE'
+  src: url("/AveniBla.eot") format("opentype")
+
+@font-face
+  font-family: 'AvenirBla'
+  src: url("/AvenirLTStd-Black.otf") format("opentype")
+
+@font-face
+  font-family: 'AvenirMed_IE'
+  src: url("/AveniMed.eot") format("opentype")
+
+@font-face
+  font-family: 'AvenirMed'
+  src: url("/AvenirLTStd-Medium.otf") format("opentype")
+        
+body 
+  font-family: "AvenirMed_IE", "AvenirMed"
+
+h1, h2, h3, h4, h5, h6
+  color: #666
+  font-family: "AvenirMed_IE", "AvenirMed"
+  
+// These selectors match the default Foundation selectors
+// For clean overriden magic
+table tr th, table tr td
+  color: #666
+table thead tr th, table thead tr td, table tfoot tr th, table tfoot tr td 
+  color: #666
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index d99ec34d15..cc50a90137 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -9,8 +9,14 @@
     = render partial: "shop/last_order_cycle"
 
   - else
-    Ready for:
-    %select{"ng-model" => "order_cycle.order_cycle_id", 
-            "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id}",
-            "ng-change" => "changeOrderCycle()",
-            "ng-options" => "c for c in #{@order_cycles.map {|oc| oc.id}.to_json}"}
+    %form.custom
+      %strong Ready for:
+      %select{"ng-model" => "order_cycle.order_cycle_id", 
+              "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id}",
+              "ng-change" => "changeOrderCycle()",
+              "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
+
+      %closing
+        %img{src: "/icon/goes/here"}
+        Orders close
+        %strong= current_order_cycle.orders_close_at.strftime "%A %m"
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
new file mode 100644
index 0000000000..d37ae6d4b4
--- /dev/null
+++ b/app/views/shop/_products.html.haml
@@ -0,0 +1,22 @@
+%products{"ng-controller" => "ProductsCtrl"}
+  %table
+    %thead
+      %th Item
+      %th Description
+      %th Variant
+      %th QTY
+      %th Bulk
+      %th Price
+    %tr.product{"ng-repeat" => "product in data.products "}
+      %td {{ product.product.name }}
+      %td {{ product.product.description }}
+      %td {{ product.master.options_text }}
+      %td Quantity thing
+      %td.group_buy{"ng-class" => "{enabled: product.group_buy}"} 
+        Not available
+      %td.price
+        %small from
+        $ {{ product.price }}
+
+
+  %pre {{ data.products | json }}
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 19467e091b..33c02ccf58 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,17 +1,17 @@
 %shop{"ng-app" => "Shop"}
-  = @distributor.name
+  %navigation
+    %distributor.details.row
+      %img{src: "/route/to/distributor/icon"}
+      %h3
+        = @distributor.name
+      %location= @distributor.address.city
+      = render partial: "shop/order_cycles"
 
-  = render partial: "shop/order_cycles"
-
-  %description
-    = @distributor.long_description.andand.html_safe
-
-  %products{"ng-controller" => "ProductsCtrl"}
-    %product{"ng-repeat" => "product in data.products "}
-      {{ product.product.name }}
-      {{ product.product.description }}
-
-    %pre {{ data.products | json }}
+      %description
+        = @distributor.long_description.andand.html_safe
+    
+  %products.row
+    = render partial: "shop/products"
 
   = render partial: "enterprises/contact_us"
   = render partial: "enterprises/about_us"
diff --git a/public/AveniBla.eot b/public/AveniBla.eot
new file mode 100644
index 0000000000000000000000000000000000000000..1ae59a33813355de1d136f2063002f144ecf2abd
GIT binary patch
literal 21527
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

literal 0
HcmV?d00001

diff --git a/public/AveniMed.eot b/public/AveniMed.eot
new file mode 100644
index 0000000000000000000000000000000000000000..61c35da54be49ba2ab40e03aecc6e8e928c7e3d7
GIT binary patch
literal 21593
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

literal 0
HcmV?d00001

diff --git a/public/AvenirLTStd-Black.otf b/public/AvenirLTStd-Black.otf
new file mode 100644
index 0000000000000000000000000000000000000000..1a934a2af3e42297b5a3ec12bc9461e08efad6fa
GIT binary patch
literal 28688
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
A;{X5v

literal 0
HcmV?d00001

diff --git a/public/AvenirLTStd-Medium.otf b/public/AvenirLTStd-Medium.otf
new file mode 100644
index 0000000000000000000000000000000000000000..e902718152796a3b42299408775f8b1f21eecd1a
GIT binary patch
literal 28132
zcmd432V7J+*EpOz!@UE!Ix6F!&gjgDhy|soAS!l6Y$!z$8@(t^I`+PZ72UNL*4{f-
zRK#Aeq3Bq^Hm)n`>aJ@p2AA(-z<qZA?>^7_zW?9%{eB-IH$6EyIY~}VGRMc?-v`x3
z(~%qv>Dj}t&-_N;A3$iB1wyD(ufBZ^BRv-dAyn%+LS1I}_Ve~Sv_d41-W{O^o4tnk
z`0d@C=Yfz<E<!@MmtR27xA(r>MQBhsLb5JCeon3<?oMcf5C{2Da9CVO;>;I0BN4K!
zg^<Pi=!lT;*S@26LE2-mZqX2-Xf9s>`Rha2E;=qH!*JAoB|_dqAb<V1kc>o*2QT6}
z!bgY?iHn%=arHU~=R$CNVnT9C)iLA>@a~3m1LEK-v;6(L+^5^d*6H#)lFMI13@UtM
z+4`GX74*j|i(2xv5SAkui-kWZC;L=Y3thG_R0UN9S=2JuRGn6xfk$Wv;^2$qG8>sa
z;*o_cTNVi60o5)y2Dx$#p&n6?%VhA+Fe*0}uKD!n-LnsP4OCX$mV7OzF__zi&t2Jh
zmWEiVhMfJM?R!I*^@@FKBkvl&3|XOJHGVm2g2vYPEl>kAxyH|<E@)YeUqIIAW{qEg
zmY`=fek)Xmn^5ByQ6p}8jbDlExK#i>XJG{`FXc|v_&MY#^QrO6kWx0K#xF;mWb<qM
z7RXL^p~lan4B5{$e&H|i3eF%8sfo8jI*S=Kei6A^Y^d=oQ9p~@HU7Ft!#Aq&*F)BP
zyB!7>kB%N~;Oo($jltE~+131QZ|D)85E^0d%S=v*h)Xtj$A={(B_<?=q(p=}8hXUW
z8j@n7qEnI$NfF5rNof$-BP}96Cdn|+-{6-L?$*IDC?Y&2HO|%1xm}0OY`{8KXBg-Y
z$!)6>|5n8CXPIFUNy#w@@rLTML;MT?l%un=bLZ%Ul(2;OG=qzyvttLB&T%2*BN9>~
z9b;ocA>GlXqno?SzilKY*$`q#NeT&%hzm&?Z%BwV42+3SNXbl$FnGm<_Je*z#Xwh+
zBEk(Z@rIP>2t$CQpQB+2bT~f65E375@c*;0Ph@0FScEw;E+o?cX!?8Uu!y9T5U3>q
zs!1}8OHGPN4vz^-fj%Vz?!uE|LgEd5lTuS+q9T%_Q&JK;IXR`Lr#pr)j5~%U#5pmr
z{%wL&Y(!K@tYdUaTrAoFgzkboP)D$BYWyCkgW2zjoWZ#M#or!s^g!V#0fnLn@cW@m
zl#Eiq9|x`hCPh37gVZFHX#R$n)54LXxm+xY1vd%BpePg#DXc^iluZVkgwo*4a`rI$
z;vrWOqz^>?@b!b-;o!OfWCk?IoHGWcLaV;uj{;vT3W5BtP~I7}gIt}Vp5CY@>SOk?
zx~pqs^;Or__HXt4wbg%@XBgCy1klDn-{Jv|zqU36YBkj0i^0H5XXs@DK+Z4{54~cT
zW@(N9p9`eM0nFo}PL?MUVq>A^(3)BuAxB5(uRFMZh0OqY7~Vp_rT{b{fER{+*8A}g
zmjE>}ti?c!tlmr*2{uw*kS7%N10Tb9l(`l*ZY;zw%kr}tqs_Sk02)8A23TpU$1on!
zSgY~o-2VU2vJbQz3H5}TYxtIvL6!+6tLf!Gwav;UK`S9OurTNuG>i(y!3Z<DNru*0
z3n}nrI88Rg$S9JfvNjE<FZff<Iik#^8KtEF7CIp(FzIIF2zkFzv7>o>;vnrCw*L1e
zoM7x2RztvbG}Cq*`2Id_f2HLAO2@FavmFYotbWbP-<Ykk=CHs?kY<HQP0F`@2qORE
z9|yat9QH9D2}l88Ss{!>R10=5C8~q!B3QqX3e`tyWCOcZL(~XqkQOzDT}+4cfXb%G
z7Bxe5s5!DnEl^9;3bjTKupG37PC5Z0y8yAaL+yc_8KJTzq!W;J7vzb$qHd@=?0-E`
zFPMgXU{Jh(_`FenGysTm5E_hpfV76f^!0-Y82~%za1@9}pdd67jY6Z*7}!S<+Jp9?
z1Lz<+fli@w=rX#7uAr-^2wg`vU=O{6ZlT+#7?q&A=pMR{9-v3ah#mqzQwqCk8F~tX
z{v!-YD3B#vY<@sn&`z`pO+mBJCzOpAqK{}T`W<}+Qdo)JqW9<>dX0WX^U-2NVP{^3
zCZS-o0)2p?{f(0Y5oQ1>OK30JkItY)=zAc+c|dmQFwmB01B}iKbP<T@XPAhwFx}$O
z1T!h7p^0cWI)rwi!zd3OK}XRsbR3;T`Ow4D=qxHk=TQ!til(9IXa<^zW}`W1F8U5-
zF}?=!gaRgc7zs88V*#S6C>L!)Rh$dglk?+3xD0M8w^VjXc189?zC)fbFEG?K)Hi4h
zI)kmj-r#KLWaw?!-Bi`owyAwnM_ZY#U|Yx5+E#6=vDMi+*!HsxwvA|hmCCBBpe=)W
zoPz;txq!RP&_)l=mkWkAra&7Pp^XQBwxKdKG&D9C%x!r5LmTy=jYfaA5e{u|RaI5b
zP!F(;!3I{HL8vMiT7|!=!3h0P4AupqufAU$zP5b&sX7Irr+!cSKXrYof9hFwzbw71
zpzKuXo6@hPr3jV&R9aG6TzaW=SLyeqIgi@%v475xZ-xC~vRHDM1FrY4wmO+pa&@`-
zj92{UKaTN$|Mf2lC?*%EY8KGbe4vXJr~+tfI$&%q+6-Ij6riVM82dSBInYuDT94Mi
zh)n{@*#(ra-%QupK-qaf+lPQEj@MAdYM}JfX397N6u%uP^t_oq&Y=rv9nkMJm;+aU
z{;$FeSORn44$J~J2TEWTusN^|X2Bzv2S%6!4}l_=!8|B6&xGe_BT(l8wA4(u1?UO7
zgkAzAWz|sJcR+n}&GgJ@In_+nX)u2#z|47%wgL*+>I8pPc`)by;g17iMI6Ve{wx2)
zqFYOyk<^8gJZmATt4!)9ml{~mPIT{=+%L|2WByv5#zM1tXB#_Sw?@sO9)O`XtV=eq
z64}9e(*f2KZ&)n?f&Rw<Oc^jo=0jhWLm#&SR*wSKE(131LEm4(eEoytxmUcBZ_c}>
z#>Y6j_VVzF1D1#RoqP07jA5R3Jv^$z&cMV)Oh^rhjYv+3iDT?(NMuZmn~Q5lkC4Q~
zq=XD}VoZEwOngjACX{h?b#{aJ@YJxB#E_(vn2^};n8-+TojrS*(_K8Gk|Lm{By-W&
zgozRHz^H`)3l|dGCp9Snno2e&Rp;&y6Q2?hl@t=2oEirJ0GG$&on4$m9FtQMBa&hg
zk`n&(MUIV$92=VuAMs~QO8UQ2Q=*e1{*_Y0_V!9h%rrCG|8H^Xh8n*6|2HhLKXBXO
zF;OuoA+fQUh6p%ngaaEM7ZMg76VG_-knoVu*a$;%LS#yMNK%9$G9k%OJ%lmwQD$D<
z;13*gWJp*<vLO~&^Y~;apORq6Oh`3AFT=iJ5Mo<~wfZl3{QFtQ(O^E`_*S29e7~J<
z4F1tj)t@kcpB)ka3>e~+Om?97`-$mqM<(-GAqI|1)zBp*CAazW_y7c4eT1m)Qbc$g
zLn^@E2G-{AnB>IRkW3bcO8_#BVLpfqi%noX1T?^jCO$bbB8i<_(qmGh6H-&ma7AP!
z!pSTd>PSzDNr5wr!8{w%LSp}f6#8j^PW_Ki57ox9u?P=I3Hb-~{|oyDhLN-wHhv+=
z1~$Q1doT`3hS(4|DMB)vE=m7pSX};k5H<9RfQn*6Ba&eH8G0wBhK-L4Nj4KjyrG8|
zga4lnqSXUshV&l>=|9)Wkj~C}>{$12$K`)FDlh{7FfRWzD*qWYI640Hg#EAM^53Ev
zZ^^yjHX<$yaX%m~8*!@<w-|AY5cfUeK#Z{-amx|NB)A;JtwY=r#4SYJ8pN&OxCMxt
zhq&($Hy?3p5w{71LmanR#w|tM1`ye>m3<KKeMzu;J?6%8t7Z1GPO=HI?Xt(RKjc_m
zOWr{4DxWN0A%ASq%OcaFnAh^|e7+zPY=q`QKVg(GRk*KMs937_XlY?-ZQ0PWo#kxH
z9hQeIUs%<%YG~zWHO?y8YNFK>t3R-a?Xd$MgjeHR_#u9QC9#fZFAfyPipk<^akY3@
z{7sZ<HLMj{E2Y+~TBmFMQtM0Yp|vAwkE^}8_C=*!iIshne#(i;b4psLPMt<|Ce>L|
z=R@7jbw}1cUiXiBsNSG@hpqcrpRm4Z{nq-63aji?_NtaDPgS65mTHb_zp6lWUG-4)
zMpaQ?TYqi+-_=Mhs_oTX)LqpP>P+=_>Q(Cf>TBvhY^-ebHe+o<Y-ZS$HE?Lqw!!5F
zw;KG`FtFj1Mgfh6H%e$Uq0#w9Pc=$SXHB4HtLCD{q-~;g*DluPXkTkTHSXDXLgVDd
z=Nn&dT-^9o<M&N!HEGdgM3dkqQB9^cncHMRlVweIG}+&zq{)*erY2u>oKB^4(7Eb7
zbVGE3x^cQGx<$I>x?{R0x|jOedS`v0K3G3hze2x3zeRsae^39|z!|Iz%?(`*eGS76
z5r#NJw&9TBq~X5dx2AkkMN_M$V$-or-`EbbH8$(hET-A+W_z2xvKwZ1qxrDr%bTBT
z{=vSty_dbW{Q&zx_CEGQ?fvWn?1$Trupeo^%6?7D`KP3}r>x;?cdEgB3n{B&NM)8l
z7SRi8+LbKh$!mccXn~rrK;=?Jr7*_qCtWFo1?dcg=rYPeN_r3e=a7cd!*uJrq#?B|
zSKT6mPGg741?7V3DYc+>9=P)x%n^Iz9iyDsOQC8b$@csn(`>UxP(HyV_zE_X;B;=Y
zv`GGw&BJ0$EQJIb%!BWDV;f-uvE#wLjj82r+|=`pkWTG*=8`m$q-FtXY0jh!o>nGZ
zF5~jb2|7z^mCH#%#cp*#FTpUgbq^|NsH%JfK?ypVt?*muyFKny*S-z=oP9XqxwhBY
zVg<2W`pW~N)R4x__fyMVx`hjPGF@>h`*_NZ@Z#GI3j%v=>ZuK&7u9}ihVQtlxq9r-
z)gN?c=~MNkj7t;xYP<qMyl3f@Bq!78n?|-9_Zdl$abmjle&*h0AJxf%{nGIXn7psl
zOu(x20@74Eq4wEXIrMABrC44`>SUIUNvo(^W_{vgayjW&t~xB8Bpzzgghca{6I^L?
zY9RLfo&EREz0`bmFKDS#?Y3_>l%l=|MjaceR~_yU+I?V4ja_kb(*DhrL&cYLs@Ugk
zd7>8RHR-&1z~GpmL|yF8@Ixmw1xI$AKD94?lumW{KxIqy*vP=qeYIZw3vb=Ma^U=K
zz4AVOhtH8ts$h~-5%?CXau;A2Y3lr?7IzZHaacv7x(#g*NZZr48rtzJb^3|c(_K2m
zyAi8k(v;Y1NQXQkdq%XnZ^cL(qr8kdtKX0Yr%8L#Rzo@l5GN;6Pv;ZHKc!YjXj5vh
zp&de~tOI4mv=xEr92rq8CqJIXy=V)8Ha(fvpV*FcrB;QZFG;OeR9Seq9TAECSlSJ$
zAH^$gkhMmRoG{9Z$XYeYpczJzK{AXKKAseUg7OjOPLfV?GHx+eMq{AewV3GV?1j!n
zE=sGIoX*Xc8p)+b730)>x6r#^m*1Yif1|2B<s`pczK48P(^f}l92reUA0ct16>$nC
zQFJsN9ZaLBldjz6-6}GWXozMN9oWig3iYKLs+mH3f6^&~4`8wp$a14ic}1X`Ku1vb
zbNz@7sRfP9FOv$(IH}D?`EeU5yo^c$nL<+etCug`c&#Be_C-`lm5xJby$s!NGx-}U
zPUhXx-Y5+2Gc-IXJVH<R)4gU$$;vX4R%R_3%00_fua6U3wPDwbQ3Pp8JtDtF8b2R#
z-*vTqp+fbcI5+?LJq>AKe}!7M?HKG5se3n$&(A%!`;7MH>9Fp7qC=^@-d&-3Z6e$h
zin|RQ-lO~Y-8WP8Y|1*9k<UbUhsn!w)dTX<rkptcQr1F>hM7qBRtE8{NTH(4g2oG~
z*CdvF<`)VKjijKAxS6=;RcP#VRE3PwQMp_ie;QZT6=qdh@taOwS-DU9;r4JlmqGsB
z1_p1vo}_O*j(6H!7Fez&IwF4!q@`<LP8+2RpEEOEzlikV$)W0+Pn416>D=COassNf
zJ&h?ZP%pZV5B5q3Xs@9<B6A^)z{s8uXW~SyZZ(geFn4;2?mL)P<JGUQ3G1L=6&A31
zNJHgsZ3q&`-U@+#QaRL}yiu5;UtLC0jMgX0dzF(U_^5s*JEy6M`r~7wc`@`_*IfM~
zh3aj=stX10G@l)AQ8|@6^fk1)FsxvTE=!^MwQJhY0quYmK6WB%o$4)>O9$0Or;cAP
zIyS2R(8z!uy~EBI>Y!42<rsC(K_^Q~&KDXN=u5IMjqRZ6>L1XV0Z5jYkrQP#{Uok7
zgcpbx*~cHbx$W$84bf4Vi8cZw^PtYuiCFdhxP8l#<r{U2g_mT!+Js+0H_a<HNn(^w
zKJ3Nb^sonhgvk_$fN9|?<$2&6N2GP<u=JMHR#yg+{t{UJp`vmpP2@ck(oUMd=Gq|R
zL*qGIBy}vrkm6E^l{fNOu_7r`Ed|p4m0<ZUkewv*PoOY?QZ3nLv9ipX_`z<$mlrYW
zxk!T4M-}IOSbpfR?)Dvi%a%1qPHPBmcLTN$s}6mr<wV`b8GO;QBge06FP<1P*e56=
zBve0qM8@Qvn!!My8C2(i$>_|YpNwRKv0FL`D6&3kyi-QJZ^ELZdOuz21Q6xrhK}my
zXV+;&+Rps))31KklYooro`R}$`Xt{{tomj8+05V{M{8;0c2r9nv_I45Y5uWYyLRXo
z3!w|PrR>rE476tfdtz@uYkfMHj-_3w2MwVSq$BkpQKUYxDf)0u-$m#@(j}^m7E&7!
z73o8IkUB(5x<TpMuGFPzKNr9BnM>E^Ec|}a4|-(;cE!q_^UFwf8Hp^jepOD^eC+*E
z_34!j`A%RIf19Y@c$K*2uo){AZ#s4Qv4+%gI#27sCMJ}-tBHf~VDCu3u0!H`>S+VP
z-GbN(s!y*khPbzAlRi{Wn+nQLOEGuiqkI>peTkk9A*tgrv7K*{HqXXFxr=%gUNHmM
zHDyw68o6j9Nv3reM#N~MMv_E6nkt71O5&AiB2!Idwh1bd0$_p-k_>7W;zCC#l7k0K
z?WYA|6N!?vPr-L?WcXds-@MD8_wTZo+GwLN9SzNPBeS0oeq-J(J^83m5?g5Ofr*?*
z=U$ad^24~CJdot{0j!D+^hBkcoNy3;Omov<3s?ecvsI?4qAqL(*J16vPNt|kPwLcW
zSj_H%>AJRQe6#g;1AoyzB=z%1U%j-*L7~it+CQHp7t^6DpO*=wlz!%kL8#=UdgKjx
z#8Ztxi|9pu7P$!R<YDO#aLA?HH0dF+=E};YBjxfkn{w&lLV?Vxe8^t|M|#LFtb7On
z(q;lpuH4OkC(u-BHxEJOB@81cbt+eldSwG_PwW}2T6+~MXJYO=mfK?GoLqbiuYegg
zzs%hv9WlZFE^YXzI#zMDOid#f3ZG7%Cz#aIkTKMaw4ozu7;Og_4X0706Llb?by6Ea
zl~L(zQd36*tm96k1>s@eYe^i4oMPIVIvHpk>ZDh$$i<%p(vM!}Ni6{of1m%n;>J^x
z=H+O@QE%M}91O&8_9L19QSN6Ra_J8fM`i(9XF-4eAQ`60d=~=y<U#BNgn0nZsj!ig
z4K^l$?5YUlZ3P-zdAAhPaOo~j<$$!R`NWpiPLoQA%{#o{i@z$6gxh=&RMDiHR069$
z>0VjFe-KD0lx`uYR#NB6t5CkPbd{$vfp#{BoFUXgQ05=N^C}GTc{W58NHDoX#?nhX
zu@>k`$%;%TFL(-l>Q6V*fn+mJ>j-2feaS0V!k)UkTs{iW%!t}F7b~CP;xc(L@EW9N
zkxNCEsfhLja)J%syt|X)vFh8fxmPUj3!D2hOq6BvUFOVRYSEtFrmtBpg7QX%)x&rA
zk+et^{D^E<mkO#}nESs2=leTfD$p3IH{V%Mwxsn=L7iE0S`YZ>Q@}<8<HP~qBtHj?
z?pxs&$>u!-Wf(q$Rr$@aYH|y31F&+%w6ee(*!m}kxe2&c<=<SW2*=b4cE~4X+_CaK
znA(4|C-%3l<(@gAUyf_?A1f!<O{#q9P(_y7h5kBE$RFQ-r<a!6w=qy#YWSIQq{X$O
z?WgzZ7YeG$UM7VqpJo>);d!_{OrrHb-v%RzHO^jY{i{j!`d6E2cq&#s_~8++dOZ}c
zptH+J>oW2n73--k`&V0{*IvKA_52?FqCP_BNO!8~J8bKzQM$q1_(3;HQcPOn^xFs0
zOi!~VTXp%RAMn5ee6@TT)+>W^Z(!~wTQ1}yFd=|VXgU5mK8{r%(nwbi3@rtuRRmne
zs>3Bxyt;C)!e`?6plMSUFP^SbrOfEas}9dzzkc2ZEwNib>g4OCg9_C#DrZGILsfC<
z<Xk#5AP3x$Y=I=wY@XB?=xnl_Od#WVT2G+CG=!HXyC|UPimaEof{iK3fx`A>)6%U0
zxMcRPdR$$_=L`AQpRXL?qN58;WQC$^&&B7@S9|x;(X}SBUGaO&Z`9s*P~6a1-G#W3
zJNjtdh7L`bsh<bqcF$b_o3gpmg@DQtSWq3i3$4z_ZZOKTFti1O{NN_tt2U8e7YaeU
zuE*Zg68krwi7hd-g-O|BfOmXgG^^~`O&101hS|L~!B~W)k=Qa)nu@9I8{qkGUf-F&
zOTUojn*^F&fj42A34PI&PfOpzdZSv&`Y}^bUH<Ll$rr0uXMML?r&_uAEw8$~c-oYO
zQ?x^TqDQ2#Mz%BPsM9R$4HS_H^!C8W{c4gEHV#xx8oAI$%{+gj^M!5;-H3i&-r^Ox
zx+jY1nMqk`TCe%%3iM<=Q8R96HC7#S#;S~-CWW%)d?I(*fvuNINvcE=Z1Y|qgQa-h
zK~U|djcFCNB~?5ulcfE8QmZ8_&7{^lyu2b6){4$HZ`oSGn>j>M57y~d0%;3nVZmG3
zoPLI-q86mJ5h%|B2JqVp%FekvFqb1Omgm?Ixj+nLBr(vDJe(S-Kgl6(WCA-bL6I(0
zLAtQhA?ZS4uAiy~aeq2iB~JI?Rr`Yg3619)$sOYyHbJO!F?nhv&x@@OmCY{$&h<PT
zbGi#7{71X#sjH%AR@B%rTGa<n;5m-%8{2b{o@x|^!qKO6CB<We@M*^m>q%?HqK^Z%
zr!2Buq}Z5qZBN!~OX8q7vf}7L-7!H~S(`5UGMOtj%8M&zs{fd5{4yB^!`$q1BY9eE
zP3p0BKWvB9s6;qbc>JlJxGL@*JbFy0dTj)jeN6b#yLzHgeD*&+Lf5_5G2!5fF`;_e
zT9MWKTKvW=%Pd98oB=V594)DXB6!-^aNQVK$w<b7xkl@9DP9#UZIzU2Rjz+ReCBv<
z?6~#oqV=lab<q*)!n6Y-qK3!n4-Mk?tlf0rh<4Y$%*+FNRc_{igP8}lM~`l}c}NdC
zGN~jD%?Evpa#ikYnxrn57QiqU0B2;k5eH9$qp#G_XkBa~)@M~2<c-uueIWbbgw1i+
zFE$K2F<{HUMV3VY-U`|%qhlMY)zAi|wxrQio%h)y#f>EwHy%7{sX8{~Lc+MH%#iFx
z0XCgikG}sz^Y}<f=}I^}0h^RnOs1D{q$jW-y(K#}b-OPRt7}JY@7|jcze9KVHh*-q
z&$@xIBKBxTE%hxNdX>|x=I+vvGMY`Yh?_#W2m=p2xae^axdQye^fEb_Zc|1ElWs+{
zTY<248&4dI7`+T8SNP@v9Yk+YFLDcZCo+&;;i=$F9EG(B{4m<hn{<PDK<&yTmtqoC
z#!ZtB$)y0vQw_V+dLrjbRvy^AN4tI1+!?F&hf4UhvB67&wcULNIc4e-X;Ypmd%+Q7
zAbr3`%$^oFR699y@v=01L~nk|ww==tXdhobZCtItD_QVF0|y*vroy+(`k|@UN7CzK
zFO%w}lwKjI?~L=@-b<^x+p?J-MZ<PQoJ`cKUi&7526v{8<m5~{&7cuUfxbZ-3o~`?
zLwUD-kD^{^KYcn!6lanThi=oW?w;Pd>-YuW7fwzkSabHorZc+Z*#|P#hFEr`@#_5<
z$C86I(eW{{89LR=uKW4mT>lN1HAfHR?pp=J@y<xT7`a^bmFI#~C_jiFKX&4<0L`$q
z0lUWPf`ZQb=I8U{j}=TT(4H+=v-_w%Kj{4VpnQJ!u{8w+nu19M<BsX_^L@_+jpTQa
z9=2w<cKGl~<3{O&PV%|*d-eNAkKVt3)VXEL&dfe~uQSUeeldbbqVH+!2^%uaHY${z
zrO<qQ8hZ%tunW8uNH)n<e+wv|V-m1+GA3_n>|~hW`=tSC+*uMXC!-*?CS1V6mRr@N
zIf<qABz8aMm0fUO+>!(v&3n6)MfR#Ivpgl(-GilWMl$vqmQH~@hX#?cE^rPA@+3i!
zRAeL<jilc-O#F$z5mus$)lNSb+K>8s5`TKp><G$<ctM3t5l2=Ui3JE#R#I!VvEqAT
z@%4LSMG0L9f{ymxsZF!zorqGeYzb$G&)i+|Sq^pzW)cj>V2~t`V05Mp^YLO#R*~#v
z2r*Pt1SWqAL+>w1V|Qcvmc;JHN~t-Vy|@pgAxJLFR!%yD<byo38D0HRN~1H21Jg)O
z@r$4FjCAV_KjZm7<HJ8=)rk+%;!O2f?9!{3i%W4&lfKyE2#D=osac>pT1VWR)kpBx
zpQQ!nSe>d7I*avCloiq!+nhRd=oE`Q$*LO>cKDQD)w{d2h_q4r>|heGD<A=D37mnn
z5|)@<<@s<vRFtc>lVRkrdaS~4#`LgIU7z0kgb9;^12q)C=m%?#)wA2ga;>iU54`uR
z;L-iHLq;9Dd@27x-eLWjQ|njX)m(-(b3M^*#CPy$GFkqlBCtDn&w}@?blDwCmx<lT
zlh$KMDR6fOq|5EFD)?SGugYDCr3bh0Nb(Yv%)1t2K>XzbN&a{P6e;2&$qjjAg|FH<
z=jx~z+80+(yvorJ69Q+BNej{jjmbSdQ?Ha>ky_jZQddrDNw3sxu_LfW=D4vrSiY`e
zi~%SpkMMcix;#=V4`TFQ_%%pL-HYW*Xoz|eK6;rC5(c+V!^%5&gk&clAzfBK3Bgn)
zT&H$5J|&%SiQ5eFu>fkTo<4Qrtclv>)aARf^hb`L-M&p1AcTwy4Di$VFFY1^M!R$O
z@=aUyP#g4CenYw(h^6Lc3jZ=${$(;y_#cx!zf2aC5}I#%Vk$I|C=(~GD3{N&Az1i8
zy7S~b?Jl)2(Mu$q>@d+CaO6E{svIRypGsdfh^i!hJ;<z-J#Zc-V+0WT`0y_kG?otG
z$zz8~Cq=J8ysM)4DqnLfs^Fyk>O&)b?B82MoouO!y7e3S<Nh(a@H};7e%jSrniPEf
zTw3%|U1fUZXLZ>te#DhW@jq$f@yDoFgRkpLO(6$5y6`6lb=l?$XUvv++FkV4yE*bo
z$$AFnE_@_k%jI93;J|bdz};@5+X37Yrph4#NUj}0ygiPFl9se3S*4do36=IH^<aSp
zHX{OQO>BRIlWd^=vY;G`L7H3K>k2L=4UN5utq+!yIc4OBa@Em_v#`uO4kPWTcl(i{
z(XqO7kzO16Yy0&|9y3C(+IP;E-;=k0L!s7q*xyS(nHm&r?c%9L_d-un|HYO4myYUt
z=iQiaU;FI*o@<4AReH}tJ~%mKysy@I_|5xz^1D#!Z8JroI_l;X*dt)f-s2~B{CG=8
z(u&o0Ph2c}wR=d<g*r1&oxT|}Hz}Q*eu<@qg7E=wQh0Xd$xfF_3x%gA@1igodEiFp
z8!?l#bR$}I`qmkH4{4U+yggG>x9I4-%4X_YxA@q+GnwbKaWG+zT}VG0lcy`W&#N9p
z?d#s1-xuQh<3MdB9<XW1!4Q2vFJ97+67}k&rLp5Q4nBPyqT{|_mkfgMN7IZ%_b*JH
zGm$mrs?v(R&}PVlutZ<2eaOw*dP0v1q-ndiRNK-oC}h0u%E&?6Jz&Fb(Udl$O<zz%
z+LAgaF6`N??|<k);sfoo8@q~*>*;IatG<~3@afaM-u)KpRPX8U;pz@iZdBPe(D?ez
z>H8mlKkC*&#|~BjX`9j{RT+sZV{AT8gw^Gd<tk4E9I~`l_<6_eUkWZJcIr1K#7n1I
zKYfz>D&gJzpr$RoeOqN_E?hiOuNpPIlLAuaY}}N!NlOeLUy^1->wLA#3MPYDhi+~-
zQt$-CQ%+Ywz~>VI$M2>(<#+f7d1K_H^+vh$R_ds(-03NeqN9z1(wEJ%{Bp7g)_Ygj
zJB;KKEcvb^AFe;%le$Ipp*N{3kUjK0M7)Iqb1nLozX}d{%P*vFjS@&!1Ze3Np9K!E
zA`k@m$$U8Z6p`53m|pDVT`ZK_kf}v<Dv4c%$+Y=J<V+FSk-jV4nz$B|O=YA}nW~hy
zW`VT!YvW#+e(t8eG@e(zzX=k%(?&A*o6P(slbN?R!W=Nm%-ubyJIKuG8w+Wtv2v#X
za*Q<6xr}6#k>=_9FzI{@)3&6!gHTR0r?YlRd+#FRQ&!V-`(nwfShcsJgH4g3ivRhF
zLbbPO5ZTm4p^ATsRY&F&sY`I>3i=DcauZkfsvNE^7F2tsUcD7t0j`^*;Z@^R*s#b3
z(h%hNKNn*9jHn$jeQD7eGgi7+#j9#o+Feb5HIiQyo|RcOJ|!I~bt)pAin!D4D?csW
zRD0a$_vFcq8&96}yW!!{ub+pm$maO|{l|~*j~qQZlG**ofqu*fuk|3MPv?HZ@|!dR
z&TaV%h44SSSEp!R+3_MGFM^{TnQ!c8Bo#%f-31lite3F`tea~KYWf*l03BUjP-Foe
zo%gMy)9IQM7)k_V)t>G?c!*hYNj4S{vFKG1x2=e{8yTT!i{#`7Vh2Rg^Stmo?a4o3
z!{3j;u=MD@dzvRBk2lxRj)Ku!eO@@Zpdiav<2x*Cq|R5Mm*O&Ukxd2=<XR@3C2v43
zJ0Fv@^lRzdQ7o4_gYbZ&;jYFmqo4L}I_$*g&u0n)&iL&2ZZvNmzkhtt%CRulV=-y>
z8a7x@;@pua?TAcIEDCx0yfUFTjLkl2=Q(`yC-qrBSXHCp@+10OA&mwfn1DhWL!(*9
z-=BcXE4!I{__&x{FD_vnd~THdisakK=S(bRc&Ud^j~O>W>pbkv^EW3hzA4%T5a=HW
zA13uU(^5;DdOFi4R9osu^yRm%yvfy9&bq12z@0D*@Dz7&cS%$F;|Oem?UoFIz11Gm
zX%#91%h9c(c6UfR$o5%lvWRW8s?x4l^+yM+Dy7q;t6q?L{}%9KzN)uSE=QWDhOPb+
zZ1r#b@u%1Lh-pAtMH42iBkPM*?{~rCSPB9<1>BPQ#_NXnh`|tfl+RwWc>ZGTcsvl3
zR)^fdk?J1m&xESC@8MVFV{)+Sbw8~73`>!(fo1AL26o5ea3<s(he-_NrS}rB=^joh
z!yrGr03ZagtmE(xEaxQ#W3_m3xLLdy1>(gOS26K9!@wO0;12i4t+01RM|W_DM@7f}
zcqTpr7&-Cr*Bt!oM-V|auef1=#E6Q^-68G3rSwY=u<EfboUSW+hccnykHpT}EEiNg
z@WU#J@Y35r+z}HCfD)W?fbt-N(OAAJ2d{#wkCuSQ`wUD-H840=Cg4lNj;of%WlFy8
zECxyt+cG?g^+|edz||tUL&R<_Ceao4fw(iKHsqx{4#QXQ$de!@I|*X4NgyUW8Gt{K
zm%x!7WgOYbm5_s=d-#|sJO>XiQ{_)*;<V{Zo;E!IawFPFnrMLPnoB9&A@2?Is2?+J
zWW)YLnd)?R$Un6^<UidV@}DVy{GGiZ<IjK#X!Z~!CqwGd01V>A4-B&>0kcQ_K`Qqe
z-%FF)GPxY-Q4FHFMrCbCy~%q2E-`rDsiFm!bB~>Bv>XorsVF(@4#GCp6YE3eWPiEp
zvmM?@4nr^AvtE2&38}0XhsslPaB8`#!VU<7W=Z`Gtav}EcX#|FPBXdV+%2q*64P-^
zB27^I0W1D`B?iF<G2FvrN!_`oxuh;g)IRx=*#;=JluYdoXIrx<idaLZKpu62$)omy
z#K-iJb*Kb7bi*GHh66Bp<c{Z819}w5y&0A|kVnwYW7f{wm5^pecKNIvJPQW98RQ|Y
zr3nUBc$_r8J7oCz7KWman_)Oi{1l3rOz8?pl|Wt{5r{`(x}9;@YoHqd$PthfrGcbq
zjG4#Y%NjYd62t{%fz|!FX#&1@tVwko@})vPdc9(dx+xqKK$z4NE1|XpjCDVSi45qJ
ziJ6Xp3@3xhaE=9G(gQFCX@Hn#Fx&DWX);U7homM9J2f&M6S13viJg=lh`ZpP*cYb)
z?=-xGBkE_Q+jF^eQW~yaR>D`d5Io0Bo0z0uIh0?PyKV7B?RV5Bo<>Gexn-HK|J`<y
zkwfZPl5X^h(0S?DA2M}i!t8Cc4+2wA$RuO;NSEuR_6^eh0r&icT>7!1yE-@8ceS6E
zHf-9JwvW{N3TgfLB4J)?c1n^aQ88=&tOc`lqlJwAe6c{=ZGO^`G}AsP+J9oN9uCXV
z@nOk++7=_u5sQg>k|3<T&eOR<_R{&wmT5LCwl3JXXrqp764u_}>2`sj?L}vvYYUG}
zPuZzg8fM?B&|l{WDkb(8<Wf)Ksva|8RN!E(f6$TNvi18Ea5Gi=G2A0qYkmqVY2Uf?
zKsrE2Hz|^n6Vu|8HU~9azk0*kwW}<rDq7{7a3_{p<BdZvffw5;wNn#KUf#Y_>p};&
z9q7=}3An%g(>IV8>&c5BxjjHB%SkJF#S8LQ{euE7HTuI9St?Bd*?mVkhK?cqsXIv_
z4G2E>^sa7*&~t#}NLy{|c6mhu^mCVHLC45Q#o~nv7U`s%E$VsMbF*}n3x%wCOBU)$
zpyK;Q-{&mVUBC7suUz}~S?IuP`lYiM&6=rEj+%9s{C1m6E9UZ^lA~qvj}`6J8@C<V
zaz*>`F%@a2Y4bC(r|YwY?UVekx@f7;vIX3-2v=!sAmAQ9k-lUOSwZWPI#lC6EOx>;
zJ?Zwfox0cPo3DSp_Wa?!Qv*X+>Z$d#A+)xOR{5zyc*v1PPs#dc@(K@-#60|}@ACO;
z)YFP6vi@t-vx+E%a!l*T7212&8$rm+Nja5siKx0IZEvl9tWZ6zv|B8YCFC&(Xz3(!
zjbALGdzI;f6=VthnTK~XYiK#|s{lbkDsA;;0=GvxESE|u9;*ilbimjAxe0UPveFx6
z3*Y6=+CFD1g=?6G)XsNJ;Jt0cwK9yq2OOd|Q5TT7)7+^-si;t15l4=zUk|?4zC++Z
z{}H-t!~D*6(>i;3wROJj_2kLf^H&P=9=Fa!UeP`(x%!K~axImq2M3?HaCzV9tGAC1
z^*^c~8#>ZwpjP5YocerTNZ-I{|3Skd_ulKT-?!&XagkO@CsU6bUu>>f6Wzo958)Be
z$BLiSInz^?rfOABqavmzOwfmgOdd!rG^$(FZ53S2ch$6*Iwm7YH+fp-tV!DRNy`?`
z)K3}6&tAE0=2q?DytM~6>NoCRfBAQf>M7|mh4d!vG_RKxZrY(+yE1p_TJ6eJ-_7|R
zE>KC6f{g{oz*--b#;Y=<RB3>EB>dnlR2!YTW<!)-6}T!fdP|UY$cXSEar(XS{K3sz
z_a4{o-Zm+7r(Pu`p4c||u=Y~kk-}~I7}{Jts=8>>x^?5sMPs&%&<+hW7mb6WTlSs!
zR`fx2(aVRAoZZIYXn&S8Kg*qxg5^?kDMuZ=emGU|^!orZRp?Kf^VBndv=GL&I+9U9
zta!5OES)VBk>)(<d6u>nlo1Qhap%s<rN!^m*A<mI;>#~oNIEivhtP1E#t&6UL9|4D
zu5zrO!kk$eeqMfF`lRj;+2~My9uxuxLc>WKe?hUJvMyvE4VhC%->GPNmpd!P$fXVB
zlbQxe&G<fWIat|@1XbGdw*^uMZgYXn+A?R_ti<o8Hu_GOw{rG|SsQ2*vb`bPUH|y~
z`kW0*)-+lqESkJ5b!nz02!i49%m!FP7lELx2Of*R13tDJJ~jW2bn5*(yhD1b+P}j_
zdU`>ib1K?`$ew0@b>v^JQp4(N&8u#$E!<`N{($9TVa4dZ9oG7jCY7>=P-EsgDSib>
zTDM~bT;{BhmgNwe90f#1uOJx^X;~Ag&9O3KlSpRQm&(;=Rp<tL-iYC6HND{{EGywB
zBInU-_;G<P*P3(WI&fV%FK#Fo$7OL#;8o;Ku8_OJ-Qpf_kKncCXIWdBo6K7lElY+U
zSa`~l<dfvn<%i^@^4~4`SPZc6wHRp;Y7t|x$YPVl5sO!R8{UKW;sf|md_14SALI-8
zXZ%n6C&5YZ5dwr@Ay!x-tQIy2yM;pGs&H4RP{<UbqP{|-&?`D9x+r=mycOdVQ{f@y
zcEvSCiQ;EPrDYvUjb(F7H_L98y)FA$Mq7Soxz#eyvcU4H<!#G*mX9r8Sbnjrva+zk
zR&}k^R*kHhSaq=KV%6O$z-p9LnALcz1gjLQEUO=^)>v({+F^CT>X_A8tE*NwtctB3
zSiQ9(7-J=Fh@0USAcg9HJ+K$-e8X@Qj>GAA25jU%;8l1V-h~h2llUyKo7dstW+{FS
zPepzckyu-_7B!-+*g|v`-NY_pcd@tVBl?Sh;%G5cj1l9-Br#2#E@q40i|fTL;$HEn
zSRh^$uZy?E67iu}Dn5suym}vZ#BH%&l-g&i<AJY%v!ff0h4%rGq%E-3v3ipQb+d&x
z6HY0ZxP1bVkW-ChNH4<ci5b1IgH0?z4Ub&paP8eR66-_|76z+#DTs0ayvgWHZSB}a
zXw#oTiqQJitzFko>AcSH!O>v}{@RXR3rj(4dG$ic%U4H-bXlkqNnKK@-n@JF_FLKq
z`vQaX>2NP$N3BAr(&_$)7sY2cUOoi(sA5+@nwY#Gd112dk&v}Hd)saenX7m*^gcCs
z_evQxLPrYe5OthFG{QTk00r$xM9M$Lu&wf>qfQENsO+m~H<k+Q71&rJywFK~72-_B
za03hez!sQoF=|KLzBbSsb!#l{+p%MxCpcTS?%N%^DOQY)O&%AuC2^m~8Ow=OE^moN
zX);{axzH?O7^W8#)cTSCPj@fvJ+)B>(9YPrZTdFt#jORWm+40e$+IV?Cu-BCe!nbT
zFLH3uf%B25rf^xqHx=09Ot@|nIWwy&x5FYm2e<U?1&7K2*x!kfUEepPMqXs+#%55k
zGz4G7@H7DUd?zeAV0gX)URNwK?j4xu(~QSvEOr1EffY3ve<ckws;`^j)YFh!m{j*9
zO*U4&N++IhlHc&PfqEKN-J6P4MeG*(-cY<RZbwv9TwIj6z=l`|w@ELan1nm!a1aqh
zI+N@xBK6tf+nOwZqqpicF-Q|mU^q&D@WE<YAD)%k!S%e7u9gO-ZB09w{`usEv(|fx
zh;5N-47m)KGr&Nc&NxXe$BvqkFkZKJ4FBV%UCVcCk8Vnxpr0{K(Vf=*uBBdedgz&i
zvnTehJg`o;Fq>D68LJ>#iws5Bgap6X_+{Hpm(D*AERPi|cen0xmtGuuPa3>E@f-xP
zchs~+Z<1Xg^gP}ho^-U<5T{a7o2W_S+d!BN7U*b)-W2s5sT)S--JvZPDQ;Z20mtlS
z8sZ5=-5xlk9<)A)Cx=n}wWhZQ>Xd47rHICW#EjJD5AWTvuR!zI`(Ve8gF-!L>&oWv
z`xb58ctE>vds=jCQgV8x9`@Dtya?Cvx5|rvpqAm`H6sDn{?pPovx|QcWKzA7wCveI
z30#XS=;5zfY!qI>DBNJ9@M<Vl`=1Oxd+x-MbJ@DW1*4AmX#++E`{{|B&G`7_*x2|@
zyLNBev}@P4<Z(LXD;p`nR9Oe4tS?RUCCCH5nkq*FQJpL&?r=+|fg8YcG5tY+=;}PG
zrSr|C2O0W<GfQR!XhKJ1j2<4db$h(d%a0#$;zGJn`}4cJ&o6y;c&^unecx%>dCi{v
z>+_E7Oq-Ca6Wif?<?Qry1)eg9aJGgc<RC1<>mhkREV7e~8x~J4-*ND`=APGqE?zzf
z1JiY->HPNPTh{E-9@v^XK5)#OG5Sm(jhQ5m$;Y_eOe`kfLh^cHWlmD+f^;p#V+T=d
zebeTi@I)!tED3^J?#I<apsB*NP21+|(3)o&dtZ^?(<H^iEL5l-55o%O?nml=C!fc@
z(vrsPjbRf#Sw=q^h?nN*u4}&+o=A$^q%+>(uMg|7rmL2A?L!qE^&ph~_<_1>JUzn(
z`VQH2CPpVNPfT19ryVkG_;9#H7!ci~#h|c_XYc>E`l(K&GT)KieFJyD)REmTB71Pr
z*FjYOF0iXt-dX73;8_lHSIHg%z-w;V`I9B*Pmgoe(cLC;K|!oL7drK1j{tP@*cy?w
zRr`MDxhK2yBo$urw1&m0Qh>Ymrjh^`_2L=~XSRGei%o{Jm`Ikx>&`-f<Vvl1Y9+w)
zq-!()cvkiTC%3XSFSfynu&n>MboGy$wHr51pS3|R!ULIsX_wN;=u6!8Vlt53QB;Jh
zTMY1VcD^>`mtU@3eD!L;r51W0i;KIX{Qbv84;eCUZ(-r?eHVd~ikc7_lCoj<3|+@`
zzR!j$@%Ob)?jC(~Cidvir67S7zlS3nkT{%Y-@<wJu|MuSt=Q)h=~6^$6^ns;i{h_o
zNsFHe2T}>!HlL}zSO3_c@%nk>R~NV({MtPUe*!6HuQDkhU4$3M@J5pYZeuBIK{QgN
z`^YGGT}iU#WDnV|rrGZBz(kpbGs5^uus(vE1{S;}SR`&w-)zs-ce>0E2^kdCNlQIi
z!p7B#boc~LyX!^q!`XE?yx)Ua-IVQKuwxO}a$-Tc?M5O+^UF5#x-U+_Mw`N;M+*y&
zj`jB+%k0rY*a~*yK5%FB7B7ItoLH@HV%aocdsL65Lu~mMRByfJDNaXwZy%tgE!t9!
z8pPa8e*g0GO9M4Ak+YH~Brf?O37QPgQpb1aM`cco_0?u(EM7Vhc2iF{7dL?~xZ7aw
zXMR{}Xb9;{JChJFoxy+$q0aEc5nM1KfTw$8##(%rob$kwcJG_LPka96raPxbZ5)%W
zj~7JsmBSR1Uc`#@8gv-ms>i}GwR+g)-Mfbm-@WVduvM!rU0UhHqUDE+)~%U0d#z41
zNd|(92EsvEc;|Khex`#%x6E#E%o3C!;7(_kP$HSK6pPc=W6{KwluI5T<s~*`k^s*<
zwD7djn>6T2lIa;eoiB2Gr6%&dHc}HKJs^-xAS!=UDR`2V3i>0x37gn1X^VW9jkLv7
z=^y}$zL_^wE_0Ezipmz1n|at=D#GDKfFqEqV-{ADJasXMqJ^zkgjWshUPD(b!VN;a
ziy+ROg~h&b+x$cj*%iZVlUUjN00x25cXIOVH1^q5IRGB?kB0~SLNXTD;R`T?bsv$s
zVx~#DY=WtKs~jG<wG#UlU~#}TJ~}QsbA;B>r}*W|QxD&r+M5{-@9*IjxZHg@zUKh7
z*a>9f3EI<z_M$ph>ZYf)1tpW5EM%~i1#W@r8^Q%~L%H}6my7Ufs7#dJ7IDesu$-)|
za8%R7-sCWQghj41;XO$1uZtjH+6+6oC;UJMM!pEMcUxSENnVnTMUcsWm_?-ZTjh;@
zS`4UZLOsDW5s%%)Vwx16E;{%?7b@CFmFg1TR(l<_G@d$8SDGlQ_v0&}>?WNT<x+y=
zs6IW)dsAO6ZP}t3wHMW+%}X}f`SCIUIw+K2=#mxfB_?1_{A7OPDOw*hkr`!T`DHA2
zhWC7bq(8)x2Rud<*_AQ7Lq3Vc?NFMu6^Qq7!o941+Nc**uNmy>wIB{ZJHuZio;n;h
zVnk@@2q5=t?gfD-j!Q*$zdRzXVraTp5vUg7eJ32A;C&}i!Voz)_=u*vcTJ|A#V&vt
zxbjelT#>X>F2ZZgogblu1F#_V1(A%HPpoatZ$;;)i}F`Cq7krF`4Em^8h9lN#47?J
zO@T*MQ{ZCXB&GwS+0gnd@IP{sI2`X}IJ7T=8wODtP?6!Yix)v!XDt@vF6JM-i0oFH
z6NPOgm>1!}pGaz1ixdmQ5^hw1!=v}!VA1+K7SpY_Gjtwi>k@59vSFPdPGWFwn#j)s
zDC^EDpGE4bUW;@9-Ng?D#)su|E~>~X;>4EhCBzA-wOmZZjN=4|+2Grl#12CSw`(`#
z@-y+-#mg^VTpZj%1QNeqF4ByXrTfHU;$19Cq0kuZ1+%-gAkI&>7CHFEIA>$F-ZBMR
zDr<upfz`<U;YY=HkQ1bJ1nUg8A$JQkldVQQ&EYPn8Mxlu9MHDV2HAr32kTg4S(w>o
zU|WNAVt#XesEgI{%|iRmasz53D?pqq4UGiXNoE4AL}B3Xibl$@IXn`|j^v&rD_IuA
zD<D1_`O6!F+a1z}*0`)p8`KoaiBQjASz6T>c_GxBRrQA~yy`RLGeAB47|h@r0EQto
z{qG2MwuLr(LmSL(3-z?*20__se{cAOv>W<R^$_wg{{X;GZ^+YI=38Bk<>Qi|d_HQ-
zB~?|iG^ksY5wHp*Fh6$_a4-mTLX-jwgHRJ_KN#TfhP?flMcb-^WNoS_*iR7d3RVs2
z;ZQyh$~$qLksH_!5YI8oU<a4sxRtq{K-3Q6yur`<6ZowhXpxGrFrfO7W`I82sp(5G
z_-}!I4fYYlbprP;xYl5K@ZSKp5xB)n3zhs_mBbB&F;yTH!@2w(>cq`NO#lxqAm0GU
z_Z4u_O1>VoFyk=>Y0YB{c!2V@Fs5>OPoy`;vGM8&;{<eI#>EoUj+KG923!o#o&hyB
z=VQ2K^cI5}n&TLa{Ihj}@+1Fh89q3hs#jot0&Dt4D`wak{52ME*VIfaj9$K3Mk_V+
z0{w0KPu5H)KqFB8PYZZpG{W!-c&xeuY1Q<>`tcXbXvCbx(rYY?4V#N*8i6=YcHKOe
zddon!0E8QGZ&71;GT^Z#%%=jRk+p_6Mms%_t-KcK?n*#)WG*m|K)(psc3|5>nj7Rn
z9L!aK=QXRdn#O>3U@Y1A0dBPn=M2ZPc}Qo@%Ym{23>q{}BU$gh1O1UQHY6n;v}sr{
zB?h4Lf(J(iApvv_{40(FeFr?~OtC^ZBqTNkbv1wcMka-Xp~2>_e{4)t2nsTPgA<a%
z;}QI*9KP@){zTCIVE$&9>jt3z;xe5qET;O)v?{Q+*q62b?aQFz00IFtwb+0*7JKNe
z8^k~?XI-72Yg|*JT2mPZx<}0EpaY@WeF%9iAa5=B#qA<<O%0*nZBTpA&@vIqGW{?0
z%)YQceU)aP0Hs(eb6Fa5S<2s`S!2$n0__$ow;FU@u-w(*u$pjXO}G-ma=>t1&@!{B
zCO>moKIXD?4h4g?1k4BkvkBb(=qr2&fgK3;5BRATi{s%3${hDC+z)bR{w0P3T{El}
zxmlaVR`AOKa%<2g0hy2&SQ*SzP#_1`t=4{19TGqz&R@eEV4mR-1HMB4MmyDbXSBn{
zkkJnOnM15Ci}4Xj@knF-8j@osMj(6hmubCY^_jmGZU|X0JsNDht82la2ZXa|ZLUp#
zF>eeya<b5B&?f@DsagXVxl(l*U9EbFu7P_UY!TR7ReR8FaPNTo5Zp&#pFp0cRYd@Q
ze`w(fgsMxugi<e|)JrJ!5=y;<QZEtcTtRoC)e>-xRrjHmmk_#I^#pP~fzT7E>sNsB
zA++!mYUe<I%Nit;FJX|%FGDZtfR+wawYlnj)g7>}!5*nP0=50${aIJN|Gz89N>yE{
z3abkH@5@(hW)Pe6KdQ>9%K7h0{QDfx+d)->{(bs?N&&1fy#32u`KR1}#mHa%|CINi
z;#mK_^%2^G{(g%wyVD@dV%Jp1|5FXsasS(K{RS)0#k8tvtd1(^U$upidIbJQkOoxq
zAKJXa^8fGufDX4-F}*dY>UOndU)EAJw*OO&|I>c{pO8Vh)T&f-n`Vrgu?kcMZ5{#t
zX6Wtza$fv3KfuoRlj=VXRy|A5i^H^TbpriU9BA&cgw?$T=;neQ^UoA7(67ZbYXyPs
zAEtX~4`|ET2O5Yjz;5vzGy=(BZL|cVgpw^F)E0~!YH)$s-42WZHFbb}&>f5wwAB&x
zhjju|8&*=bmimF=p@rd4M<5ssEd{|^wE&FV+)8b8JGG#0M{`R|vrlcPMF~a)YeyZ(
ztp(E%R=mc*quGMN=2kg#t8#Ozyt!2ctlT|eCGQQUHfR;=19kKTQ^yRA6>y#XV29}s
zMguGS5a`=bFj~+u<_l{(gH;XM#{6M*4FJ;^w2ln}y=M%1nHhQuGxUO4cb64t2+IaY
zmVl`b`nhtT&SjwUs~+fK`T=mU3$TdIJyd}1p(4n0159nRUa~r{s+K_h2cU<k9_U(n
z0xdF~WDU%?5MXaJK@DHQSOE?}B`a79=!*=rm4L3FxcI;AH%b@<_Q!TEOTZRa^-bR>
zi(|&Tr!-guZhe*!^ux||p4nigVAXnVzqzC~r;z2&Y>*652{Mjz5uL3B-a#psX?Wxu
zB47uBv*2dB%Q%Z%Kj)#&ZT=F|c%yE5V_+AU@qukH88%g>>5gd*?8=OD)4x<^Q9s0A
z@cPZPqjufW@vjxGorXS6ZlTVdsfu!*DeK}qliMPzn|R`7le)%M?T>W4I!S*0#2M$>
ze?rO00G_dC@Z<p&f=U+P=hDDgEkFRPl%Ufy#xEu+z7120<LKh<+<_&CD#u=+7AD!y
z&M+i36m;Vlh9rR!r=(0nFHouj`fkF^`jiYkQbDr~=&{Lk)-|Z@;pXh(>H+#d;V-B`
zZP$*@9U-D!2agUOLI2+aFk{1C`wV()<ueu{=Na>4GiIPGqeiU%Rh!M#KU}xWqWhy4
z!}pEr(|z&mTH@_?Mq|C3?`47d=A`xZ-u%wDa(%|M^~;X0Mmw8LDcL<|V_2U{NiD8_
z8h9~v!X1xae0qLJEyGJLE;1yntRwAiHa4-9+vY2Ce>$+*aLsSaoS!^TPg(tkU7vQ3
z)70<kY@852Fv4+0bf0Z9Igry|!Gj@@16(HuT07iqV~>35tDbD7mAKyQ1;4dy9JSPG
z@{tQ)%09gQA-~Du*f!gTUQd3oxxnwk;1c_SG;a8erDK|YynUeRr&~<}i((qQ=-qg2
zquw6#Mm=7O>I_>bTlH?^l0E}po~*ms^Mk8g`SFJI`pVD+uR=Gx+E6g%Xwup%Zk@(&
z7`(kIymq+rO!-8hq0n5pjFZXgc5HtCixjeN{ih{A+2@r6-TN!VJP?uJ|B#3roLey>
zlB;aLQJ29#CJuDgri8>LGR;tapqUo5K_we{^<aeK?C$L5(&10SaREhOF73Y&&Zz%k
zqwSqts~dIr?;2&~4tk5)8oXSc{}a`m&->L^ou4%~xRp)+kxm10#($UdTL=HZ4sUL|
zjR_s(JGA|T!by=$=3Rc$`usTj+1<D@CFk?fz5DahmVeyQKdg_J<9KoD-~kQ`-Us%d
ze^>ER(?*)PGtgMn^S8DIsig~dU0T#+b?iXPA9SUUeu;XPROnr}KDf)X=cjEpg=NIl
zpR}i~nQAu8IPW~;taE$864n!*SHRh$rL(=W-M6qaH@9JpM%sk1<V43bn9s@3L8h+O
zxfWogiHhT@EM%ZKwH*uTE!sG@c5az#pKCYQwx(cMQtaQ#Ii(~gw+#z%gm`BgR;W3v
zqLwrM)~MXlS;^w-uy_l(Oek>Hv2Z;LSXefzoa?#N0opN>fZ*@f!=<h3|3OOfnH-0P
zTo`cKZhG0v+IEGdngc(|e%v~<ZLL}A8SZ$dvd#XW1|fM5_&>59eay)@G)&WdYx&aC
z9X<A^x}|hl>GRV4#Hx8$f9Tm{|M5$?3x_}baxdJXXNSSu?RFa*TpqNu#id`L%^fJ~
zIA~VJ#Y(@Y<xhq0o@`#eeoU>E&$paDGjq<l;AdrfT0Xe6WkC4DOWKjAc6(Uf>uCF9
zyZKJptIP8hO}q8(VWr56Xl$3?uekU0@*i(rksYpo)Blpqrs<<9GP{mWnv&IEeVbkz
zuln7X;`zCCr(-_fqb+fG*64~cexDj18eS*y9Q}RI54p+)rRQy?2Vbe<5I@)AWBI3y
z7Pt8e@7s?YbKKkY*LE=b{-5fuJsirkjhjP^GYtxZY0xO)d5st$hq3EWk)d?Xgs{UT
zBIGnvIi%JKS%-DV)F!(Qh0URqbQRy~K<yVo#aB`Zn~JvD=N&T+wO`+Neb?6?JJ&UT
zyw5Z5JI_4#{rla&`=0B%pJw<r5TehaQ8lyg2=i;k>+T>&S%m-5mH}?cEF^5QMU(*%
z-C_b!#uK*KgV_<8!3y?8l)!v+Sb`{R9~QEM#R(4x4D=P*Ly9Qw;m_K;#~0B6>gdO$
ziAqxgbBP_%0vc2HQxQ(101g%5R|s1gM5@UQY|%@a2)18@D|i^n>|H@go`;bagCS4~
zi+WT^>lyy9ZRB#PnB<=l!$zuHM*A+wH~O*87yFR9>L*%hr3XOrhS<a1>>ks6`Nmt%
zBF6TfjNN6~m|iYh=l?P=qxC$~pw!W7yyni<?dsTqNh7u<|8;TBNwsU(2XU*J{c>K<
zY)G-Svc1+<tNIepZ;$#0F~ntaiKiUM*O5?JPlL7y6I$l{?D@65{zj)C^*0?ly!3L)
zqQsr&_iymr71n5ZdU4{`Rt06tf&)Vym!vq&@2@!b)JiC3QKGw7Qg3NSJS#w2MjugB
zyPMBCFmlwk7ixYtux)%edNihV2PSoVjdbr#%KB58ZDmQ}Wy5u{zYnbGEPU%<Sf*rg
zHt|xukTJRe_wN757^v?|F$MvMLv&*?V!#$1)55QS;oP*)q|i74{5#&5@|D@H!mt&v
z2<oXCx}T#Ej5y>p0fj)%<g0=OBLBt_Wgvw>N241c2Fq!)?GIxT8bzJi6GI!C>`6#+
zWVZgXM&3`D-$<+5Dh_Sn^bwX6Z@bo-PJE1K%D!-*8i~;>23pcxa&A+0D8IHgTjUyy
z#E+)X6VDC~W{JJOvF@0QPJ0Q}C93QfmhJCLuRm_-+}2aCe{f~>57nIyJU?8hx)M8n
zLnePD>%D%51yfy}PJM0d40!lP_|_BR*fy<blX*nn4JY57bdA+vO&_iJ%PS!?qM86R
z#B>Il=;d+|G`Ur?h~#r(P)GvOM3tG48WI+|hwS1Dn`4Hs5er}rZ3aoi*uysjHlv3f
z1!0FoGHVYR^^j0u`}El%$tWb4g|>PGCa_ohGW2E~QFr?3BF)KweJ06hm`23{Y<+Kn
z3Wfg!{tFGm4Y4owKfQ0}`WB}^zd&d|9P`8E(KuC^Cibu$^Kfqm$&si#bjdqv!p(QM
z<Fv*2NJgIi+p(Rub-G@U7jRU~O&e|&hZ8g@RGmP28uj4;r!w_JMelTZ%M`%i?oz$M
zz0Pi<&)VLMc--D~u|G&Ewezme5$`hwF4R{C<=zMNFUfv*&>`9&A#Tt!^=H2(nsFMD
z{6~qlQch6QfmPxD_&d9oZCx~(B)j;XmO+~SW6ZiWV?oRHczvDhEj7P&p60&W-nPHa
z`-hv9KT0g@0?vH9qPn3fUw&Kj&@x_%-aB`~v7TxS`PRgVg^w=|y9Jv)sF~-;blgQB
zx;z-T&;EcA{5(t{+^IZ45cn9#_9(!}cq@R~P1-BL5tH!dD~!Yf9I6OJu^o$1A$`tz
z070Lkg@?BQC?X0e2?Aq7TYn-Wg1uQZ0sPTe0^zR$ltkYGHG@#l;Ba%b1SA4QamlI0
z*+I1f<ptEvsGx-Mf&$2VO+Z4_z(P0xeMeE?GBk#WAWUe2z@;IFSHUY0#@z<rzPGaS
zF^%@Wu{q*YU+on$z>P;ArHzjSdyBmJtS=5n-e+?&A%&H#Sa8mH-?~Ykb<b@0&z)?)
z%g#$~C^yt-jnJMTsmjMa^=~llOrrPRv+hW)vaaME8|81Rdv3V6qc<AEf%!6D{HUU%
zq|F3rVWgk7&i(p357w5ckIVJkH{`a(7Y8z3)56vrs-ujx57~w#8F{aZ(e&7qxv{m=
zgnM!OwpUTrfHzMKQW#c9Vf(^Wvhw=BwJbj3=BTrU#{QVX{-z9q5~C@Czz)EI7tB#1
zEgB<WnizZL5+f9{sFx9lQVdpL0Q?_<6Tm_gfjl}WK_s}dIAmwo?-kJoi_jq{CAGPo
zW@n$xfvg0U=!c|<%k8H+>XM!8$s)otAg>AV4%vk^u_e2Uy6LWmUkbaWq9<;I8zUs3
zCb(aT=){3bnQCY(ItE0v1l;GA@Y!VN^z#({%gpsAV{IE!W5Ax5l9dPZe2jPhGk7$u
z`OORMt$gDGwY-WIj0=o*U3;c|w#I;0ko}I1X0MD~EeRPfc5iu--H#+K>B9;e9N&eh
zORV)_eP7t8Q<hQN@@#nQSVmB8zRg9Q{q>~vHcM95Hox>=`m|d5W?RIB`*HU3dxLkT
zqzexd2ia>MEPg<Y5(QbyoJ2z+9@wB$T6lAqG%hcs6(R{nLN&s0XV74x0Za@&A)@Ii
z0UP~)Xz(v24Gx5fSPc?a0Py=S(==<*T>zUv`{dWK0$6jiv*}-BfKI_PO@J1<C))Uh
zKqdaKN$+Du#Vf$XZl*$|ju)ss`2Wv`kDx9{)G7^&y<!3${1o->I<K~}JrL*6-W6fg
zZ)%CTr*c)5U7vJ@f84e9l}AnqqSWYc#C7wLN~dqi?mtnrdw~lbve<hx>eWflfW8mq
zXD>$5=IQUwAC19ZbA6cn&4N7FGt`~5_6&aNw;F~ke>C&i-mN+C#(bXD9}<yQK4?bU
zVN=RB_jzS!rpG;}Z#j0G=N*<RwSHTYwqC{}#~^AIlb$G6b}%Qa<!VV+)a3Z}-ji!r
z99QFwxL-aOHXQD%Kbbq~Y4+>ga0d`lq2GqjJi#f+=wMt%5}i^5?i~%TAx&09e%Mi7
zS!P+U8KjfRZnWlruj>>rc1jxO@^@~*T-C_W?w3V)xFax8OU7a_fZGE8p6rKJ_=MGG
z>Xn7u?_q3~6qYRYFo*;WYHL{W1gg_@L`fVXGs|c2fHdn$8j*w5h8d4i29#M>GH6y>
zq!2GR=QJHM(4KiX9)SUSU;&Yud;Cd8)|mok-~c~28oYFw?T|3x!*k>HJa#o)N())D
zalF~J-I)DmV|Q#<erZp5PUtT|n`@{iR*<w$$%tLdeNCv$O=ondS%v;S%B*Rjx)1*=
zCC8mtbGxZP<}1Ikpxl2jCC-iPUBh@#ZnTtJnR%GW$bQx3c=H~6vjuO}D#>f9o%!QQ
zwVq$6DRX*CK}))3t@ac0wdx`sCKj?()Xd_=5gvvOhx||v@%timvcIU#$%qrC3ei}o
zA__M`NhB&vLsLmlUr1n}rKV@*A@XS019W3EW5k4JjBJAJF+Gb%=HnGO@z}>*Ls{b3
z%QkYwUU7P#T40MaHE<_^ZqF;xdZ@dkV@zIOi`yz`u2uAiS4&n4_T5i0TIj9VQx{p@
ze#*qCsl0lm*TA{{lH1i9qS(lQm809$gV7HI6p4}j73+^HSCZ#5uisj%JOAdgd!d>u
r8)Ww=6Dry^A2)0`ufTCFh~JWKz0&mO-t1K&<`l#Ic<s_6F|j`ZNrDUl

literal 0
HcmV?d00001


From 843a1133ef9253d37ddc3468d976876eff51b636 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 17 Dec 2013 13:48:08 +1100
Subject: [PATCH 025/100] Moving to use custom serializers for ze JSON API

---
 Gemfile                                     | 1 +
 Gemfile.lock                                | 3 +++
 app/controllers/shop_controller.rb          | 2 +-
 app/serializers/spree/product_serializer.rb | 7 +++++++
 app/serializers/spree/variant_serializer.rb | 7 +++++++
 app/views/shop/_products.html.haml          | 6 +++---
 config/initializers/serializers.rb          | 1 +
 7 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 app/serializers/spree/product_serializer.rb
 create mode 100644 app/serializers/spree/variant_serializer.rb
 create mode 100644 config/initializers/serializers.rb

diff --git a/Gemfile b/Gemfile
index ddeaf0a5ac..48de74b804 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,6 +34,7 @@ gem 'geocoder'
 gem 'gmaps4rails'
 gem 'spinjs-rails'
 gem 'rack-ssl', :require => 'rack/ssl'
+gem "active_model_serializers"
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index c38dcc9ee2..14a1e70a14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -138,6 +138,8 @@ GEM
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
     active_link_to (1.0.0)
+    active_model_serializers (0.8.1)
+      activemodel (>= 3.0)
     active_utils (2.0.1)
       activesupport (>= 2.3.11)
       i18n
@@ -501,6 +503,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_model_serializers
   andand
   awesome_print
   aws-sdk
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 880e66e8e0..74fd17b26a 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -9,7 +9,7 @@ class ShopController < BaseController
   
   def products
     if products = current_order_cycle.andand.products_distributed_by(@distributor)
-      render json: products.to_json 
+      render json: products, root: false 
     else
       render json: "", status: 404 
     end
diff --git a/app/serializers/spree/product_serializer.rb b/app/serializers/spree/product_serializer.rb
new file mode 100644
index 0000000000..87cb4e2750
--- /dev/null
+++ b/app/serializers/spree/product_serializer.rb
@@ -0,0 +1,7 @@
+module Spree
+  class ProductSerializer < ActiveModel::Serializer
+    attributes :id, :name, :description
+
+    has_one :master
+  end
+end
diff --git a/app/serializers/spree/variant_serializer.rb b/app/serializers/spree/variant_serializer.rb
new file mode 100644
index 0000000000..cc7e3f4da4
--- /dev/null
+++ b/app/serializers/spree/variant_serializer.rb
@@ -0,0 +1,7 @@
+module Spree
+  class VariantSerializer < ActiveModel::Serializer
+    attributes :id, :is_master, :count_on_hand
+    has_many :images
+  end
+end
+
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index d37ae6d4b4..3bab49c5f5 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -8,9 +8,9 @@
       %th Bulk
       %th Price
     %tr.product{"ng-repeat" => "product in data.products "}
-      %td {{ product.product.name }}
-      %td {{ product.product.description }}
-      %td {{ product.master.options_text }}
+      %td {{ product.name }}
+      %td {{ product.description }}
+      %td {{ product.master.id }}
       %td Quantity thing
       %td.group_buy{"ng-class" => "{enabled: product.group_buy}"} 
         Not available
diff --git a/config/initializers/serializers.rb b/config/initializers/serializers.rb
new file mode 100644
index 0000000000..532184bec2
--- /dev/null
+++ b/config/initializers/serializers.rb
@@ -0,0 +1 @@
+ActiveModel::Serializer.root = false

From ece46811f9dcd7551d6d4d737c63bdc3335dbe66 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 17 Dec 2013 14:04:36 +1100
Subject: [PATCH 026/100] Adding serializers also

---
 app/serializers/spree/image_serializer.rb   | 6 ++++++
 app/serializers/spree/variant_serializer.rb | 2 +-
 app/views/shop/_products.html.haml          | 8 +++++---
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 app/serializers/spree/image_serializer.rb

diff --git a/app/serializers/spree/image_serializer.rb b/app/serializers/spree/image_serializer.rb
new file mode 100644
index 0000000000..0cf3ee8295
--- /dev/null
+++ b/app/serializers/spree/image_serializer.rb
@@ -0,0 +1,6 @@
+module Spree
+
+  class ImageSerializer < ActiveModel::Serializer
+    attributes :id, :mini_url, :alt
+  end
+end
diff --git a/app/serializers/spree/variant_serializer.rb b/app/serializers/spree/variant_serializer.rb
index cc7e3f4da4..37193a264c 100644
--- a/app/serializers/spree/variant_serializer.rb
+++ b/app/serializers/spree/variant_serializer.rb
@@ -1,6 +1,6 @@
 module Spree
   class VariantSerializer < ActiveModel::Serializer
-    attributes :id, :is_master, :count_on_hand
+    attributes :id, :is_master, :count_on_hand, :options_text
     has_many :images
   end
 end
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 3bab49c5f5..4770555f98 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -1,14 +1,17 @@
 %products{"ng-controller" => "ProductsCtrl"}
   %table
     %thead
-      %th Item
+      %th{colspan: 2} Item
       %th Description
       %th Variant
       %th QTY
       %th Bulk
       %th Price
     %tr.product{"ng-repeat" => "product in data.products "}
-      %td {{ product.name }}
+      %td
+        %img{src: "{{ product.master.images[0].mini_url }}", alt: "{{product.master.images[0].alt}}"}
+      %td
+        {{ product.name }}
       %td {{ product.description }}
       %td {{ product.master.id }}
       %td Quantity thing
@@ -18,5 +21,4 @@
         %small from
         $ {{ product.price }}
 
-
   %pre {{ data.products | json }}

From 67fcf0f5348fe7304b91da453aa5f78e9ab5db60 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 17 Dec 2013 15:26:49 +1100
Subject: [PATCH 027/100] Fixing up the feature specs

---
 app/views/shop/_order_cycles.html.haml  | 6 +++---
 app/views/shop/_products.html.haml      | 1 -
 app/views/shop/show.html.haml           | 2 +-
 spec/features/consumer/shopping_spec.rb | 6 ++----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index cc50a90137..691e653cc0 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -11,12 +11,12 @@
   - else
     %form.custom
       %strong Ready for:
-      %select{"ng-model" => "order_cycle.order_cycle_id", 
+      %select#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
               "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id}",
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
 
       %closing
-        %img{src: "/icon/goes/here"}
+        -#%img{src: "/icon/goes/here"}
         Orders close
-        %strong= current_order_cycle.orders_close_at.strftime "%A %m"
+        %strong= current_order_cycle.andand.orders_close_at.andand.strftime "%A %m"
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 4770555f98..6d7a133c1f 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -9,7 +9,6 @@
       %th Price
     %tr.product{"ng-repeat" => "product in data.products "}
       %td
-        %img{src: "{{ product.master.images[0].mini_url }}", alt: "{{product.master.images[0].alt}}"}
       %td
         {{ product.name }}
       %td {{ product.description }}
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 33c02ccf58..7454bd9fdd 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,7 +1,7 @@
 %shop{"ng-app" => "Shop"}
   %navigation
     %distributor.details.row
-      %img{src: "/route/to/distributor/icon"}
+      -#%img{src: "/route/to/distributor/icon"}
       %h3
         = @distributor.name
       %location= @distributor.address.city
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 100029a6e7..226d57eb67 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -26,9 +26,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
         
         visit shop_path
         page.should have_selector "option[selected]", text: 'turtles'
-        
-        # Should see order cycle selected in dropdown
-        # (Should also render productspath
       end
 
       describe "with multiple order cycles" do
@@ -45,7 +42,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
           visit shop_path
           page.should have_selector "option", text: 'frogs'
           page.should have_selector "option", text: 'turtles'
-          page.should_not have_selector "option[selected]"
         end
 
         describe "with products in our order cycle" do
@@ -60,6 +56,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
           it "allows us to select an order cycle" do
             select "frogs", :from => "order_cycle_id"
             page.should have_selector "products"
+            sleep 5
             Spree::Order.last.order_cycle.should == oc1
           end
 
@@ -71,6 +68,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
             select "frogs", :from => "order_cycle_id"
             page.should have_content product.name 
           end
+
         end
 
       end

From 7ea9cf68620d46fc4fe4d3661db16cb960a1993a Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 17 Dec 2013 15:45:06 +1100
Subject: [PATCH 028/100] Adding price to serializer

---
 app/serializers/spree/product_serializer.rb |  2 +-
 app/views/shop/_products.html.haml          | 47 ++++++++++++---------
 spec/features/consumer/shopping_spec.rb     |  4 --
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app/serializers/spree/product_serializer.rb b/app/serializers/spree/product_serializer.rb
index 87cb4e2750..2dae29f94c 100644
--- a/app/serializers/spree/product_serializer.rb
+++ b/app/serializers/spree/product_serializer.rb
@@ -1,6 +1,6 @@
 module Spree
   class ProductSerializer < ActiveModel::Serializer
-    attributes :id, :name, :description
+    attributes :id, :name, :description, :price
 
     has_one :master
   end
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 6d7a133c1f..e0945bf26e 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -1,23 +1,30 @@
 %products{"ng-controller" => "ProductsCtrl"}
-  %table
-    %thead
-      %th{colspan: 2} Item
-      %th Description
-      %th Variant
-      %th QTY
-      %th Bulk
-      %th Price
-    %tr.product{"ng-repeat" => "product in data.products "}
-      %td
-      %td
-        {{ product.name }}
-      %td {{ product.description }}
-      %td {{ product.master.id }}
-      %td Quantity thing
-      %td.group_buy{"ng-class" => "{enabled: product.group_buy}"} 
-        Not available
-      %td.price
-        %small from
-        $ {{ product.price }}
+  %form.custom
+    %table
+      %thead
+        %th{colspan: 2} Item
+        %th Description
+        %th Variant
+        %th QTY
+        %th Bulk
+        %th Price
+      %tr.product{"ng-repeat" => "product in data.products "}
+        %td
+          {{ product.master.images[0].mini_url }} 
+          {{product.master.images[0].alt}}
+        %td
+          {{ product.name }}
+        %td {{ product.description }}
+        %td {{ product.master.options_text }}
+        %td 
+          %input{type: :number, id: "quantity_product_{{product.id}}"}
+        %td.group_buy
+          %span{"ng-show" => "{enabled: product.group_buy}"} 
+            Available
+          %span{"ng-hide" => "{enabled: product.group_buy}"} 
+            Not available
+        %td.price
+          %small from
+          $ {{ product.price }}
 
   %pre {{ data.products | json }}
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 226d57eb67..508856d761 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -49,7 +49,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
           before do
             exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
             exchange.variants << product.master
-
             visit shop_path
           end
           
@@ -68,9 +67,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
             select "frogs", :from => "order_cycle_id"
             page.should have_content product.name 
           end
-
         end
-
       end
 
       context "when no order cycles are available" do
@@ -89,7 +86,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
           page.should have_content "The next cycle opens in 10 days"
         end
       end
-
     end
   end
 end

From f146610a9342fe6ae8cfb37210934b2bb2c420db Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 17 Dec 2013 15:52:21 +1100
Subject: [PATCH 029/100] Fixing a recursion bug in Angular

---
 app/views/shop/_products.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index e0945bf26e..9ab9b9d2cc 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -17,11 +17,11 @@
         %td {{ product.description }}
         %td {{ product.master.options_text }}
         %td 
-          %input{type: :number, id: "quantity_product_{{product.id}}"}
+          %input{type: :number, value: 0, id: "quantity_product_{{product.id}}"}
         %td.group_buy
-          %span{"ng-show" => "{enabled: product.group_buy}"} 
+          %span{"ng-show" => "product.group_buy"} 
             Available
-          %span{"ng-hide" => "{enabled: product.group_buy}"} 
+          %span{"ng-hide" => "product.group_buy"} 
             Not available
         %td.price
           %small from

From 3ed8dc5a7da08a787f8eaf08006470b82d956f09 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 17 Dec 2013 15:56:36 +1100
Subject: [PATCH 030/100] Tiny typography change

---
 app/assets/stylesheets/darkswarm/typography.css.sass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass
index 7b4ba55d7c..46a430aef1 100644
--- a/app/assets/stylesheets/darkswarm/typography.css.sass
+++ b/app/assets/stylesheets/darkswarm/typography.css.sass
@@ -25,5 +25,7 @@ h1, h2, h3, h4, h5, h6
 // For clean overriden magic
 table tr th, table tr td
   color: #666
+table tr th,
+  font-weight: bold
 table thead tr th, table thead tr td, table tfoot tr th, table tfoot tr td 
-  color: #666
+  color: #444

From e23b33ab48c23defd77d0a8f4c76474286fc8839 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 11:35:25 +1100
Subject: [PATCH 031/100] Adding variants display

---
 app/serializers/spree/product_serializer.rb |  2 +-
 app/views/shop/_products.html.haml          | 50 +++++++++++++--------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/serializers/spree/product_serializer.rb b/app/serializers/spree/product_serializer.rb
index 2dae29f94c..f152c6915a 100644
--- a/app/serializers/spree/product_serializer.rb
+++ b/app/serializers/spree/product_serializer.rb
@@ -1,7 +1,7 @@
 module Spree
   class ProductSerializer < ActiveModel::Serializer
     attributes :id, :name, :description, :price
-
     has_one :master
+    has_many :variants
   end
 end
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 9ab9b9d2cc..130ed31130 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -8,23 +8,37 @@
         %th QTY
         %th Bulk
         %th Price
-      %tr.product{"ng-repeat" => "product in data.products "}
-        %td
-          {{ product.master.images[0].mini_url }} 
-          {{product.master.images[0].alt}}
-        %td
-          {{ product.name }}
-        %td {{ product.description }}
-        %td {{ product.master.options_text }}
-        %td 
-          %input{type: :number, value: 0, id: "quantity_product_{{product.id}}"}
-        %td.group_buy
-          %span{"ng-show" => "product.group_buy"} 
-            Available
-          %span{"ng-hide" => "product.group_buy"} 
-            Not available
-        %td.price
-          %small from
-          $ {{ product.price }}
+      %tbody{"ng-repeat" => "product in data.products "}
+        %tr.product
+          %td
+            {{ product.master.images[0].mini_url }} 
+            {{product.master.images[0].alt}}
+          %td
+            {{ product.name }}
+          %td {{ product.description }}
+          %td {{ product.master.options_text }}
+          %td 
+            %input{type: :number, value: 0, id: "quantity_variant_{{product.master.id}}"}
+          %td.group_buy
+            %span{"ng-show" => "product.group_buy"} 
+              Available
+            %span{"ng-hide" => "product.group_buy"} 
+              Not available
+          %td.price
+            %small from
+            $ {{ product.price }}
+        %tr{"ng-repeat" => "variant in product.variants"}
+          %td{colspan: 3}
+          %td {{variant.options_text}}
+          %td 
+            %input{type: :number, value: 0, id: "quantity_variant_{{variant.id}}"}
+          %td.group_buy
+            %span{"ng-show" => "product.group_buy"} 
+              Available
+            %span{"ng-hide" => "product.group_buy"} 
+              Not available
+          %td.price
+            %small from
+            $ {{ variant.price }}
 
   %pre {{ data.products | json }}

From a3dfe1b1478fb6ca2ee4c92f769f6126c37425b4 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 12:26:34 +1100
Subject: [PATCH 032/100] Working on the HTML structure, variants etc

---
 app/assets/stylesheets/darkswarm/shop.css.sass | 11 ++++++++---
 .../stylesheets/darkswarm/typography.css.sass  | 18 ++++++++++--------
 app/serializers/enterprise_serializer.rb       |  3 +++
 app/serializers/spree/product_serializer.rb    |  1 +
 app/views/shop/_order_cycles.html.haml         |  2 +-
 app/views/shop/_products.html.haml             | 15 +++++++++------
 spec/features/consumer/shopping_spec.rb        |  4 ++++
 7 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 app/serializers/enterprise_serializer.rb

diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 7637ff28c6..9b7485547d 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -38,7 +38,6 @@ shop
             width: 200px
             display: inline-block
             background: transparent
-            font-weight: bold
             border-color: #888
 
   products
@@ -46,14 +45,20 @@ shop
     padding-top: 36px
     table
       width: 100%
-      font-size: 1.2em
       border-collapse: collapse
       border: none
+      th
+        line-height: 50px
       td, th
         background: #fff
-        border: 1px solid #bbb
+        border: 1px solid #cccccc
         border-left: 0px
         border-right: 0px
+      td
+        padding: 20px 0px
+      input[type=number]
+        width: 60px
+        margin: 0px
       
 
 
diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass
index 46a430aef1..93e3813d93 100644
--- a/app/assets/stylesheets/darkswarm/typography.css.sass
+++ b/app/assets/stylesheets/darkswarm/typography.css.sass
@@ -14,18 +14,20 @@
   font-family: 'AvenirMed'
   src: url("/AvenirLTStd-Medium.otf") format("opentype")
         
-body 
-  font-family: "AvenirMed_IE", "AvenirMed"
+//body 
+  //font-family: "AvenirBla_IE", "AvenirBla"
 
 h1, h2, h3, h4, h5, h6
-  color: #666
-  font-family: "AvenirMed_IE", "AvenirMed"
+  color: #333333
+  font-family: "AvenirBla_IE", "AvenirBla"
+  padding: 0px
+
+td
+  font-family: "helvetica"
   
 // These selectors match the default Foundation selectors
 // For clean overriden magic
 table tr th, table tr td
-  color: #666
-table tr th,
-  font-weight: bold
+  color: #333333
 table thead tr th, table thead tr td, table tfoot tr th, table tfoot tr td 
-  color: #444
+  color: #333333
diff --git a/app/serializers/enterprise_serializer.rb b/app/serializers/enterprise_serializer.rb
new file mode 100644
index 0000000000..5b6be8ecbe
--- /dev/null
+++ b/app/serializers/enterprise_serializer.rb
@@ -0,0 +1,3 @@
+class EnterpriseSerializer < ActiveModel::Serializer
+  attributes :id, :name, :description
+end
diff --git a/app/serializers/spree/product_serializer.rb b/app/serializers/spree/product_serializer.rb
index f152c6915a..86bb92afcc 100644
--- a/app/serializers/spree/product_serializer.rb
+++ b/app/serializers/spree/product_serializer.rb
@@ -2,6 +2,7 @@ module Spree
   class ProductSerializer < ActiveModel::Serializer
     attributes :id, :name, :description, :price
     has_one :master
+    has_one :supplier
     has_many :variants
   end
 end
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 691e653cc0..993b57477e 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -12,7 +12,7 @@
     %form.custom
       %strong Ready for:
       %select#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
-              "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id}",
+              "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id || nil}",
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
 
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 130ed31130..9d73e4772c 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -1,9 +1,10 @@
 %products{"ng-controller" => "ProductsCtrl"}
   %form.custom
+    %input.button.right{type: :submit, value: "Check Out"}
     %table
       %thead
         %th{colspan: 2} Item
-        %th Description
+        %th Notes
         %th Variant
         %th QTY
         %th Bulk
@@ -11,10 +12,12 @@
       %tbody{"ng-repeat" => "product in data.products "}
         %tr.product
           %td
-            {{ product.master.images[0].mini_url }} 
-            {{product.master.images[0].alt}}
+            -#{{ product.master.images[0].mini_url }} 
+            -#{{product.master.images[0].alt}}
           %td
-            {{ product.name }}
+            %h5
+              {{ product.name }}
+            {{ product.supplier.name }}
           %td {{ product.description }}
           %td {{ product.master.options_text }}
           %td 
@@ -39,6 +42,6 @@
               Not available
           %td.price
             %small from
-            $ {{ variant.price }}
-
+            ${{ variant.price }}
+    %input.button.right{type: :submit, value: "Check Out"}
   %pre {{ data.products | json }}
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 508856d761..8e0541fca7 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -67,6 +67,10 @@ feature "As a consumer I want to shop with a distributor", js: true do
             select "frogs", :from => "order_cycle_id"
             page.should have_content product.name 
           end
+
+          it "shows variants when an order cycle has been selected" do
+            #create(:variant, :
+          end
         end
       end
 

From adbfdafff3854f69510abb7a70367f6c65586e5c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 13:13:58 +1100
Subject: [PATCH 033/100] Lots of styling improvements

---
 .../stylesheets/darkswarm/shop.css.sass       | 46 +++++++++++--------
 .../stylesheets/darkswarm/typography.css.sass |  5 +-
 app/views/shop/_order_cycles.html.haml        |  4 +-
 app/views/shop/_products.html.haml            |  6 +--
 app/views/shop/show.html.haml                 | 13 +++---
 5 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 9b7485547d..56ff0c1f57 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -3,42 +3,52 @@ product
 
 
 shop
-  color: #999
+  color: #666
   display: block
   navigation
     display: block
-    background: #F4EBDE
+    background: #f6efe5
     distributor.details
+      box-sizing: border-box
       display: block
       height: 150px
+      padding: 40px 0px 0px
       select
         width: 200px
       position: relative
-      img, h3
-        display: inline
-      location
+      img
         display: block
-        padding-left: 28px
-
+        height: 100px
+        width: 100px
+        margin-right: 12px
+      location
+        font-family: "AvenirBla_IE", "AvenirBla"
+        padding-right: 16px
       ordercycle
         display: block
         position: absolute
-        right: 20px
-        top: 12px
-
+        right: 0px
+        top: 40px
         form.custom 
           width: 400px
-          strong
-            line-height: 37px
-            padding-right: 8px
-          closing
-            font-size: 80%
-            display: block
+          text-align: right
+          & > strong
+            line-height: 2.5
+            font-size: 1.29em
+            padding-right: 14px
           .custom.dropdown
-            width: 200px
+            width: 250px
             display: inline-block
             background: transparent
-            border-color: #888
+            border-width: 2px
+            border-color: #666666
+            font-size: 1.28em 
+            margin-bottom: 0
+        closing
+          font-size: 0.875em
+          display: block
+          float: right
+          padding-top: 14px
 
   products
     display: block
diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass
index 93e3813d93..0bf0b39e44 100644
--- a/app/assets/stylesheets/darkswarm/typography.css.sass
+++ b/app/assets/stylesheets/darkswarm/typography.css.sass
@@ -17,11 +17,14 @@
 //body 
   //font-family: "AvenirBla_IE", "AvenirBla"
 
-h1, h2, h3, h4, h5, h6
+h1, h2, h3, h4, h5, h6, .avenir
   color: #333333
   font-family: "AvenirBla_IE", "AvenirBla"
   padding: 0px
 
+strong.avenir
+  font-weight: normal // Avenir is basically bold anyway
+
 td
   font-family: "helvetica"
   
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 993b57477e..e312f2a891 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -10,8 +10,8 @@
 
   - else
     %form.custom
-      %strong Ready for:
-      %select#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
+      %strong.avenir Ready for
+      %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
               "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id || nil}",
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 9d73e4772c..c8fe15ed3f 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -21,7 +21,7 @@
           %td {{ product.description }}
           %td {{ product.master.options_text }}
           %td 
-            %input{type: :number, value: 0, id: "quantity_variant_{{product.master.id}}"}
+            %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{product.master.id}}"}
           %td.group_buy
             %span{"ng-show" => "product.group_buy"} 
               Available
@@ -34,7 +34,7 @@
           %td{colspan: 3}
           %td {{variant.options_text}}
           %td 
-            %input{type: :number, value: 0, id: "quantity_variant_{{variant.id}}"}
+            %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{variant.id}}"}
           %td.group_buy
             %span{"ng-show" => "product.group_buy"} 
               Available
@@ -44,4 +44,4 @@
             %small from
             ${{ variant.price }}
     %input.button.right{type: :submit, value: "Check Out"}
-  %pre {{ data.products | json }}
+  -#%pre {{ data.products | json }}
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 7454bd9fdd..268b5f75ef 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,19 +1,20 @@
 %shop{"ng-app" => "Shop"}
   %navigation
     %distributor.details.row
-      -#%img{src: "/route/to/distributor/icon"}
-      %h3
+      %img.left{src: ""}
+      %h4
         = @distributor.name
       %location= @distributor.address.city
+      %small Change location
       = render partial: "shop/order_cycles"
 
-      %description
-        = @distributor.long_description.andand.html_safe
+      -#%description
+        -#= @distributor.long_description.andand.html_safe
     
   %products.row
     = render partial: "shop/products"
 
-  = render partial: "enterprises/contact_us"
-  = render partial: "enterprises/about_us"
+  -#= render partial: "enterprises/contact_us"
+  -#= render partial: "enterprises/about_us"
 
 

From 4b7605212e2b32d2a80effda21124f1257d4fdc6 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 14:45:32 +1100
Subject: [PATCH 034/100] Adding text trunctation in Angular

---
 app/assets/javascripts/darkswarm/shop.js.coffee | 13 ++++++++++++-
 app/views/shop/_products.html.haml              |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/shop.js.coffee b/app/assets/javascripts/darkswarm/shop.js.coffee
index faffd0e6c4..3b30e222d6 100644
--- a/app/assets/javascripts/darkswarm/shop.js.coffee
+++ b/app/assets/javascripts/darkswarm/shop.js.coffee
@@ -1,2 +1,13 @@
-window.Shop = angular.module("Shop", ["ngResource"]).config ($httpProvider) ->
+window.Shop = angular.module("Shop", ["ngResource", "filters"]).config ($httpProvider) ->
   $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
+
+#angular.module('Shop', ['filters'])
+
+angular.module("filters", []).filter "truncate", ->
+  (text, length, end) ->
+    length = 10  if isNaN(length)
+    end = "..."  if end is `undefined`
+    if text.length <= length or text.length - end.length <= length
+      text
+    else
+      String(text).substring(0, length - end.length) + end
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index c8fe15ed3f..a8218af7dd 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -18,7 +18,7 @@
             %h5
               {{ product.name }}
             {{ product.supplier.name }}
-          %td {{ product.description }}
+          %td {{ product.description | truncate:250 }}
           %td {{ product.master.options_text }}
           %td 
             %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{product.master.id}}"}

From 21d99c8e569a646dd0241f5559d2e91fb4baa870 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 15:17:08 +1100
Subject: [PATCH 035/100] Directing our form to the order populator

---
 app/assets/stylesheets/darkswarm/shop.css.sass |  4 +++-
 app/serializers/spree/product_serializer.rb    |  2 +-
 app/views/shop/_products.html.haml             | 11 +++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 56ff0c1f57..97c46ccf42 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -37,7 +37,7 @@ shop
             font-size: 1.29em
             padding-right: 14px
           .custom.dropdown
-            width: 250px
+            width: 280px
             display: inline-block
             background: transparent
             border-width: 2px
@@ -59,6 +59,8 @@ shop
       border: none
       th
         line-height: 50px
+      .notes
+        max-width: 300px
       td, th
         background: #fff
         border: 1px solid #cccccc
diff --git a/app/serializers/spree/product_serializer.rb b/app/serializers/spree/product_serializer.rb
index 86bb92afcc..d230e51031 100644
--- a/app/serializers/spree/product_serializer.rb
+++ b/app/serializers/spree/product_serializer.rb
@@ -1,6 +1,6 @@
 module Spree
   class ProductSerializer < ActiveModel::Serializer
-    attributes :id, :name, :description, :price
+    attributes :id, :name, :description, :price, :permalink
     has_one :master
     has_one :supplier
     has_many :variants
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index a8218af7dd..c418b90e8f 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -1,10 +1,10 @@
 %products{"ng-controller" => "ProductsCtrl"}
-  %form.custom
+  = form_for :order, :url => populate_orders_path, :class => "custom" do
     %input.button.right{type: :submit, value: "Check Out"}
     %table
       %thead
         %th{colspan: 2} Item
-        %th Notes
+        %th.notes Notes
         %th Variant
         %th QTY
         %th Bulk
@@ -18,7 +18,7 @@
             %h5
               {{ product.name }}
             {{ product.supplier.name }}
-          %td {{ product.description | truncate:250 }}
+          %td.notes {{ product.description | truncate:250 }}
           %td {{ product.master.options_text }}
           %td 
             %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{product.master.id}}"}
@@ -29,7 +29,7 @@
               Not available
           %td.price
             %small from
-            $ {{ product.price }}
+            ${{ product.price }}
         %tr{"ng-repeat" => "variant in product.variants"}
           %td{colspan: 3}
           %td {{variant.options_text}}
@@ -41,7 +41,6 @@
             %span{"ng-hide" => "product.group_buy"} 
               Not available
           %td.price
-            %small from
-            ${{ variant.price }}
+            %small from ${{variant.price }}
     %input.button.right{type: :submit, value: "Check Out"}
   -#%pre {{ data.products | json }}

From 6d124b327516d449428843302051291e1db50ad0 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 16:12:06 +1100
Subject: [PATCH 036/100] Failing tests, forcing the orders close text to
 change

---
 app/controllers/shop_controller.rb       | 2 +-
 app/views/shop/_order_cycles.html.haml   | 1 +
 spec/controllers/shop_controller_spec.rb | 8 ++++++++
 spec/features/consumer/shopping_spec.rb  | 5 +++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 74fd17b26a..33457dd7a9 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -18,7 +18,7 @@ class ShopController < BaseController
   def order_cycle
     if oc = OrderCycle.with_distributor(@distributor).active.find_by_id(params[:order_cycle_id])
       current_order(true).set_order_cycle! oc
-      render status: 200, json: ""
+      render status: 200, json: oc
     else
       render status: 404, json: ""
     end
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index e312f2a891..6348ac9003 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -20,3 +20,4 @@
         -#%img{src: "/icon/goes/here"}
         Orders close
         %strong= current_order_cycle.andand.orders_close_at.andand.strftime "%A %m"
+
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 0c8575231c..a3d7997479 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -36,6 +36,14 @@ describe ShopController do
         controller.current_order_cycle.should == oc2
       end
 
+      it "should return the order cycle details when the oc is selected" do
+        oc1 = create(:order_cycle, distributors: [d])
+        oc2 = create(:order_cycle, distributors: [d])
+        
+        spree_post :order_cycle, order_cycle_id: oc2.id
+        response.body.should have_content OrderCycleSerializer.new(oc2).to_json
+      end
+
       it "should not allow the user to select an invalid order cycle" do
         oc1 = create(:order_cycle, distributors: [d])
         oc2 = create(:order_cycle, distributors: [d])
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 8e0541fca7..7a868d0189 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -68,8 +68,9 @@ feature "As a consumer I want to shop with a distributor", js: true do
             page.should have_content product.name 
           end
 
-          it "shows variants when an order cycle has been selected" do
-            #create(:variant, :
+          it "updates the orders close note when order cycle is changed" do
+            select "frogs", :from => "order_cycle_id"
+            page.should have_content "Orders close #{oc1.orders_close_at.strftime('%A %m')}"
           end
         end
       end

From 1f012dc52ca447c2e1ce69c19bcf0b1fbb3e0d1e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 16:15:23 +1100
Subject: [PATCH 037/100] Patching up the tests to check on our serialisers

---
 app/serializers/order_cycle_serializer.rb | 3 +++
 spec/controllers/shop_controller_spec.rb  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 app/serializers/order_cycle_serializer.rb

diff --git a/app/serializers/order_cycle_serializer.rb b/app/serializers/order_cycle_serializer.rb
new file mode 100644
index 0000000000..202e7ba0d3
--- /dev/null
+++ b/app/serializers/order_cycle_serializer.rb
@@ -0,0 +1,3 @@
+class OrderCycleSerializer < ActiveModel::Serializer
+  attributes :orders_close_at
+end
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index a3d7997479..8f355c259b 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -81,7 +81,7 @@ describe ShopController do
       it "only returns products for the current order cycle" do
         controller.stub(:current_order_cycle).and_return order_cycle
         xhr :get, :products
-        response.body.should == [product].to_json
+        response.body.should == [Spree::ProductSerializer.new(product)].to_json
       end
     end
   end

From b3a4d826b85be3a4a4dc73d7aeaf9316ff266749 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 18 Dec 2013 17:05:47 +1100
Subject: [PATCH 038/100] Dumping OrderCycle data via :javascript tags instead
 of ng-init, Angularising the selector stuff

---
 .../darkswarm/services/order_cycle.js.coffee           | 10 ++++------
 app/serializers/order_cycle_serializer.rb              |  2 +-
 app/views/shop/_order_cycles.html.haml                 |  6 ++++--
 .../unit/darkswarm/order_cycle_spec.js.coffee          |  9 +++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 4c941df9e6..0c941be57e 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,9 +1,7 @@
-Shop.factory 'OrderCycle', ($resource, Product) ->
+Shop.factory 'OrderCycle', ($resource, Product, orderCycleData) ->
   class OrderCycle
-    @order_cycle = {
-      order_cycle_id: null
-    }
-
+    @order_cycle = orderCycleData
     @push_order_cycle: ->
-      new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, ->
+      new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
+        OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at
         Product.update()
diff --git a/app/serializers/order_cycle_serializer.rb b/app/serializers/order_cycle_serializer.rb
index 202e7ba0d3..10efb7e165 100644
--- a/app/serializers/order_cycle_serializer.rb
+++ b/app/serializers/order_cycle_serializer.rb
@@ -1,3 +1,3 @@
 class OrderCycleSerializer < ActiveModel::Serializer
-  attributes :orders_close_at
+  attributes :orders_close_at, id: :order_cycle_id
 end
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 6348ac9003..e629486d46 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -12,12 +12,14 @@
     %form.custom
       %strong.avenir Ready for
       %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
-              "ng-init" => "order_cycle.order_cycle_id = #{current_order_cycle.andand.id || nil}",
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
 
+      :javascript
+        angular.module('Shop').value('orderCycleData', #{OrderCycleSerializer.new(current_order_cycle).to_json})
+
       %closing
         -#%img{src: "/icon/goes/here"}
         Orders close
-        %strong= current_order_cycle.andand.orders_close_at.andand.strftime "%A %m"
+        %strong {{ order_cycle.orders_close_at | date:'EEEE MM'}} 
 
diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
index ed40d6347b..06ae492f99 100644
--- a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
@@ -6,10 +6,12 @@ describe 'OrderCycle service', ->
   }
 
   beforeEach ->
+    angular.module('Shop').value('orderCycleData', {})
     module 'Shop', ($provide)->
       $provide.value "Product", mockProduct
       null # IMPORTANT
       # You must return null because module() is a bit dumb
+      
     inject (_OrderCycle_, _$httpBackend_)->
       $httpBackend = _$httpBackend_
       OrderCycle = _OrderCycle_
@@ -23,4 +25,11 @@ describe 'OrderCycle service', ->
     $httpBackend.flush()
     expect(mockProduct.update).toHaveBeenCalled()
 
+  it "updates the orders_close_at attr after update", ->
+    datestring = "2013-12-20T00:00:00+11:00" 
+    $httpBackend.expectPOST("/shop/order_cycle").respond({orders_close_at: datestring})
+    OrderCycle.push_order_cycle()
+    $httpBackend.flush()
+    expect(OrderCycle.order_cycle.orders_close_at).toEqual(datestring)
+
 

From b5dd921a81362a5c003cd86507ac3145c8999008 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 19 Dec 2013 10:44:47 +1100
Subject: [PATCH 039/100] Our feature spec is breaking but we'll work that out

---
 app/assets/javascripts/darkswarm/services/order_cycle.js.coffee | 2 +-
 spec/features/consumer/shopping_spec.rb                         | 1 -
 spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 0c941be57e..dcbe1022c2 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,6 +1,6 @@
 Shop.factory 'OrderCycle', ($resource, Product, orderCycleData) ->
   class OrderCycle
-    @order_cycle = orderCycleData
+    @order_cycle = orderCycleData || {}
     @push_order_cycle: ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
         OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 7a868d0189..d4fbde9365 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -55,7 +55,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
           it "allows us to select an order cycle" do
             select "frogs", :from => "order_cycle_id"
             page.should have_selector "products"
-            sleep 5
             Spree::Order.last.order_cycle.should == oc1
           end
 
diff --git a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
index 06ae492f99..e7ef7f60b1 100644
--- a/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/order_cycle_spec.js.coffee
@@ -32,4 +32,3 @@ describe 'OrderCycle service', ->
     $httpBackend.flush()
     expect(OrderCycle.order_cycle.orders_close_at).toEqual(datestring)
 
-

From 1048bab303e0e42f45f6e53d7aa3a415ecb59dcf Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 19 Dec 2013 14:20:16 +1100
Subject: [PATCH 040/100] Patching up some edge cases

---
 .../javascripts/darkswarm/services/order_cycle.js.coffee   | 2 +-
 app/views/shop/_order_cycles.html.haml                     | 7 +++++--
 spec/features/consumer/shopping_spec.rb                    | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index dcbe1022c2..042ea960e4 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,6 +1,6 @@
 Shop.factory 'OrderCycle', ($resource, Product, orderCycleData) ->
   class OrderCycle
-    @order_cycle = orderCycleData || {}
+    @order_cycle = orderCycleData || {orders_close_at: ""}
     @push_order_cycle: ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
         OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index e629486d46..4b0a7b4bbd 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -1,4 +1,9 @@
 %ordercycle{"ng-controller" => "OrderCycleCtrl"}
+
+  :javascript
+    angular.module('Shop').value('orderCycleData', #{OrderCycleSerializer.new(current_order_cycle).to_json})
+
+
   - if @order_cycles.empty?
     Orders are currently closed for this hub
     %p 
@@ -15,8 +20,6 @@
               "ng-change" => "changeOrderCycle()",
               "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}"}
 
-      :javascript
-        angular.module('Shop').value('orderCycleData', #{OrderCycleSerializer.new(current_order_cycle).to_json})
 
       %closing
         -#%img{src: "/icon/goes/here"}
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index d4fbde9365..68d8983ca2 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -55,6 +55,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
           it "allows us to select an order cycle" do
             select "frogs", :from => "order_cycle_id"
             page.should have_selector "products"
+            page.should have_content "Orders close #{oc1.orders_close_at.strftime('%A %m')}"
             Spree::Order.last.order_cycle.should == oc1
           end
 
@@ -74,6 +75,11 @@ feature "As a consumer I want to shop with a distributor", js: true do
         end
       end
 
+      describe "adding products to cart" do
+        it "should let us add products to our cart"
+        it "should redirect to the checkout page"
+      end
+
       context "when no order cycles are available" do
         it "tells us orders are closed" do
           visit shop_path

From 985cebb44a686afde29758f06c0df106ed4219e0 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 19 Dec 2013 15:51:51 +1100
Subject: [PATCH 041/100] Massaging the form to push orders to the cart: some
 refactoring still required

---
 .../spree/orders_controller_decorator.rb      |  2 ++
 app/views/shop/_products.html.haml            |  6 ++---
 .../spree/orders_controller_spec.rb           | 22 +++++++++++++++++++
 spec/features/consumer/shopping_spec.rb       | 20 +++++++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb
index 308aa55046..aceeeaab17 100644
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -12,6 +12,8 @@ Spree::OrdersController.class_eval do
     end
 
     populator = Spree::OrderPopulator.new(current_order(true), current_currency)
+    params[:distributor_id] = current_order.distributor.id
+    params[:order_cycle_id] = current_order_cycle.id
     if populator.populate(params.slice(:products, :variants, :quantity, :distributor_id, :order_cycle_id))
       fire_event('spree.cart.add')
       fire_event('spree.order.contents_changed')
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index c418b90e8f..3e50e929a9 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -1,5 +1,5 @@
 %products{"ng-controller" => "ProductsCtrl"}
-  = form_for :order, :url => populate_orders_path, :class => "custom" do
+  = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do
     %input.button.right{type: :submit, value: "Check Out"}
     %table
       %thead
@@ -21,7 +21,7 @@
           %td.notes {{ product.description | truncate:250 }}
           %td {{ product.master.options_text }}
           %td 
-            %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{product.master.id}}"}
+            %input{type: :number, value: 0, min: 0, name: "variants[{{product.master.id}}]"}
           %td.group_buy
             %span{"ng-show" => "product.group_buy"} 
               Available
@@ -34,7 +34,7 @@
           %td{colspan: 3}
           %td {{variant.options_text}}
           %td 
-            %input{type: :number, value: 0, min: 0, name: "quantity_variant_{{variant.id}}"}
+            %input{type: :number, value: 0, min: 0, name: "variants[{{variant.id}}]"}
           %td.group_buy
             %span{"ng-show" => "product.group_buy"} 
               Available
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 2d5dd64576..a8869cd63e 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -141,6 +141,28 @@ describe Spree::OrdersController do
     end
   end
 
+  context "#populate" do
+    let(:user) { create(:user) }
+    let(:order) { mock_model(Spree::Order, :number => "R123", :reload => nil, :save! => true, :coupon_code => nil, :user => user, :completed? => false, :currency => "USD", :token => 'a1b2c3d4')}
+    let(:populator) { double('OrderPopulator') }
+    before do
+        order.stub(:last_ip_address=)
+        Spree::Order.stub(:find).and_return(order)
+        Spree::OrderPopulator.should_receive(:new).and_return(populator)
+        Spree::Order.stub(:new).and_return(order)
+        if Spree::BaseController.spree_responders[:OrdersController].present?
+          Spree::BaseController.spree_responders[:OrdersController].clear
+        end
+    end
+
+    context "with Variant" do
+      it "should handle multiple variants, each with their own quantity" do
+        populator.should_receive(:populate).with("variants" => { 1 => "10", 3 => "7" }).and_return(true)
+        spree_post :populate, { order_id: order.id, :variants => {1 => 10, 3 => 7} }
+      end
+    end
+  end
+
   private
 
   def num_items_in_cart
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 68d8983ca2..e5bd0c3cc7 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -54,6 +54,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
           
           it "allows us to select an order cycle" do
             select "frogs", :from => "order_cycle_id"
+            Spree::Order.last.order_cycle.should == nil
             page.should have_selector "products"
             page.should have_content "Orders close #{oc1.orders_close_at.strftime('%A %m')}"
             Spree::Order.last.order_cycle.should == oc1
@@ -76,8 +77,23 @@ feature "As a consumer I want to shop with a distributor", js: true do
       end
 
       describe "adding products to cart" do
-        it "should let us add products to our cart"
-        it "should redirect to the checkout page"
+        let(:oc) { create(:simple_order_cycle, distributors: [distributor]) }
+        let(:product) { create(:simple_product) }
+        let(:variant) { create(:variant, product: product) }
+        before do
+          exchange = Exchange.find(oc.exchanges.to_enterprises(distributor).outgoing.first.id) 
+          exchange.update_attribute :pickup_time, "frogs" 
+          exchange.variants << product.master
+          exchange.variants << variant 
+          visit shop_path
+          select "frogs", :from => "order_cycle_id"
+        end
+        it "should let us add products to our cart" do
+          fill_in "quantity_variant_#{variant.id}", with: "1"
+          find("form.custom > input.button.right:first-child").click
+          current_path.should == "/cart" 
+          page.should have_content product.name
+        end
       end
 
       context "when no order cycles are available" do

From e20120b9caba74b9aa56e4b760213c20aceaaed7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 19 Dec 2013 16:05:35 +1100
Subject: [PATCH 042/100] Fixing a syntax error

---
 spec/models/order_cycle_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb
index fd9abcf9fb..0a38b2bfc7 100644
--- a/spec/models/order_cycle_spec.rb
+++ b/spec/models/order_cycle_spec.rb
@@ -32,7 +32,7 @@ describe OrderCycle do
 
   it "gives me the outgoing exchange" do
     d = create(:distributor_enterprise)
-    oc = create(:simple_order_cycle), distributors: [d])
+    oc = create(:simple_order_cycle, distributors: [d])
     
     oc.sender.should == d
   end

From 751e98443f48dbc495895a942aa84cc454ebd04b Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 19 Dec 2013 16:47:27 +1100
Subject: [PATCH 043/100] Removing LOADS of code

---
 .../spree/orders_controller_decorator.rb      |   5 +-
 app/models/spree/order_decorator.rb           |   6 +-
 app/models/spree/order_populator_decorator.rb | 150 +++++++++---------
 .../spree/orders_controller_spec.rb           |   6 +-
 4 files changed, 82 insertions(+), 85 deletions(-)

diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb
index aceeeaab17..180c09bec6 100644
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -10,11 +10,8 @@ Spree::OrdersController.class_eval do
     if OpenFoodNetwork::FeatureToggle.enabled? :multi_cart
       populate_cart params.slice(:products, :variants, :quantity, :distributor_id, :order_cycle_id)
     end
-
     populator = Spree::OrderPopulator.new(current_order(true), current_currency)
-    params[:distributor_id] = current_order.distributor.id
-    params[:order_cycle_id] = current_order_cycle.id
-    if populator.populate(params.slice(:products, :variants, :quantity, :distributor_id, :order_cycle_id))
+    if populator.populate(params.slice(:products, :variants))
       fire_event('spree.cart.add')
       fire_event('spree.order.contents_changed')
       respond_with(@order) do |format|
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 45caf95df9..1a1f62d0f9 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -1,8 +1,8 @@
 require 'open_food_network/distribution_change_validator'
 
-ActiveSupport::Notifications.subscribe('spree.order.contents_changed') do |name, start, finish, id, payload|
-  payload[:order].reload.update_distribution_charge!
-end
+#ActiveSupport::Notifications.subscribe('spree.order.contents_changed') do |name, start, finish, id, payload|
+  #payload[:order].reload.update_distribution_charge!
+#end
 
 Spree::Order.class_eval do
   belongs_to :order_cycle
diff --git a/app/models/spree/order_populator_decorator.rb b/app/models/spree/order_populator_decorator.rb
index 002b0a0f74..6d6881bc0b 100644
--- a/app/models/spree/order_populator_decorator.rb
+++ b/app/models/spree/order_populator_decorator.rb
@@ -1,102 +1,102 @@
 Spree::OrderPopulator.class_eval do
-  def populate_with_distribution_validation(from_hash)
-    @distributor, @order_cycle = load_distributor_and_order_cycle(from_hash)
+  #def populate_with_distribution_validation(from_hash)
+    #@distributor, @order_cycle = load_distributor_and_order_cycle(from_hash)
 
-    if !distribution_can_supply_products_in_cart(@distributor, @order_cycle)
-      errors.add(:base, "That distributor or order cycle can't supply all the products in your cart. Please choose another.")
-    end
+    #if !distribution_can_supply_products_in_cart(@distributor, @order_cycle)
+      #errors.add(:base, "That distributor or order cycle can't supply all the products in your cart. Please choose another.")
+    #end
 
-    # Set order distributor and order cycle
-    @orig_distributor, @orig_order_cycle = orig_distributor_and_order_cycle
-    cart_distribution_set = false
-    if valid?
-      set_cart_distributor_and_order_cycle @distributor, @order_cycle
-      cart_distribution_set = true
-    end
+    ## Set order distributor and order cycle
+    #@orig_distributor, @orig_order_cycle = orig_distributor_and_order_cycle
+    #cart_distribution_set = false
+    #if valid?
+      #set_cart_distributor_and_order_cycle @distributor, @order_cycle
+      #cart_distribution_set = true
+    #end
 
-    populate_without_distribution_validation(from_hash) if valid?
+    #populate_without_distribution_validation(from_hash) if valid?
 
-    # Undo distribution setting if validation failed when adding a product
-    if !valid? && cart_distribution_set
-      set_cart_distributor_and_order_cycle @orig_distributor, @orig_order_cycle
-    end
+    ## Undo distribution setting if validation failed when adding a product
+    #if !valid? && cart_distribution_set
+      #set_cart_distributor_and_order_cycle @orig_distributor, @orig_order_cycle
+    #end
 
-    valid?
-  end
-  alias_method_chain :populate, :distribution_validation
+    #valid?
+  #end
+  #alias_method_chain :populate, :distribution_validation
 
 
   # Copied from Spree::OrderPopulator, with additional validations added
-  def attempt_cart_add(variant_id, quantity)
-    quantity = quantity.to_i
-    variant = Spree::Variant.find(variant_id)
-    if quantity > 0
-      if check_stock_levels(variant, quantity) &&
-          check_distribution_provided_for(variant) &&
-          check_variant_available_under_distribution(variant)
+  #def attempt_cart_add(variant_id, quantity)
+    #quantity = quantity.to_i
+    #variant = Spree::Variant.find(variant_id)
+    #if quantity > 0
+      #if check_stock_levels(variant, quantity) &&
+          #check_distribution_provided_for(variant) &&
+          #check_variant_available_under_distribution(variant)
 
-        @order.add_variant(variant, quantity, currency)
-      end
-    end
-  end
+        #@order.add_variant(variant, quantity, currency)
+      #end
+    #end
+  #end
 
 
   private
 
-  def orig_distributor_and_order_cycle
-    [@order.distributor, @order.order_cycle]
-  end
+  #def orig_distributor_and_order_cycle
+    #[@order.distributor, @order.order_cycle]
+  #end
 
 
-  def load_distributor_and_order_cycle(from_hash)
-    distributor = from_hash[:distributor_id].present? ?
-                    Enterprise.is_distributor.find(from_hash[:distributor_id]) : nil
-    order_cycle = from_hash[:order_cycle_id].present? ?
-                     OrderCycle.find(from_hash[:order_cycle_id]) : nil
+  #def load_distributor_and_order_cycle(from_hash)
+    #distributor = from_hash[:distributor_id].present? ?
+                    #Enterprise.is_distributor.find(from_hash[:distributor_id]) : nil
+    #order_cycle = from_hash[:order_cycle_id].present? ?
+                     #OrderCycle.find(from_hash[:order_cycle_id]) : nil
 
-    [distributor, order_cycle]
-  end
+    #[distributor, order_cycle]
+  #end
 
-  def set_cart_distributor_and_order_cycle(distributor, order_cycle)
-    # Using @order.reload or not performing any reload causes totals fields (ie. item_total)
-    # to be set to zero
-    @order = Spree::Order.find @order.id
+  #def set_cart_distributor_and_order_cycle(distributor, order_cycle)
+    ## Using @order.reload or not performing any reload causes totals fields (ie. item_total)
+    ## to be set to zero
+    #@order = Spree::Order.find @order.id
 
-    @order.set_distribution! distributor, order_cycle
-  end
+    #@order.set_distribution! distributor, order_cycle
+  #end
 
-  def distribution_can_supply_products_in_cart(distributor, order_cycle)
-    DistributionChangeValidator.new(@order).can_change_to_distribution?(distributor, order_cycle)
-  end
+  #def distribution_can_supply_products_in_cart(distributor, order_cycle)
+    #DistributionChangeValidator.new(@order).can_change_to_distribution?(distributor, order_cycle)
+  #end
 
-  def check_distribution_provided_for(variant)
-    distribution_provided = distribution_provided_for variant
+  #def check_distribution_provided_for(variant)
+    #distribution_provided = distribution_provided_for variant
 
-    unless distribution_provided
-      if order_cycle_required_for variant
-        errors.add(:base, "Please choose a distributor and order cycle for this order.")
-      else
-        errors.add(:base, "Please choose a distributor for this order.")
-      end
-    end
+    #unless distribution_provided
+      #if order_cycle_required_for variant
+        #errors.add(:base, "Please choose a distributor and order cycle for this order.")
+      #else
+        #errors.add(:base, "Please choose a distributor for this order.")
+      #end
+    #end
 
-    distribution_provided
-  end
+    #distribution_provided
+  #end
 
-  def check_variant_available_under_distribution(variant)
-    if DistributionChangeValidator.new(@order).variants_available_for_distribution(@distributor, @order_cycle).include? variant
-      return true
-    else
-      errors.add(:base, "That product is not available from the chosen distributor or order cycle.")
-      return false
-    end
-  end
+  #def check_variant_available_under_distribution(variant)
+    #if DistributionChangeValidator.new(@order).variants_available_for_distribution(@distributor, @order_cycle).include? variant
+      #return true
+    #else
+      #errors.add(:base, "That product is not available from the chosen distributor or order cycle.")
+      #return false
+    #end
+  #end
 
-  def distribution_provided_for(variant)
-    @distributor.present? && (!order_cycle_required_for(variant) || @order_cycle.present?)
-  end
+  #def distribution_provided_for(variant)
+    #@distributor.present? && (!order_cycle_required_for(variant) || @order_cycle.present?)
+  #end
 
-  def order_cycle_required_for(variant)
-    variant.product.product_distributions.empty?
-  end
+  #def order_cycle_required_for(variant)
+    #variant.product.product_distributions.empty?
+  #end
 end
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index a8869cd63e..9f0299054e 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -37,7 +37,7 @@ describe Spree::OrdersController do
       @request.env["HTTP_REFERER"] = 'http://test.host/'
     end
 
-    it "errors when an invalid distributor is selected" do
+    pending "errors when an invalid distributor is selected" do
       # Given a product and some distributors
       d1 = create(:distributor_enterprise)
       d2 = create(:distributor_enterprise)
@@ -54,7 +54,7 @@ describe Spree::OrdersController do
       flash[:error].should == "That product is not available from the chosen distributor or order cycle."
     end
 
-    it "errors when an invalid order cycle is selected" do
+    pending "errors when an invalid order cycle is selected" do
       # Given a product and some order cycles
       d = create(:distributor_enterprise)
       p = create(:product, :price => 12.34)
@@ -71,7 +71,7 @@ describe Spree::OrdersController do
       flash[:error].should == "That product is not available from the chosen distributor or order cycle."
     end
 
-    it "errors when distribution is valid for the new product but does not cover the cart" do
+    pending "errors when distribution is valid for the new product but does not cover the cart" do
       # Given two products with different distributors
       d1 = create(:distributor_enterprise)
       d2 = create(:distributor_enterprise)

From 0db7eae7f82c056f9c226a2cb882e7aa5191a18f Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 20 Dec 2013 11:49:08 +1100
Subject: [PATCH 044/100] Getting images working

---
 app/serializers/spree/image_serializer.rb       | 6 +++++-
 app/views/shop/_products.html.haml              | 2 +-
 app/views/shop/show.html.haml                   | 2 +-
 spec/serializers/spree/image_serializer_spec.rb | 9 +++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 spec/serializers/spree/image_serializer_spec.rb

diff --git a/app/serializers/spree/image_serializer.rb b/app/serializers/spree/image_serializer.rb
index 0cf3ee8295..07e86eacb6 100644
--- a/app/serializers/spree/image_serializer.rb
+++ b/app/serializers/spree/image_serializer.rb
@@ -1,6 +1,10 @@
 module Spree
 
   class ImageSerializer < ActiveModel::Serializer
-    attributes :id, :mini_url, :alt
+    attributes :id, :small_url, :alt
+
+    def small_url
+      object.attachment.url(:small, false)
+    end
   end
 end
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 3e50e929a9..38cf931aef 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -12,7 +12,7 @@
       %tbody{"ng-repeat" => "product in data.products "}
         %tr.product
           %td
-            -#{{ product.master.images[0].mini_url }} 
+            %img{src: "{{ product.master.images[0].small_url }}"}
             -#{{product.master.images[0].alt}}
           %td
             %h5
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 268b5f75ef..1e0e806002 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,7 +1,7 @@
 %shop{"ng-app" => "Shop"}
   %navigation
     %distributor.details.row
-      %img.left{src: ""}
+      -#%img.left{src: @distributor.}
       %h4
         = @distributor.name
       %location= @distributor.address.city
diff --git a/spec/serializers/spree/image_serializer_spec.rb b/spec/serializers/spree/image_serializer_spec.rb
new file mode 100644
index 0000000000..ced92da3c3
--- /dev/null
+++ b/spec/serializers/spree/image_serializer_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Spree::ImageSerializer do
+  it "should give us the small url" do
+    image = Spree::Image.new(attachment: double(:attachment))
+    image.attachment.should_receive(:url).with(:small, false)
+    Spree::ImageSerializer.new(image).to_json
+  end
+end

From 49c2cc3696d013c249c23307e31eb5c6166a071e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 20 Dec 2013 14:23:14 +1100
Subject: [PATCH 045/100] Getting in the tab navigation

---
 .../stylesheets/darkswarm/shop.css.sass       | 113 ++++++++++++++++++
 app/views/shop/_products.html.haml            |   2 +-
 app/views/shop/show.html.haml                 |  33 ++++-
 .../spree/orders_controller_spec.rb           |   1 -
 4 files changed, 143 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 97c46ccf42..110da55d12 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -2,6 +2,54 @@ product
   display: block 
 
 
+shop
+  color: #666
+  display: block
+  navigation
+    display: block
+    background: #f6efe5
+    distributor.details
+      box-sizing: border-box
+      display: block
+      height: 150px
+      padding: 40px 0px 0px
+      select
+        width: 200px
+      position: relative
+      img
+        display: block
+        height: 100px
+        width: 100px
+        margin-right: 12px
+      location
+        font-family: "AvenirBla_IE", "AvenirBla"
+        padding-right: 16px
+      ordercycle
+        display: block
+        position: absolute
+        right: 0px
+        top: 40px
+        form.custom 
+          width: 400px
+          text-align: right
+          & > strong
+            line-height: 2.5
+            font-size: 1.29em
+            padding-right: 14px
+          .custom.dropdown
+            width: 280px
+            display: inline-block
+            background: transparent
+            border-width: 2px
+            border-color: #666666
+            font-size: 1.28em 
+            margin-bottom: 0
+        closing
+          font-size: 0.875em
+product
+  display: block 
+
+
 shop
   color: #666
   display: block
@@ -50,6 +98,71 @@ shop
           float: right
           padding-top: 14px
 
+  tabs
+    background: url("/assets/matte.png") top left repeat
+    display: block
+    .section-container.auto
+      margin-bottom: 0
+      & > section 
+        transition:height 0s linear 0.5s
+        & > .content
+          background: none
+          border: none
+        & > .title, &.active > .title
+          text-transform: uppercase
+          line-height: 50px
+          border: none
+          &, &:hover
+            background: none
+          a
+            padding: 0px 2.2em
+
+  products
+    display: block
+    padding-top: 36px
+    table
+      width: 100%
+      border-collapse: collapse
+      border: none
+      th
+        line-height: 50px
+      .notes
+        max-width: 300px
+      td, th
+        background: #fff
+        border: 1px solid #cccccc
+        border-left: 0px
+        border-right: 0px
+      td
+        padding: 20px 0px
+      input[type=number]
+        width: 60px
+        margin: 0px
+      
+
+
+          display: block
+          float: right
+          padding-top: 14px
+
+  tabs
+    background: url("/assets/matte.png") top left repeat
+    display: block
+    .section-container.auto
+      margin-bottom: 0
+      & > section 
+        & > .content
+          background: none
+          border: none
+        & > .title, &.active > .title
+          text-transform: uppercase
+          line-height: 50px
+          border: none
+          &, &:hover
+            background: none
+          a
+            padding: 0px 2.2em
+
   products
     display: block
     padding-top: 36px
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 38cf931aef..245f6eee80 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -18,7 +18,7 @@
             %h5
               {{ product.name }}
             {{ product.supplier.name }}
-          %td.notes {{ product.description | truncate:250 }}
+          %td.notes {{ product.description | truncate:80 }}
           %td {{ product.master.options_text }}
           %td 
             %input{type: :number, value: 0, min: 0, name: "variants[{{product.master.id}}]"}
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 1e0e806002..2c4532478c 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,7 +1,7 @@
 %shop{"ng-app" => "Shop"}
   %navigation
     %distributor.details.row
-      -#%img.left{src: @distributor.}
+      %img.left{src: ""}
       %h4
         = @distributor.name
       %location= @distributor.address.city
@@ -9,12 +9,37 @@
       = render partial: "shop/order_cycles"
 
       -#%description
-        -#= @distributor.long_description.andand.html_safe
+  
+  %tabs
+    .row
+      .section-container.auto{"data-section" => "", "data-options" => "one_up: false"}
+        %section
+          %p.title.avenir{"data-section-title" => ""}
+            %a{href: "#about"} About Us 
+          .content{"data-section-content" => ""}
+            %p= @distributor.long_description.andand.html_safe
+
+        %section
+          %p.title.avenir{"data-section-title" => ""}
+            %a{href: "#producers"} Our Producers 
+          .content{"data-section-content" => ""}
+            %p Content of section 2.
+
+        %section
+          %p.title.avenir{"data-section-title" => ""}
+            %a{href: "#groups"} Our Groups 
+          .content{"data-section-content" => ""}
+            %p Groups 
+
+        %section
+          %p.title.avenir{"data-section-title" => ""}
+            %a{href: "#contact"} Contact 
+          .content{"data-section-content" => ""}
+            %p Contact 
+    
     
   %products.row
     = render partial: "shop/products"
 
   -#= render partial: "enterprises/contact_us"
   -#= render partial: "enterprises/about_us"
-
-
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 9f0299054e..08f2db80f7 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -31,7 +31,6 @@ describe Spree::OrdersController do
     order.distributor.should be_nil
   end
 
-
   describe "adding a product to the cart with a distribution combination that can't service the existing cart" do
     before do
       @request.env["HTTP_REFERER"] = 'http://test.host/'

From 530d38c7d0220e43267198d2066695c2865dc77a Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sun, 22 Dec 2013 16:58:48 +0800
Subject: [PATCH 046/100] Add basic pagination informaion to BPE

---
 .../javascripts/admin/bulk_product_update.js.coffee      | 7 +++++++
 app/views/spree/admin/products/bulk_edit.html.haml       | 2 ++
 db/schema.rb                                             | 2 +-
 spec/features/admin/bulk_product_update_spec.rb          | 9 +++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index be2b8bd3cc..d7fc63504d 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -138,6 +138,13 @@ productsApp.controller "AdminBulkProductsCtrl", [
       ["Items", "items"]
     ]
 
+    $scope.perPage = 25
+    $scope.currentPage = 1
+    $scope.products = []
+    $scope.totalCount = -> $scope.products.length
+    $scope.firstVisibleProduct = -> ($scope.currentPage-1)*$scope.perPage+1
+    $scope.lastVisibleProduct = -> Math.min($scope.totalCount(),$scope.currentPage*$scope.perPage)
+
     $scope.initialise = (spree_api_key) ->
       authorise_api_reponse = ""
       dataFetcher("/api/users/authorise_api?token=" + spree_api_key).then (data) ->
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 84572efaba..cfac83b1a9 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -27,6 +27,8 @@
             {{ column.name }}
     %br.clear
     %br.clear
+    %div{ :class => 'five columns' }
+      %span Displaying {{firstVisibleProduct()}}-{{lastVisibleProduct()}} of {{totalCount()}} products
     %table.index#listing_products.bulk
       %colgroup
         %col
diff --git a/db/schema.rb b/db/schema.rb
index 5265be891e..5da4f585f6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -481,9 +481,9 @@ ActiveRecord::Schema.define(:version => 20131128034556) 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
 
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 2cbb520454..f8ec324dda 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -31,6 +31,15 @@ feature %q{
       page.should have_field "product_name", with: p2.name
     end
 
+    it "displays pagination information" do
+      p1 = FactoryGirl.create(:product)
+      p2 = FactoryGirl.create(:product)
+
+      visit '/admin/products/bulk_edit'
+
+      page.should have_text "Displaying 1-2 of 2 products"
+    end
+
     it "displays a select box for suppliers, with the appropriate supplier selected" do
       s1 = FactoryGirl.create(:supplier_enterprise)
       s2 = FactoryGirl.create(:supplier_enterprise)

From 06995bd3c66e9c8cb3bd2f0c43bb1fc013eabf32 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sun, 22 Dec 2013 17:31:27 +0800
Subject: [PATCH 047/100] Add controls to alter the number of products
 displayed for BPE

---
 .../spree/admin/products/bulk_edit.html.haml  |  6 ++++-
 .../admin/bulk_product_update_spec.rb         | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index cfac83b1a9..65aaf6e620 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -28,6 +28,10 @@
     %br.clear
     %br.clear
     %div{ :class => 'five columns' }
+      Show&nbsp;
+      %select{ 'ng-model' => 'perPage', :name => 'perPage', 'ng-options' => 'pp for pp in [25,50,100,200]'}
+      &nbsp;per page
+      %br
       %span Displaying {{firstVisibleProduct()}}-{{lastVisibleProduct()}} of {{totalCount()}} products
     %table.index#listing_products.bulk
       %colgroup
@@ -50,7 +54,7 @@
           %th{ 'ng-show' => 'columns.on_hand.visible' } On Hand
           %th{ 'ng-show' => 'columns.available_on.visible' } Av. On
           %th.actions
-      %tbody{ 'ng-repeat' => 'product in products | filter:query', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'" }
+      %tbody{ 'ng-repeat' => 'product in products | filter:query', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", 'ng-show' => "$index >= perPage*(currentPage-1) && $index < perPage*currentPage" }
         %tr.product
           %td.left-actions
             %a{ 'ofn-toggle-variants' => 'true', :class => "view-variants icon-chevron-right", 'ng-show' => 'hasVariants(product)' }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index f8ec324dda..4dbc029796 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -497,6 +497,28 @@ feature %q{
         page.should have_selector "th", :text => "AV. ON"
       end
     end
+
+    describe "using pagination controls" do
+      it "shows pagination controls" do
+        login_to_admin_section
+
+        visit '/admin/products/bulk_edit'
+
+        page.should have_select 'perPage', :selected => '25'
+      end
+
+      it "allows the number of visible products to be altered" do
+        27.times { FactoryGirl.create(:product) }
+        login_to_admin_section
+
+        visit '/admin/products/bulk_edit'
+
+        select '25', :from => 'perPage'
+        page.all("input[name='product_name']").select{|e| e.visible?}.length.should == 25
+        select '50', :from => 'perPage'
+        page.all("input[name='product_name']").select{|e| e.visible?}.length.should == 27
+      end
+    end
   end
 
   context "as an enterprise manager" do

From ffbfbffb288079f7c799779dde39ac5425eb8773 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Mon, 23 Dec 2013 09:22:31 +0800
Subject: [PATCH 048/100] WIP: Add basic page nav controls to BPE

---
 .../admin/bulk_product_update.js.coffee       |  7 +++++++
 .../stylesheets/admin/products.css.scss       | 10 ++++++++++
 .../spree/admin/products/bulk_edit.html.haml  | 20 +++++++++++++++++++
 .../admin/bulk_product_update_spec.rb         |  6 ++++++
 4 files changed, 43 insertions(+)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index d7fc63504d..d1be7ef2a2 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -142,8 +142,11 @@ productsApp.controller "AdminBulkProductsCtrl", [
     $scope.currentPage = 1
     $scope.products = []
     $scope.totalCount = -> $scope.products.length
+    $scope.totalPages = -> Math.ceil($scope.totalCount()/$scope.perPage)
     $scope.firstVisibleProduct = -> ($scope.currentPage-1)*$scope.perPage+1
     $scope.lastVisibleProduct = -> Math.min($scope.totalCount(),$scope.currentPage*$scope.perPage)
+    $scope.minPage = -> Math.max(1,Math.min($scope.totalPages()-4,$scope.currentPage-2))
+    $scope.maxPage = -> Math.min($scope.totalPages(),Math.max(5,$scope.currentPage+2))
 
     $scope.initialise = (spree_api_key) ->
       authorise_api_reponse = ""
@@ -375,6 +378,10 @@ productsApp.factory "dataFetcher", [
       deferred.promise
 ]
 
+productsApp.filter "rangeArray", ->
+  return (input,start,end) ->
+    input.push(i) for i in [start..end]
+    input
 
 filterSubmitProducts = (productsToFilter) ->
   filteredProducts = []
diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss
index 923b6b6867..59eed87aea 100644
--- a/app/assets/stylesheets/admin/products.css.scss
+++ b/app/assets/stylesheets/admin/products.css.scss
@@ -2,6 +2,16 @@
   display: block;
 }
 
+div.pagination {
+	div.pagenav {
+		margin: 0px;
+		span.first, span.prev, span.next, span.last {
+			padding: 5px 0px;
+			display:inline-block;
+		}
+	}
+}
+
 tbody.odd {
 	tr.product { td { background-color: white; } }
 	tr.variant.odd { td { background-color: lighten(#eff5fc, 3); } }
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 65aaf6e620..2d6e7dd096 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -33,6 +33,26 @@
       &nbsp;per page
       %br
       %span Displaying {{firstVisibleProduct()}}-{{lastVisibleProduct()}} of {{totalCount()}} products
+    %div.pagination{ :class => "seven columns" }
+      %div.pagenav{ :class => "two columns alpha" }
+        %span.first
+          %a{ 'ng-click' => "currentPage = 1", 'ng-show' => "currentPage > 1" }
+            &laquo;&nbsp;First
+        %span.prev
+          %a{ 'ng-click' => "currentPage = currentPage - 1", 'ng-show' => "currentPage > 1" }
+            &lsaquo;&nbsp;Prev
+      %div.pagenav{ :class => "columns omega" }
+        %span.page{ 'ng-repeat' => "page in [] | rangeArray:minPage():maxPage()", 'ng-class' => "{current: currentPage==page}" }
+          %a{ 'ng-click' => "setPage(page)" }
+            {{page}}
+        %span{ 'ng-show' => "maxPage() < totalPages()" } ...
+      %div.pagenav{ :class => "two columns omega" }
+        %span.next
+          %a{ 'ng-click' => "currentPage = currentPage + 1", 'ng-show' => "currentPage < totalPages()" }
+            Next&nbsp;&rsaquo;
+        %span.last
+          %a{ 'ng-click' => "currentPage = totalPages()", 'ng-show' => "currentPage < totalPages()" }
+            Last&nbsp;&raquo;
     %table.index#listing_products.bulk
       %colgroup
         %col
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 4dbc029796..8ec49fea8c 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -500,11 +500,17 @@ feature %q{
 
     describe "using pagination controls" do
       it "shows pagination controls" do
+        27.times { FactoryGirl.create(:product) }
         login_to_admin_section
 
         visit '/admin/products/bulk_edit'
 
         page.should have_select 'perPage', :selected => '25'
+        within '.pagination' do
+          page.should have_text "1 2"
+          page.should have_text "Next"
+          page.should have_text "Last"
+        end
       end
 
       it "allows the number of visible products to be altered" do

From 3372f1d605ede6c6273ae38c80d28e08f315b06e Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Mon, 23 Dec 2013 17:19:38 +0800
Subject: [PATCH 049/100] BPE page nav using page numbers

---
 .../admin/bulk_product_update.js.coffee         |  1 +
 spec/features/admin/bulk_product_update_spec.rb | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index d1be7ef2a2..45a8eee28f 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -145,6 +145,7 @@ productsApp.controller "AdminBulkProductsCtrl", [
     $scope.totalPages = -> Math.ceil($scope.totalCount()/$scope.perPage)
     $scope.firstVisibleProduct = -> ($scope.currentPage-1)*$scope.perPage+1
     $scope.lastVisibleProduct = -> Math.min($scope.totalCount(),$scope.currentPage*$scope.perPage)
+    $scope.setPage = (page) -> $scope.currentPage = page
     $scope.minPage = -> Math.max(1,Math.min($scope.totalPages()-4,$scope.currentPage-2))
     $scope.maxPage = -> Math.min($scope.totalPages(),Math.max(5,$scope.currentPage+2))
 
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 8ec49fea8c..6487a6b323 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -520,9 +520,22 @@ feature %q{
         visit '/admin/products/bulk_edit'
 
         select '25', :from => 'perPage'
-        page.all("input[name='product_name']").select{|e| e.visible?}.length.should == 25
+        page.all("input[name='product_name']").select{ |e| e.visible? }.length.should == 25
         select '50', :from => 'perPage'
-        page.all("input[name='product_name']").select{|e| e.visible?}.length.should == 27
+        page.all("input[name='product_name']").select{ |e| e.visible? }.length.should == 27
+      end
+
+      it "displays the correct products when changing pages" do
+        25.times { FactoryGirl.create(:product, :name => "page1product") }
+        5.times { FactoryGirl.create(:product, :name => "page2product") }
+        login_to_admin_section
+
+        visit '/admin/products/bulk_edit'
+
+        select '25', :from => 'perPage'
+        page.all("input[name='product_name']").select{ |e| e.visible? }.all?{ |e| e.value == "page1product" }.should == true
+        click_link "2"
+        page.all("input[name='product_name']").select{ |e| e.visible? }.all?{ |e| e.value == "page2product" }.should == true
       end
     end
   end

From 2df05458198ccf29c2618afde8225d461b785573 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Mon, 23 Dec 2013 23:09:19 +0800
Subject: [PATCH 050/100] Fix some outstanding updating issues in BPE

---
 .../admin/bulk_product_update.js.coffee       |  6 +++--
 .../spree/api/products/bulk_index.v1.rabl     |  3 +--
 .../spree/api/products/bulk_show.v1.rabl      |  2 +-
 .../admin/bulk_product_update_spec.rb         | 27 +++++++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 45a8eee28f..58c8d72f7c 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -288,8 +288,10 @@ productsApp.controller "AdminBulkProductsCtrl", [
         $scope.packProduct product
 
       productsToSubmit = filterSubmitProducts($scope.dirtyProducts)
-      $scope.updateProducts productsToSubmit
-
+      if productsToSubmit.length > 0
+        $scope.updateProducts productsToSubmit # Don't submit an empty list
+      else
+        $scope.setMessage $scope.updateStatusMessage, "No changes to update.", color: "grey", 3000
 
     $scope.packProduct = (product) ->
       if product.variant_unit_with_scale
diff --git a/app/views/spree/api/products/bulk_index.v1.rabl b/app/views/spree/api/products/bulk_index.v1.rabl
index 4e90cc01ca..e35c8c9d59 100644
--- a/app/views/spree/api/products/bulk_index.v1.rabl
+++ b/app/views/spree/api/products/bulk_index.v1.rabl
@@ -1,3 +1,2 @@
 collection @products.order('id ASC')
-extends "spree/api/products/bulk_show"
-attributes :variant_unit, :variant_unit_scale, :variant_unit_name
\ No newline at end of file
+extends "spree/api/products/bulk_show"
\ No newline at end of file
diff --git a/app/views/spree/api/products/bulk_show.v1.rabl b/app/views/spree/api/products/bulk_show.v1.rabl
index df45c86b42..534dd87846 100644
--- a/app/views/spree/api/products/bulk_show.v1.rabl
+++ b/app/views/spree/api/products/bulk_show.v1.rabl
@@ -1,5 +1,5 @@
 object @product
-attributes :id, :name, :price, :on_hand
+attributes :id, :name, :price, :on_hand, :variant_unit, :variant_unit_scale, :variant_unit_name
 
 node( :available_on ) { |p| p.available_on.blank? ? "" : p.available_on.strftime("%F %T") }
 node( :permalink_live ) { |p| p.permalink }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 6487a6b323..66effcd295 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -351,6 +351,33 @@ feature %q{
     page.find("span#update-status-message").should have_content "Update complete"
   end
 
+  scenario "updating a product after cloning a product" do
+    FactoryGirl.create(:product, :name => "product 1")
+    login_to_admin_section
+
+    visit '/admin/products/bulk_edit'
+
+    first("a.clone-product").click
+
+    fill_in "product_name", :with => "new product name"
+
+    click_button 'Update'
+    page.find("span#update-status-message").should have_content "Update complete"
+  end
+
+  scenario "updating when no changes have been made" do
+    Capybara.default_wait_time = 2
+    FactoryGirl.create(:product, :name => "product 1")
+    FactoryGirl.create(:product, :name => "product 2")
+    login_to_admin_section
+
+    visit '/admin/products/bulk_edit'
+
+    click_button 'Update'
+    page.find("span#update-status-message").should have_content "No changes to update."
+    Capybara.default_wait_time = 5
+  end
+
   scenario "updating a product when there are more products than the default API page size" do
     26.times { FactoryGirl.create(:simple_product) }
     login_to_admin_section

From ef7860904937427fb03103127b05a1cd50f235e5 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Thu, 26 Dec 2013 19:37:21 +0800
Subject: [PATCH 051/100] Prevent page being orphaned when changing page size
 in BPE

---
 .../javascripts/admin/bulk_product_update.js.coffee |  3 +++
 spec/features/admin/bulk_product_update_spec.rb     | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 58c8d72f7c..bda2951281 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -149,6 +149,9 @@ productsApp.controller "AdminBulkProductsCtrl", [
     $scope.minPage = -> Math.max(1,Math.min($scope.totalPages()-4,$scope.currentPage-2))
     $scope.maxPage = -> Math.min($scope.totalPages(),Math.max(5,$scope.currentPage+2))
 
+    $scope.$watch 'perPage', (newVal, oldVal) ->
+      $scope.currentPage = $scope.totalPages() if newVal != oldVal && $scope.totalPages() < $scope.currentPage
+
     $scope.initialise = (spree_api_key) ->
       authorise_api_reponse = ""
       dataFetcher("/api/users/authorise_api?token=" + spree_api_key).then (data) ->
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 66effcd295..5ea1a3ebe1 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -564,6 +564,19 @@ feature %q{
         click_link "2"
         page.all("input[name='product_name']").select{ |e| e.visible? }.all?{ |e| e.value == "page2product" }.should == true
       end
+
+      it "moves the user to the last available page when changing perPage value causes user to become orphaned" do
+        51.times { FactoryGirl.create(:product) }
+        login_to_admin_section
+
+        visit '/admin/products/bulk_edit'
+
+        select '25', :from => 'perPage'
+        click_link "3"
+        select '50', :from => 'perPage'
+        page.first("div.pagenav span.page.current").should have_text "2"
+        page.all("input[name='product_name']").select{ |e| e.visible? }.length.should == 1
+      end
     end
   end
 

From 6b865aa38c1503c833b4cbc01ce523b383f2ece4 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Thu, 2 Jan 2014 13:10:06 +0800
Subject: [PATCH 052/100] Display BPE update message correctly

---
 app/assets/javascripts/admin/bulk_product_update.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index bda2951281..63261a7df4 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -275,7 +275,7 @@ productsApp.controller "AdminBulkProductsCtrl", [
       ).success((data) ->
         if angular.toJson($scope.productsWithoutDerivedAttributes()) == angular.toJson(data)
           $scope.resetProducts data
-          $scope.displaySuccess()
+          $timeout -> $scope.displaySuccess()
         else
           $scope.displayFailure "Product lists do not match."
       ).error (data, status) ->

From c6222f2180cfb964a036335b9275dbd607e8f232 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Thu, 2 Jan 2014 15:22:10 +0800
Subject: [PATCH 053/100] BPE pagination works with filtering

---
 .../admin/bulk_product_update.js.coffee       |  7 +++--
 .../spree/admin/products/bulk_edit.html.haml  |  4 +--
 .../admin/bulk_product_update_spec.rb         | 28 +++++++++++++++++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 63261a7df4..9c8119ec16 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -141,7 +141,8 @@ productsApp.controller "AdminBulkProductsCtrl", [
     $scope.perPage = 25
     $scope.currentPage = 1
     $scope.products = []
-    $scope.totalCount = -> $scope.products.length
+    $scope.filteredProducts = []
+    $scope.totalCount = -> $scope.filteredProducts.length
     $scope.totalPages = -> Math.ceil($scope.totalCount()/$scope.perPage)
     $scope.firstVisibleProduct = -> ($scope.currentPage-1)*$scope.perPage+1
     $scope.lastVisibleProduct = -> Math.min($scope.totalCount(),$scope.currentPage*$scope.perPage)
@@ -149,7 +150,9 @@ productsApp.controller "AdminBulkProductsCtrl", [
     $scope.minPage = -> Math.max(1,Math.min($scope.totalPages()-4,$scope.currentPage-2))
     $scope.maxPage = -> Math.min($scope.totalPages(),Math.max(5,$scope.currentPage+2))
 
-    $scope.$watch 'perPage', (newVal, oldVal) ->
+    $scope.$watch ->
+      $scope.totalPages()
+    , (newVal, oldVal) ->
       $scope.currentPage = $scope.totalPages() if newVal != oldVal && $scope.totalPages() < $scope.currentPage
 
     $scope.initialise = (spree_api_key) ->
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 2d6e7dd096..6e4d626e69 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -19,7 +19,7 @@
   %div
     %div.options
       Filter Results:
-      %input.search{ 'ng-model' => 'query', :type => 'text', 'placeholder' => 'Search Value' }
+      %input.search{ 'ng-model' => 'query', :name => "quick_filter", :type => 'text', 'placeholder' => 'Search Value' }
       %input{ :type => 'button', :value => 'Toggle Columns', 'ofn-toggle-column-list' => true }
       %div{ :style => 'display: none;' }
         %ul.column-list{ style: 'border: 1px solid darkgray; background-color: white;' }
@@ -74,7 +74,7 @@
           %th{ 'ng-show' => 'columns.on_hand.visible' } On Hand
           %th{ 'ng-show' => 'columns.available_on.visible' } Av. On
           %th.actions
-      %tbody{ 'ng-repeat' => 'product in products | filter:query', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", 'ng-show' => "$index >= perPage*(currentPage-1) && $index < perPage*currentPage" }
+      %tbody{ 'ng-repeat' => 'product in filteredProducts = (products | filter:query)', 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", 'ng-show' => "$index >= perPage*(currentPage-1) && $index < perPage*currentPage" }
         %tr.product
           %td.left-actions
             %a{ 'ofn-toggle-variants' => 'true', :class => "view-variants icon-chevron-right", 'ng-show' => 'hasVariants(product)' }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 5ea1a3ebe1..1b9413aea5 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -565,8 +565,9 @@ feature %q{
         page.all("input[name='product_name']").select{ |e| e.visible? }.all?{ |e| e.value == "page2product" }.should == true
       end
 
-      it "moves the user to the last available page when changing perPage value causes user to become orphaned" do
-        51.times { FactoryGirl.create(:product) }
+      it "moves the user to the last available page when changing the number of pages in any way causes user to become orphaned" do
+        50.times { FactoryGirl.create(:product) }
+        FactoryGirl.create(:product, :name => "fancy_product_name")
         login_to_admin_section
 
         visit '/admin/products/bulk_edit'
@@ -575,7 +576,28 @@ feature %q{
         click_link "3"
         select '50', :from => 'perPage'
         page.first("div.pagenav span.page.current").should have_text "2"
-        page.all("input[name='product_name']").select{ |e| e.visible? }.length.should == 1
+        page.all("input[name='product_name']", :visible => true).length.should == 1
+
+        select '25', :from => 'perPage'
+        fill_in "quick_filter", :with => "fancy_product_name"
+        page.first("div.pagenav span.page.current").should have_text "1"
+        page.all("input[name='product_name']", :visible => true).length.should == 1
+      end
+
+      it "paginates the filtered product list rather than all products" do
+        25.times { FactoryGirl.create(:product, :name => "product_name") }
+        3.times { FactoryGirl.create(:product, :name => "test_product_name") }
+        login_to_admin_section
+
+        visit '/admin/products/bulk_edit'
+
+        select '25', :from => 'perPage'
+        page.should have_text "1 2"
+        fill_in "quick_filter", :with => "test_product_name"
+        page.all("input[name='product_name']", :visible => true).length.should == 3
+        page.all("input[name='product_name']", :visible => true).all?{ |e| e.value == "test_product_name" }.should == true
+        page.should_not have_text "1 2"
+        page.should have_text "1"
       end
     end
   end

From 687332d2b0db4669750cd454c4a633b549749a1e Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sat, 4 Jan 2014 15:50:26 +0800
Subject: [PATCH 054/100] Add loading splash to BPE

---
 .../javascripts/admin/bulk_product_update.js.coffee  |  1 +
 app/views/spree/admin/products/bulk_edit.html.haml   |  6 ++++--
 spec/features/admin/bulk_product_update_spec.rb      | 12 ++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 9c8119ec16..7fb34a8001 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -167,6 +167,7 @@ productsApp.controller "AdminBulkProductsCtrl", [
             # Need to have suppliers before we get products so we can match suppliers to product.supplier
             dataFetcher("/api/products/managed?template=bulk_index;page=1;per_page=500").then (data) ->
               $scope.resetProducts data
+              $scope.loading = false
         else if authorise_api_reponse.hasOwnProperty("error")
           $scope.api_error_msg = authorise_api_reponse("error")
         else
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 6e4d626e69..26f3162c5e 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -13,10 +13,12 @@
 
 
 
-%div{ 'ng-app' => 'bulk_product_update', 'ng-controller' => 'AdminBulkProductsCtrl', 'ng-init' => "initialise('#{@spree_api_key}');" }
+%div{ 'ng-app' => 'bulk_product_update', 'ng-controller' => 'AdminBulkProductsCtrl', 'ng-init' => "initialise('#{@spree_api_key}');loading=true;" }
   %div{ 'ng-show' => '!spree_api_key_ok' }
     {{ api_error_msg }}
-  %div
+  %div.loading{ 'ng-show' => 'loading' }
+    %h2 Loading Products...
+  %div{ 'ng-hide' => 'loading' }
     %div.options
       Filter Results:
       %input.search{ 'ng-model' => 'query', :name => "quick_filter", :type => 'text', 'placeholder' => 'Search Value' }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 1b9413aea5..890de37968 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -21,14 +21,22 @@ feature %q{
       login_to_admin_section
     end
 
+    it "displays a 'loading' splash for products" do
+      101.times{ FactoryGirl.create(:product) }
+
+      visit '/admin/products/bulk_edit'
+
+      page.should have_selector "div.loading", :text => "Loading Products..."
+    end
+
     it "displays a list of products" do
       p1 = FactoryGirl.create(:product)
       p2 = FactoryGirl.create(:product)
 
       visit '/admin/products/bulk_edit'
 
-      page.should have_field "product_name", with: p1.name
-      page.should have_field "product_name", with: p2.name
+      page.should have_field "product_name", with: p1.name, :visible => true
+      page.should have_field "product_name", with: p2.name, :visible => true
     end
 
     it "displays pagination information" do

From 7ef358a47636abdcf46f106673d1be438989abea Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sat, 4 Jan 2014 16:44:00 +0800
Subject: [PATCH 055/100] Add basic hard filter adding js infrastructure for
 BPE

---
 .../admin/bulk_product_update.js.coffee       | 11 +++++++
 .../unit/bulk_product_update_spec.js.coffee   | 30 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 7fb34a8001..5f0f0c6e71 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -138,10 +138,15 @@ productsApp.controller "AdminBulkProductsCtrl", [
       ["Items", "items"]
     ]
 
+    $scope.filterTypes = [
+      { name: "Equals",    ransack_predicate: "eq" }
+    ]
+
     $scope.perPage = 25
     $scope.currentPage = 1
     $scope.products = []
     $scope.filteredProducts = []
+    $scope.currentFilters = []
     $scope.totalCount = -> $scope.filteredProducts.length
     $scope.totalPages = -> Math.ceil($scope.totalCount()/$scope.perPage)
     $scope.firstVisibleProduct = -> ($scope.currentPage-1)*$scope.perPage+1
@@ -225,6 +230,12 @@ productsApp.controller "AdminBulkProductsCtrl", [
       onHand
 
 
+    $scope.addFilter = (filter) ->
+      if Object.keys($scope.columns).indexOf(filter.property) >= 0
+        if $scope.filterTypes.map( (filter_type) -> filter_type.ransack_predicate ).indexOf(filter.ransack_predicate) >= 0
+          $scope.currentFilters.push filter
+
+
     $scope.editWarn = (product, variant) ->
       if ($scope.dirtyProductCount() > 0 and confirm("Unsaved changes will be lost. Continue anyway?")) or ($scope.dirtyProductCount() == 0)
         window.location = "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
index bed0687231..bbf6d4993c 100644
--- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee
+++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
@@ -1,4 +1,4 @@
-describe "filtering products", ->
+describe "filtering products for submission to database", ->
   it "accepts an object or an array and only returns an array", ->
     expect(filterSubmitProducts([])).toEqual []
     expect(filterSubmitProducts({})).toEqual []
@@ -639,6 +639,7 @@ describe "AdminBulkProductsCtrl", ->
         ]
         scope.updateProducts "list of dirty products"
         httpBackend.flush()
+        timeout.flush()
         expect(scope.displaySuccess).toHaveBeenCalled()
 
       it "runs displayFailure() when post return data does not match $scope.products", ->
@@ -898,6 +899,33 @@ describe "AdminBulkProductsCtrl", ->
       ]
 
 
+  describe "filtering products", ->
+    describe "adding a filter to the filter list", ->
+      it "adds objects sent to addFilter() to $scope.currentFilters", ->
+        filterObject1 = {property: "name", ransack_predicate: "eq", value: "Product1"}
+        filterObject2 = {property: "name", ransack_predicate: "eq", value: "Product2"}
+        scope.addFilter(filterObject1)
+        scope.addFilter(filterObject2)
+        expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
+
+      it "ignores objects sent to addFilter() which do not contain a 'property' with a corresponding key in $scope.columns", ->
+        filterObject1 = {property: Object.keys(scope.columns)[0], ransack_predicate: "eq", value: "value1"}
+        filterObject2 = {property: Object.keys(scope.columns)[2], ransack_predicate: "eq", value: "value2"}
+        filterObject3 = {property: "some_random_property", ransack_predicate: "eq", value: "value3"}
+        scope.addFilter(filterObject1)
+        scope.addFilter(filterObject2)
+        scope.addFilter(filterObject3)
+        expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
+
+      it "ignores objects sent to addFilter() which do not contain a query with a corresponding key in ", ->
+        filterObject1 = {property: Object.keys(scope.columns)[0], ransack_predicate: "eq", value: "value1"}
+        filterObject2 = {property: Object.keys(scope.columns)[2], ransack_predicate: "eq", value: "value2"}
+        filterObject3 = {property: Object.keys(scope.columns)[4], ransack_predicate: "something", value: "value3"}
+        scope.addFilter(filterObject1)
+        scope.addFilter(filterObject2)
+        scope.addFilter(filterObject3)
+        expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
+
 
 describe "converting arrays of objects with ids to an object with ids as keys", ->
   it "returns an object", ->

From a6d7044dfd7eca59504086fc2331c2ed0c30201d Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sat, 4 Jan 2014 19:21:10 +0800
Subject: [PATCH 056/100] WIP: Adding basic UI for applying hard filtering to
 BPE

---
 .../admin/bulk_product_update.js.coffee       | 15 +++++++---
 .../stylesheets/admin/products.css.scss       | 14 +++++++++
 .../spree/admin/products/bulk_edit.html.haml  | 29 ++++++++++++++++++-
 .../admin/bulk_product_update_spec.rb         | 28 ++++++++++++++++++
 .../unit/bulk_product_update_spec.js.coffee   | 20 ++++++-------
 5 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 5f0f0c6e71..809e1a0628 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -138,10 +138,17 @@ productsApp.controller "AdminBulkProductsCtrl", [
       ["Items", "items"]
     ]
 
-    $scope.filterTypes = [
-      { name: "Equals",    ransack_predicate: "eq" }
+    $scope.filterableColumns = [
+      { name: "Supplier",       db_column: "supplier" },
+      { name: "Name",           db_column: "name" }
     ]
 
+    $scope.filterTypes = [
+      { name: "Equals",         predicate: "eq" },
+      { name: "Contains",       predicate: "eq" }
+    ]
+
+
     $scope.perPage = 25
     $scope.currentPage = 1
     $scope.products = []
@@ -231,8 +238,8 @@ productsApp.controller "AdminBulkProductsCtrl", [
 
 
     $scope.addFilter = (filter) ->
-      if Object.keys($scope.columns).indexOf(filter.property) >= 0
-        if $scope.filterTypes.map( (filter_type) -> filter_type.ransack_predicate ).indexOf(filter.ransack_predicate) >= 0
+      if $scope.filterableColumns.indexOf(filter.property) >= 0
+        if $scope.filterTypes.indexOf(filter.predicate) >= 0
           $scope.currentFilters.push filter
 
 
diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss
index 59eed87aea..fdc7517387 100644
--- a/app/assets/stylesheets/admin/products.css.scss
+++ b/app/assets/stylesheets/admin/products.css.scss
@@ -12,6 +12,20 @@ div.pagination {
 	}
 }
 
+div.filters {
+	margin-bottom: 10px;
+}
+
+div.applied_filter {
+	margin-bottom: 5px;
+	border: solid 2px grey;
+	padding: 5px 0px;
+	border-radius: 5px;
+	div.four.columns {
+		padding-left: 10px;
+	}
+}
+
 tbody.odd {
 	tr.product { td { background-color: white; } }
 	tr.variant.odd { td { background-color: lighten(#eff5fc, 3); } }
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 26f3162c5e..49e5ee31c6 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -16,8 +16,35 @@
 %div{ 'ng-app' => 'bulk_product_update', 'ng-controller' => 'AdminBulkProductsCtrl', 'ng-init' => "initialise('#{@spree_api_key}');loading=true;" }
   %div{ 'ng-show' => '!spree_api_key_ok' }
     {{ api_error_msg }}
+  %div.filters{ :class => "fourteen columns alpha" }
+    %h3 Filter Products
+    %br.clear
+    %div{ :class => "four columns alpha" }
+      Column:
+      %br.clear
+      %select.select2.fullwidth{ 'ng-model' => 'filterProperty', :name => "filter_property", 'ng-options' => 'fc.name for fc in filterableColumns' }
+    %div{ :class => "four columns omega" }
+      Filter Type:
+      %br.clear
+      %select.select2.fullwidth{ 'ng-model' => 'filterPredicate', :name => "filter_predicate", 'ng-options' => 'ft.name for ft in filterTypes' }
+    %div{ :class => "four columns omega" }
+      Value:
+      %br.clear
+      %input.fullwidth{ 'ng-model' => 'filterValue', :name => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
+    %div{ :class => "two columns omega" }
+      &nbsp;
+      %input{ :name => "add_filter", :value => "Apply Filter", :type => "button", "ng-click" => "addFilter({property:filterProperty,predicate:filterPredicate,value:filterValue})" }
+  %div.applied_filter{ :class => "fourteen columns alpha", 'ng-repeat' => 'filter in currentFilters' }
+    %div{ :class => "four columns alpha" }
+      {{ filter.property.name }}
+    %div{ :class => "four columns omega" }
+      {{ filter.predicate.name }}
+    %div{ :class => "four columns omega" }
+      {{ filter.value }}
+  %br.clear
+  %hr
   %div.loading{ 'ng-show' => 'loading' }
-    %h2 Loading Products...
+    %h4 Loading Products...
   %div{ 'ng-hide' => 'loading' }
     %div.options
       Filter Results:
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 890de37968..8c56588a9a 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -608,6 +608,34 @@ feature %q{
         page.should have_text "1"
       end
     end
+
+    describe "using filtering controls" do
+      it "displays basic filtering controls" do
+        FactoryGirl.create(:simple_product)
+
+        login_to_admin_section
+        visit '/admin/products/bulk_edit'
+
+        page.should have_select "filter_property", :with_options => ["Supplier", "Name"]
+        page.should have_select "filter_predicate", :with_options => ["Equals", "Contains"]
+        page.should have_field "filter_value"
+      end
+
+      it "adds a new filter when the 'Apply Filter' button is clicked" do
+        FactoryGirl.create(:simple_product, :name => "Product1")
+        FactoryGirl.create(:simple_product, :name => "Product2")
+
+        login_to_admin_section
+        visit '/admin/products/bulk_edit'
+
+        select "Name", :from => "filter_property"
+        select "Equals", :from => "filter_predicate"
+        fill_in "filter_value", :with => "Product1"
+        click_button "Apply Filter"
+
+        page.should have_text "Name Equals Product1"
+      end
+    end
   end
 
   context "as an enterprise manager" do
diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
index bbf6d4993c..7857fbb375 100644
--- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee
+++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
@@ -902,25 +902,25 @@ describe "AdminBulkProductsCtrl", ->
   describe "filtering products", ->
     describe "adding a filter to the filter list", ->
       it "adds objects sent to addFilter() to $scope.currentFilters", ->
-        filterObject1 = {property: "name", ransack_predicate: "eq", value: "Product1"}
-        filterObject2 = {property: "name", ransack_predicate: "eq", value: "Product2"}
+        filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product1"}
+        filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product2"}
         scope.addFilter(filterObject1)
         scope.addFilter(filterObject2)
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
-      it "ignores objects sent to addFilter() which do not contain a 'property' with a corresponding key in $scope.columns", ->
-        filterObject1 = {property: Object.keys(scope.columns)[0], ransack_predicate: "eq", value: "value1"}
-        filterObject2 = {property: Object.keys(scope.columns)[2], ransack_predicate: "eq", value: "value2"}
-        filterObject3 = {property: "some_random_property", ransack_predicate: "eq", value: "value3"}
+      it "ignores objects sent to addFilter() which do not contain a 'property' with a corresponding key in filterableColumns", ->
+        filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1"}
+        filterObject2 = {property: scope.filterableColumns[1], predicate: scope.filterTypes[0], value: "value2"}
+        filterObject3 = {property: "some_random_property", predicate: scope.filterTypes[0], value: "value3"}
         scope.addFilter(filterObject1)
         scope.addFilter(filterObject2)
         scope.addFilter(filterObject3)
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
-      it "ignores objects sent to addFilter() which do not contain a query with a corresponding key in ", ->
-        filterObject1 = {property: Object.keys(scope.columns)[0], ransack_predicate: "eq", value: "value1"}
-        filterObject2 = {property: Object.keys(scope.columns)[2], ransack_predicate: "eq", value: "value2"}
-        filterObject3 = {property: Object.keys(scope.columns)[4], ransack_predicate: "something", value: "value3"}
+      it "ignores objects sent to addFilter() which do not contain a query with a corresponding key in filterTypes", ->
+        filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1"}
+        filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[1], value: "value2"}
+        filterObject3 = {property: scope.filterableColumns[0], predicate: "something", value: "value3"}
         scope.addFilter(filterObject1)
         scope.addFilter(filterObject2)
         scope.addFilter(filterObject3)

From 64452755307dbe44999f6f3fe5c948f950dce6f7 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sun, 5 Jan 2014 00:37:36 +0800
Subject: [PATCH 057/100] Basic layout changes for BPE page

---
 .../stylesheets/admin/products.css.scss       |  6 ++-
 .../spree/admin/products/bulk_edit.html.haml  | 40 +++++++++----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss
index fdc7517387..97e52ac291 100644
--- a/app/assets/stylesheets/admin/products.css.scss
+++ b/app/assets/stylesheets/admin/products.css.scss
@@ -12,13 +12,17 @@ div.pagination {
 	}
 }
 
+div.pagination_info {
+	text-align: right;
+}
+
 div.filters {
 	margin-bottom: 10px;
 }
 
 div.applied_filter {
 	margin-bottom: 5px;
-	border: solid 2px grey;
+	border: solid 2px #5498da;
 	padding: 5px 0px;
 	border-radius: 5px;
 	div.four.columns {
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 49e5ee31c6..65c6a69253 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -16,9 +16,8 @@
 %div{ 'ng-app' => 'bulk_product_update', 'ng-controller' => 'AdminBulkProductsCtrl', 'ng-init' => "initialise('#{@spree_api_key}');loading=true;" }
   %div{ 'ng-show' => '!spree_api_key_ok' }
     {{ api_error_msg }}
-  %div.filters{ :class => "fourteen columns alpha" }
-    %h3 Filter Products
-    %br.clear
+  %div.filters{ :class => "sixteen columns alpha" }
+    %h5 Filter Products
     %div{ :class => "four columns alpha" }
       Column:
       %br.clear
@@ -27,42 +26,35 @@
       Filter Type:
       %br.clear
       %select.select2.fullwidth{ 'ng-model' => 'filterPredicate', :name => "filter_predicate", 'ng-options' => 'ft.name for ft in filterTypes' }
-    %div{ :class => "four columns omega" }
+    %div{ :class => "six columns omega" }
       Value:
       %br.clear
-      %input.fullwidth{ 'ng-model' => 'filterValue', :name => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
+      %input{ :class => "four columns alpha", 'ng-model' => 'filterValue', :name => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
     %div{ :class => "two columns omega" }
       &nbsp;
-      %input{ :name => "add_filter", :value => "Apply Filter", :type => "button", "ng-click" => "addFilter({property:filterProperty,predicate:filterPredicate,value:filterValue})" }
-  %div.applied_filter{ :class => "fourteen columns alpha", 'ng-repeat' => 'filter in currentFilters' }
+      %input.fullwidth{ :name => "add_filter", :value => "Apply Filter", :type => "button", "ng-click" => "addFilter({property:filterProperty,predicate:filterPredicate,value:filterValue})" }
+  %div.applied_filter{ :class => "sixteen columns alpha", 'ng-repeat' => 'filter in currentFilters' }
     %div{ :class => "four columns alpha" }
       {{ filter.property.name }}
     %div{ :class => "four columns omega" }
       {{ filter.predicate.name }}
-    %div{ :class => "four columns omega" }
+    %div{ :class => "six columns omega" }
       {{ filter.value }}
-  %br.clear
   %hr
   %div.loading{ 'ng-show' => 'loading' }
     %h4 Loading Products...
   %div{ 'ng-hide' => 'loading' }
-    %div.options
-      Filter Results:
-      %input.search{ 'ng-model' => 'query', :name => "quick_filter", :type => 'text', 'placeholder' => 'Search Value' }
+    %div.column_toggle
+      %h5 Toggle Columns
       %input{ :type => 'button', :value => 'Toggle Columns', 'ofn-toggle-column-list' => true }
       %div{ :style => 'display: none;' }
         %ul.column-list{ style: 'border: 1px solid darkgray; background-color: white;' }
           %li.column-list-item{ 'ofn-toggle-column' => 'column', 'ng-repeat' => 'column in columns' }
             {{ column.name }}
-    %br.clear
-    %br.clear
-    %div{ :class => 'five columns' }
-      Show&nbsp;
-      %select{ 'ng-model' => 'perPage', :name => 'perPage', 'ng-options' => 'pp for pp in [25,50,100,200]'}
-      &nbsp;per page
-      %br
-      %span Displaying {{firstVisibleProduct()}}-{{lastVisibleProduct()}} of {{totalCount()}} products
-    %div.pagination{ :class => "seven columns" }
+    %hr
+    %div.quick_search{ :class => "five columns omega" }
+      %input.search{ :class => "four columns alpha", 'ng-model' => 'query', :name => "quick_filter", :type => 'text', 'placeholder' => 'Quick Search' }
+    %div.pagination{ :class => "seven columns omega" }
       %div.pagenav{ :class => "two columns alpha" }
         %span.first
           %a{ 'ng-click' => "currentPage = 1", 'ng-show' => "currentPage > 1" }
@@ -82,6 +74,12 @@
         %span.last
           %a{ 'ng-click' => "currentPage = totalPages()", 'ng-show' => "currentPage < totalPages()" }
             Last&nbsp;&raquo;
+    %div.pagination_info{ :class => 'four columns alpha' }
+      Show&nbsp;
+      %select{ 'ng-model' => 'perPage', :name => 'perPage', 'ng-options' => 'pp for pp in [25,50,100,200]'}
+      &nbsp;per page
+      %br
+      %span Displaying {{firstVisibleProduct()}}-{{lastVisibleProduct()}} of {{totalCount()}} products
     %table.index#listing_products.bulk
       %colgroup
         %col

From fb9fd5089aa1ad3809cc0cb8bef50943286572c6 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sun, 5 Jan 2014 17:04:27 +0800
Subject: [PATCH 058/100] WIP: Adding a hard filter to BPE works

---
 .../admin/bulk_product_update.js.coffee       | 20 +++++++---
 .../admin/bulk_product_update_spec.rb         | 33 ++++++++++-----
 .../unit/bulk_product_update_spec.js.coffee   | 40 +++++++++++++++++--
 3 files changed, 75 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 809e1a0628..1043305ddb 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -139,13 +139,13 @@ productsApp.controller "AdminBulkProductsCtrl", [
     ]
 
     $scope.filterableColumns = [
-      { name: "Supplier",       db_column: "supplier" },
+      { name: "Supplier",       db_column: "supplier_name" },
       { name: "Name",           db_column: "name" }
     ]
 
     $scope.filterTypes = [
       { name: "Equals",         predicate: "eq" },
-      { name: "Contains",       predicate: "eq" }
+      { name: "Contains",       predicate: "cont" }
     ]
 
 
@@ -177,15 +177,24 @@ productsApp.controller "AdminBulkProductsCtrl", [
           dataFetcher("/api/enterprises/managed?template=bulk_index&q[is_primary_producer_eq]=true").then (data) ->
             $scope.suppliers = data
             # Need to have suppliers before we get products so we can match suppliers to product.supplier
-            dataFetcher("/api/products/managed?template=bulk_index;page=1;per_page=500").then (data) ->
-              $scope.resetProducts data
-              $scope.loading = false
+            $scope.fetchProducts()
         else if authorise_api_reponse.hasOwnProperty("error")
           $scope.api_error_msg = authorise_api_reponse("error")
         else
           api_error_msg = "You don't have an API key yet. An attempt was made to generate one, but you are currently not authorised, please contact your site administrator for access."
 
 
+    $scope.fetchProducts = -> # WARNING: returns a promise
+      #apply current filters
+      $scope.loading = true
+      queryString = $scope.currentFilters.reduce (qs,f) ->
+        return qs + "q[#{f.property.db_column}_#{f.predicate.predicate}]=#{f.value};"
+      , ""
+      return dataFetcher("/api/products/managed?template=bulk_index;page=1;per_page=500;#{queryString}").then (data) ->
+        $scope.resetProducts data
+        $scope.loading = false
+
+
     $scope.resetProducts = (data) ->
       $scope.products = data
       $scope.dirtyProducts = {}
@@ -241,6 +250,7 @@ productsApp.controller "AdminBulkProductsCtrl", [
       if $scope.filterableColumns.indexOf(filter.property) >= 0
         if $scope.filterTypes.indexOf(filter.predicate) >= 0
           $scope.currentFilters.push filter
+          $scope.fetchProducts()
 
 
     $scope.editWarn = (product, variant) ->
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 8c56588a9a..f34c4080ec 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -621,19 +621,32 @@ feature %q{
         page.should have_field "filter_value"
       end
 
-      it "adds a new filter when the 'Apply Filter' button is clicked" do
-        FactoryGirl.create(:simple_product, :name => "Product1")
-        FactoryGirl.create(:simple_product, :name => "Product2")
+      describe "clicking the 'Apply Filter' Button" do
+        before(:each) do
+          FactoryGirl.create(:simple_product, :name => "Product1")
+          FactoryGirl.create(:simple_product, :name => "Product2")
 
-        login_to_admin_section
-        visit '/admin/products/bulk_edit'
+          login_to_admin_section
+          visit '/admin/products/bulk_edit'
 
-        select "Name", :from => "filter_property"
-        select "Equals", :from => "filter_predicate"
-        fill_in "filter_value", :with => "Product1"
-        click_button "Apply Filter"
+          select "Name", :from => "filter_property"
+          select "Equals", :from => "filter_predicate"
+          fill_in "filter_value", :with => "Product1"
+          click_button "Apply Filter"
+        end
 
-        page.should have_text "Name Equals Product1"
+        it "adds a new filter to the list of applied filters" do
+          page.should have_text "Name Equals Product1"
+        end
+
+        it "displays the 'loading' splash" do
+          page.should have_selector "div.loading", :text => "Loading Products..."
+        end
+
+        it "loads appropriate products" do
+          page.should have_field "product_name", :with => "Product1"
+          page.should_not have_field "product_name", :with => "Product2"
+        end
       end
     end
   end
diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
index 7857fbb375..c1cdd8958a 100644
--- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee
+++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
@@ -274,15 +274,41 @@ describe "AdminBulkProductsCtrl", ->
     it "gets a list of suppliers and then resets products with a list of data", ->
       httpBackend.expectGET("/api/users/authorise_api?token=api_key").respond success: "Use of API Authorised"
       httpBackend.expectGET("/api/enterprises/managed?template=bulk_index&q[is_primary_producer_eq]=true").respond "list of suppliers"
-      httpBackend.expectGET("/api/products/managed?template=bulk_index;page=1;per_page=500").respond "list of products"
-      spyOn scope, "resetProducts"
+      spyOn(scope, "fetchProducts").andReturn "nothing"
       scope.initialise "api_key"
       httpBackend.flush()
       expect(scope.suppliers).toEqual "list of suppliers"
-      expect(scope.resetProducts).toHaveBeenCalledWith "list of products"
+      expect(scope.fetchProducts.calls.length).toEqual 1
       expect(scope.spree_api_key_ok).toEqual true
 
 
+  describe "fetching products", ->
+    it "makes a standard call to dataFetcher when no filters exist", ->
+      httpBackend.expectGET("/api/products/managed?template=bulk_index;page=1;per_page=500;").respond "list of products"
+      scope.fetchProducts()
+
+    it "calls resetProducts after data has been received", ->
+      spyOn scope, "resetProducts"
+      httpBackend.expectGET("/api/products/managed?template=bulk_index;page=1;per_page=500;").respond "list of products"
+      scope.fetchProducts()
+      httpBackend.flush()
+      expect(scope.resetProducts).toHaveBeenCalledWith "list of products"
+
+    it "applies filters when they are present", ->
+      filter = {property: scope.filterableColumns[1], predicate:scope.filterTypes[0], value:"Product1"}
+      scope.currentFilters.push filter # Don't use addFilter as that is not what we are testing
+      expect(scope.currentFilters).toEqual [filter]
+      httpBackend.expectGET("/api/products/managed?template=bulk_index;page=1;per_page=500;q[name_eq]=Product1;").respond "list of products"
+      scope.fetchProducts()
+
+    it "sets the loading property to true before fetching products and unsets it when loading is complete", ->
+      httpBackend.expectGET("/api/products/managed?template=bulk_index;page=1;per_page=500;").respond "list of products"
+      scope.fetchProducts()
+      expect(scope.loading).toEqual true
+      httpBackend.flush()
+      expect(scope.loading).toEqual false
+
+
   describe "resetting products", ->
     beforeEach ->
       spyOn scope, "unpackProduct"
@@ -902,6 +928,7 @@ describe "AdminBulkProductsCtrl", ->
   describe "filtering products", ->
     describe "adding a filter to the filter list", ->
       it "adds objects sent to addFilter() to $scope.currentFilters", ->
+        spyOn(scope, "fetchProducts").andReturn "nothing"
         filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product1"}
         filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product2"}
         scope.addFilter(filterObject1)
@@ -909,6 +936,7 @@ describe "AdminBulkProductsCtrl", ->
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
       it "ignores objects sent to addFilter() which do not contain a 'property' with a corresponding key in filterableColumns", ->
+        spyOn(scope, "fetchProducts").andReturn "nothing"
         filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1"}
         filterObject2 = {property: scope.filterableColumns[1], predicate: scope.filterTypes[0], value: "value2"}
         filterObject3 = {property: "some_random_property", predicate: scope.filterTypes[0], value: "value3"}
@@ -918,6 +946,7 @@ describe "AdminBulkProductsCtrl", ->
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
       it "ignores objects sent to addFilter() which do not contain a query with a corresponding key in filterTypes", ->
+        spyOn(scope, "fetchProducts").andReturn "nothing"
         filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1"}
         filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[1], value: "value2"}
         filterObject3 = {property: scope.filterableColumns[0], predicate: "something", value: "value3"}
@@ -926,6 +955,11 @@ describe "AdminBulkProductsCtrl", ->
         scope.addFilter(filterObject3)
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
+      it "calls fetchProducts when adding a new filter", ->
+        spyOn(scope, "fetchProducts").andReturn "nothing"
+        scope.addFilter( { property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1" } )
+        expect(scope.fetchProducts.calls.length).toEqual(1)
+
 
 describe "converting arrays of objects with ids to an object with ids as keys", ->
   it "returns an object", ->

From 2e56d7a55103bd6ddb9433981e3c3377e449101c Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sun, 5 Jan 2014 17:53:32 +0800
Subject: [PATCH 059/100] Can remove filters from BPE

---
 .../admin/bulk_product_update.js.coffee       |  8 +++-
 .../spree/admin/products/bulk_edit.html.haml  |  2 +
 .../admin/bulk_product_update_spec.rb         | 19 ++++++++++
 .../unit/bulk_product_update_spec.js.coffee   | 37 +++++++++++++++----
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 1043305ddb..d3749c9f6c 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -165,7 +165,7 @@ productsApp.controller "AdminBulkProductsCtrl", [
     $scope.$watch ->
       $scope.totalPages()
     , (newVal, oldVal) ->
-      $scope.currentPage = $scope.totalPages() if newVal != oldVal && $scope.totalPages() < $scope.currentPage
+      $scope.currentPage = Math.max $scope.totalPages(), 1  if newVal != oldVal && $scope.totalPages() < $scope.currentPage
 
     $scope.initialise = (spree_api_key) ->
       authorise_api_reponse = ""
@@ -252,6 +252,12 @@ productsApp.controller "AdminBulkProductsCtrl", [
           $scope.currentFilters.push filter
           $scope.fetchProducts()
 
+    $scope.removeFilter = (filter) ->
+      index = $scope.currentFilters.indexOf(filter)
+      if index != -1
+        $scope.currentFilters.splice index, 1
+        $scope.fetchProducts()
+
 
     $scope.editWarn = (product, variant) ->
       if ($scope.dirtyProductCount() > 0 and confirm("Unsaved changes will be lost. Continue anyway?")) or ($scope.dirtyProductCount() == 0)
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 65c6a69253..8be3c35e29 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -40,6 +40,8 @@
       {{ filter.predicate.name }}
     %div{ :class => "six columns omega" }
       {{ filter.value }}
+    %div{ :class => "two columns omega" }
+      %a{ 'ng-click' => "removeFilter(filter)" } Remove Filter
   %hr
   %div.loading{ 'ng-show' => 'loading' }
     %h4 Loading Products...
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index f34c4080ec..8e2e3b6e96 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -647,6 +647,25 @@ feature %q{
           page.should have_field "product_name", :with => "Product1"
           page.should_not have_field "product_name", :with => "Product2"
         end
+
+        describe "clicking the 'Remove Filter' link" do
+          before(:each) do
+            click_link "Remove Filter"
+          end
+
+          it "removes the filter from the list of applied filters" do
+            page.should_not have_text "Name Equals Product1"
+          end
+
+          it "displays the 'loading' splash" do
+            page.should have_selector "div.loading", :text => "Loading Products..."
+          end
+
+          it "loads appropriate products" do
+            page.should have_field "product_name", :with => "Product1"
+            page.should have_field "product_name", :with => "Product2"
+          end
+        end
       end
     end
   end
diff --git a/spec/javascripts/unit/bulk_product_update_spec.js.coffee b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
index c1cdd8958a..859bbdc4af 100644
--- a/spec/javascripts/unit/bulk_product_update_spec.js.coffee
+++ b/spec/javascripts/unit/bulk_product_update_spec.js.coffee
@@ -931,8 +931,8 @@ describe "AdminBulkProductsCtrl", ->
         spyOn(scope, "fetchProducts").andReturn "nothing"
         filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product1"}
         filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product2"}
-        scope.addFilter(filterObject1)
-        scope.addFilter(filterObject2)
+        scope.addFilter filterObject1
+        scope.addFilter filterObject2
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
       it "ignores objects sent to addFilter() which do not contain a 'property' with a corresponding key in filterableColumns", ->
@@ -940,9 +940,9 @@ describe "AdminBulkProductsCtrl", ->
         filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1"}
         filterObject2 = {property: scope.filterableColumns[1], predicate: scope.filterTypes[0], value: "value2"}
         filterObject3 = {property: "some_random_property", predicate: scope.filterTypes[0], value: "value3"}
-        scope.addFilter(filterObject1)
-        scope.addFilter(filterObject2)
-        scope.addFilter(filterObject3)
+        scope.addFilter filterObject1
+        scope.addFilter filterObject2
+        scope.addFilter filterObject3
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
       it "ignores objects sent to addFilter() which do not contain a query with a corresponding key in filterTypes", ->
@@ -950,9 +950,9 @@ describe "AdminBulkProductsCtrl", ->
         filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1"}
         filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[1], value: "value2"}
         filterObject3 = {property: scope.filterableColumns[0], predicate: "something", value: "value3"}
-        scope.addFilter(filterObject1)
-        scope.addFilter(filterObject2)
-        scope.addFilter(filterObject3)
+        scope.addFilter filterObject1
+        scope.addFilter filterObject2
+        scope.addFilter filterObject3
         expect(scope.currentFilters).toEqual [filterObject1, filterObject2]
 
       it "calls fetchProducts when adding a new filter", ->
@@ -960,6 +960,27 @@ describe "AdminBulkProductsCtrl", ->
         scope.addFilter( { property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "value1" } )
         expect(scope.fetchProducts.calls.length).toEqual(1)
 
+    describe "removing a filter from the filter list", ->
+      filterObject1 = filterObject2 = null
+
+      beforeEach ->
+        filterObject1 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product1"}
+        filterObject2 = {property: scope.filterableColumns[0], predicate: scope.filterTypes[0], value: "Product2"}
+        scope.currentFilters = [ filterObject1, filterObject2 ]
+
+      it "removes the specified filter from $scope.currentFilters and calls fetchProducts", ->
+        spyOn(scope, "fetchProducts").andReturn "nothing"
+        scope.removeFilter filterObject1
+        expect(scope.currentFilters).toEqual [ filterObject2 ]
+        expect(scope.fetchProducts.calls.length).toEqual 1
+
+      it "ignores filters which do not exist in currentFilters", ->
+        spyOn(scope, "fetchProducts").andReturn "nothing"
+        filterObject3 = {property: scope.filterableColumns[1], predicate: scope.filterTypes[1], value: "SomethingElse"}
+        scope.removeFilter filterObject3
+        expect(scope.currentFilters).toEqual [ filterObject1, filterObject2 ]
+        expect(scope.fetchProducts.calls.length).toEqual 0
+
 
 describe "converting arrays of objects with ids to an object with ids as keys", ->
   it "returns an object", ->

From 49b9b8f635c5b7a342960d7041bfbbf9760a9907 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Sun, 5 Jan 2014 19:17:50 +0800
Subject: [PATCH 060/100] Add messages to BPE interface for cases when 0 or >
 500 products are found

---
 .../admin/bulk_product_update.js.coffee           |  1 -
 .../spree/admin/products/bulk_edit.html.haml      |  6 +++++-
 spec/features/admin/bulk_product_update_spec.rb   | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index d3749c9f6c..9489411142 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -185,7 +185,6 @@ productsApp.controller "AdminBulkProductsCtrl", [
 
 
     $scope.fetchProducts = -> # WARNING: returns a promise
-      #apply current filters
       $scope.loading = true
       queryString = $scope.currentFilters.reduce (qs,f) ->
         return qs + "q[#{f.property.db_column}_#{f.predicate.predicate}]=#{f.value};"
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 8be3c35e29..3a946a8c46 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -45,7 +45,11 @@
   %hr
   %div.loading{ 'ng-show' => 'loading' }
     %h4 Loading Products...
-  %div{ 'ng-hide' => 'loading' }
+  %div{ 'ng-show' => '!loading && products.length == 0' }
+    %h4{ :style => 'color:red;' } No matching products found.
+  %div{ 'ng-show' => 'products.length == 500' }
+    %h6 Search returned too many products to display (500+), please apply more search filters to reduce the number of matching products
+  %div{ 'ng-hide' => 'loading || products.length == 500 || products.length == 0' }
     %div.column_toggle
       %h5 Toggle Columns
       %input{ :type => 'button', :value => 'Toggle Columns', 'ofn-toggle-column-list' => true }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 8e2e3b6e96..17f4bfe53d 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -39,6 +39,20 @@ feature %q{
       page.should have_field "product_name", with: p2.name, :visible => true
     end
 
+    it "displays a message when number of products is zero" do
+      visit '/admin/products/bulk_edit'
+
+      page.should have_text "No matching products found."
+    end
+
+    it "displays a message when number of products is too great" do
+      501.times{ FactoryGirl.create(:simple_product) }
+
+      visit '/admin/products/bulk_edit'
+
+      page.should have_text "Search returned too many products to display (500+), please apply more search filters to reduce the number of matching products"
+    end
+
     it "displays pagination information" do
       p1 = FactoryGirl.create(:product)
       p2 = FactoryGirl.create(:product)
@@ -508,6 +522,7 @@ feature %q{
   describe "using the page" do
     describe "using column display toggle" do
       it "shows a column display toggle button, which shows a list of columns when clicked" do
+        FactoryGirl.create(:simple_product)
         login_to_admin_section
 
         visit '/admin/products/bulk_edit'

From dd1b3311d72b91c73b88af9a28079ef8799f3c36 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Mon, 6 Jan 2014 15:23:21 +1100
Subject: [PATCH 061/100] Removing all the old order populator stuff

---
 app/assets/images/matte.png                   | Bin 0 -> 1434 bytes
 .../javascripts/darkswarm/overrides.js.coffee |  20 ++++++++++++++++++
 app/controllers/shop_controller.rb            |   2 ++
 app/controllers/suburbs_controller.rb         |   2 +-
 app/views/shop/_products.html.haml            |   2 +-
 app/views/shop/show.html.haml                 |   7 ++++--
 spec/controllers/shop_controller_spec.rb      |  17 +++++++++++++++
 spec/features/consumer/shopping_spec.rb       |  19 +++++++++++++++++
 8 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/images/matte.png
 create mode 100644 app/assets/javascripts/darkswarm/overrides.js.coffee

diff --git a/app/assets/images/matte.png b/app/assets/images/matte.png
new file mode 100644
index 0000000000000000000000000000000000000000..845642cab2f758d59b7ac21ec37cf38cccab3944
GIT binary patch
literal 1434
zcmeAS@N?(olHy`uVBq!ia0vp^tUzqS!2~4FYNzf3Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&saCvz|c^^%uLVF
z#MI2pP)EVYz|ctF0Eo<V4Na^}&8&>f6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(
zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}N%^HE
zwn{*kLcEY$05>+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y
zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ@J&q4%mWE%
zf_3=%T6yLbmn7yTr+T{BDgn*V%gju%GBL9-GP86xH#0N=hP$h=g_*0XtGSV}g`<(9
zp|hJ4Os`9Ra%paAUI|QZ3PP_1PQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$iU#c3W?
zZwhX=08<POf9L}pqYsK&q^O1o0n-nN2~W5{4m|0n<^j`t5inuf+^C+!z`(@g>Eakt
zacfG@&7xZl0(WkDt1l=J`~N?1UC|?vGL7bmtS_cr*!WU3w6cHRmg17{UwD?DWPfgR
z{_`rGdY$Q;*1cZ$y5|0OoAvLj@0svA1$nLg`uO95_n)PWa&L>d8qPnz^YyM{Gv0j^
za1xlf=l=T@_jAk^205^r#k))l;R<|fA#--#>wEdzbxwB}dOa=|V35)1>A0TCSzuY4
zdpV%YvSJ_ql}$R=Uz>(UIm^$uz~ptBJ#zP5Kh4tJcQt<gF_mIY;Rp{ZGGX7xU%>O2
zopJr@S2b1(>v!K>G;wlbqx_D(?mf)4JsWT4ggyEBv0}~aW3Se);_~S}>ZG0eIW+XJ
zd;rtbb<4LG$|#C`zFGH2k<*~TdD2zprv+RB9bO&vR;@N0cC4OzHtVcg@n63w6Q<P3
zDhO(<5K@qDKln@EMSvyNK0vTOBK?+`Z}6M$$q$+hn<d|#Ir8GqzosWblII*175U~S
zxLr|tB-o~S&o%Op_o06a`4=Witogrzcj^W9kCXpjw=a;I%@Qx-T2?njA-}zLmhf@I
zd#kT<#gzQ~^K*Tq{ojV-6H6-lv^RWbUShy8bus&$=@K*BZ$E14UzQ!UZtA`F-xEA1
zv2-u^{nEV8JNx(q#SdR6%R6}<->SX%OHqSei^4@e-6bx@ZH~IHH0}01i`;fIZ{waU
zqac>c8+ItJj?Z{{{?Mx2bJN$~>-k^(zn)csq4Z4Ul*)aJeL<zAr>mdKI;Vst0L%0n
AfdBvi

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/darkswarm/overrides.js.coffee b/app/assets/javascripts/darkswarm/overrides.js.coffee
new file mode 100644
index 0000000000..6db1441f08
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/overrides.js.coffee
@@ -0,0 +1,20 @@
+Foundation.libs.section.toggle_active = (e)->
+  $this = $(this)
+  self = Foundation.libs.section
+  region = $this.parent()
+  content = $this.siblings(self.settings.content_selector)
+  section = region.parent()
+  settings = $.extend({}, self.settings, self.data_options(section))
+  prev_active_region = section.children(self.settings.region_selector).filter("." + self.settings.active_class)
+  
+  #for anchors inside [data-section-title]
+  e.preventDefault()  if not settings.deep_linking and content.length > 0
+  e.stopPropagation() #do not catch same click again on parent
+  unless region.hasClass(self.settings.active_class)
+    prev_active_region.removeClass self.settings.active_class
+    region.addClass self.settings.active_class
+    #force resize for better performance (do not wait timer)
+    self.resize region.find(self.settings.section_selector).not("[" + self.settings.resized_data_attr + "]"), true
+  else if not settings.one_up# and (self.small(section) or self.is_vertical_nav(section) or self.is_horizontal_nav(section) or self.is_accordion(section))
+    region.removeClass self.settings.active_class  
+  settings.callback section
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 33457dd7a9..36d3504c5a 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -5,6 +5,8 @@ class ShopController < BaseController
   before_filter :set_order_cycles
 
   def show
+    # All suppliers of all our products
+    @producers = Exchange.where(receiver_id: @distributor.id).map{ |ex| ex.variants.map {|v| v.product.supplier }}.flatten.uniq 
   end
   
   def products
diff --git a/app/controllers/suburbs_controller.rb b/app/controllers/suburbs_controller.rb
index 21c4040d22..4fe73f29d8 100644
--- a/app/controllers/suburbs_controller.rb
+++ b/app/controllers/suburbs_controller.rb
@@ -2,4 +2,4 @@ class SuburbsController < ActionController::Base
   def index
     @suburbs = Suburb.matching(params[:term]).order(:name).limit(8)
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 245f6eee80..e7fbf55055 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -12,7 +12,7 @@
       %tbody{"ng-repeat" => "product in data.products "}
         %tr.product
           %td
-            %img{src: "{{ product.master.images[0].small_url }}"}
+            -#%img{src: "{{ product.master.images[0].small_url }}"}
             -#{{product.master.images[0].alt}}
           %td
             %h5
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 2c4532478c..2e874ed521 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -5,7 +5,8 @@
       %h4
         = @distributor.name
       %location= @distributor.address.city
-      %small Change location
+      %small
+        %a{href: "/"} Change location
       = render partial: "shop/order_cycles"
 
       -#%description
@@ -23,7 +24,9 @@
           %p.title.avenir{"data-section-title" => ""}
             %a{href: "#producers"} Our Producers 
           .content{"data-section-content" => ""}
-            %p Content of section 2.
+            %ul
+              - for producer in @producers
+                %li= producer.name
 
         %section
           %p.title.avenir{"data-section-title" => ""}
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 8f355c259b..5f2a677679 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -8,6 +8,7 @@ describe ShopController do
     response.should redirect_to root_path
   end
 
+
   describe "with a distributor in place" do
     before do
       controller.stub(:current_distributor).and_return d
@@ -56,6 +57,22 @@ describe ShopController do
     end
 
 
+    describe "producers/suppliers" do
+      let(:supplier) { create(:supplier_enterprise) }
+      let(:product) { create(:product, supplier: supplier) }
+      let(:order_cycle) { create(:order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
+
+      before do
+        exchange = Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id) 
+        exchange.variants << product.master
+      end
+
+      it "builds a list of producers/suppliers" do
+        spree_get :show
+        assigns[:producers].should == [supplier]
+      end
+    end
+
     describe "returning products" do
       let(:product) { create(:product) }
       let(:order_cycle) { create(:order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index e5bd0c3cc7..9a136df99d 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -17,6 +17,25 @@ feature "As a consumer I want to shop with a distributor", js: true do
       page.should have_text distributor.name
     end
 
+    describe "With products in order cycles" do
+      let(:supplier) { create(:supplier_enterprise) }
+      let(:product) { create(:product, supplier: supplier) }
+      let(:order_cycle) { create(:order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise)) }
+
+      before do
+        exchange = Exchange.find(order_cycle.exchanges.to_enterprises(distributor).outgoing.first.id) 
+        exchange.variants << product.master
+      end
+
+      it "shows the suppliers/producers for a distributor" do
+        visit shop_path
+        click_link "Our Producers"
+        page.should have_content supplier.name 
+      end
+
+    end
+
+
     describe "selecting an order cycle" do
       it "selects an order cycle if only one is open" do
         # create order cycle

From 1264af584cbbf78beee020b5e8d0f9725abae515 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Mon, 6 Jan 2014 15:56:28 +1100
Subject: [PATCH 062/100] Removing a pointless test

---
 spec/models/order_cycle_spec.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb
index 0a38b2bfc7..9b024b058e 100644
--- a/spec/models/order_cycle_spec.rb
+++ b/spec/models/order_cycle_spec.rb
@@ -30,13 +30,6 @@ describe OrderCycle do
     oc.exchanges.count.should == 3
   end
 
-  it "gives me the outgoing exchange" do
-    d = create(:distributor_enterprise)
-    oc = create(:simple_order_cycle, distributors: [d])
-    
-    oc.sender.should == d
-  end
-
   it "finds order cycles in various stages of their lifecycle" do
     oc_active = create(:simple_order_cycle, orders_open_at: 1.week.ago, orders_close_at: 1.week.from_now)
     oc_not_yet_open = create(:simple_order_cycle, orders_open_at: 1.week.from_now, orders_close_at: 2.weeks.from_now)

From 9677ec71598395538cabf62b93cf483f57cfc283 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Mon, 6 Jan 2014 16:27:41 +1100
Subject: [PATCH 063/100] Starting to build mixins

---
 app/assets/stylesheets/darkswarm/mixins.sass  |  8 +++
 .../stylesheets/darkswarm/shop.css.sass       | 54 ++-----------------
 app/views/shop/_products.html.haml            |  7 +--
 3 files changed, 17 insertions(+), 52 deletions(-)
 create mode 100644 app/assets/stylesheets/darkswarm/mixins.sass

diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass
new file mode 100644
index 0000000000..70554bac29
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/mixins.sass
@@ -0,0 +1,8 @@
+@import typography
+
+@mixin big-input 
+  border: 1px solid #999
+  font-size: 18px
+  @extend .avenir
+  padding: 18px
+  margin-bottom: 1.25em
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 110da55d12..79bc00306b 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -1,56 +1,12 @@
+@import mixins
+
 product
   display: block 
 
-
-shop
-  color: #666
-  display: block
-  navigation
-    display: block
-    background: #f6efe5
-    distributor.details
-      box-sizing: border-box
-      display: block
-      height: 150px
-      padding: 40px 0px 0px
-      select
-        width: 200px
-      position: relative
-      img
-        display: block
-        height: 100px
-        width: 100px
-        margin-right: 12px
-      location
-        font-family: "AvenirBla_IE", "AvenirBla"
-        padding-right: 16px
-      ordercycle
-        display: block
-        position: absolute
-        right: 0px
-        top: 40px
-        form.custom 
-          width: 400px
-          text-align: right
-          & > strong
-            line-height: 2.5
-            font-size: 1.29em
-            padding-right: 14px
-          .custom.dropdown
-            width: 280px
-            display: inline-block
-            background: transparent
-            border-width: 2px
-            border-color: #666666
-            font-size: 1.28em 
-            margin-bottom: 0
-        closing
-          font-size: 0.875em
-product
-  display: block 
-
-
 shop
+  #search
+    font-size: 2em
+    @include big-input
   color: #666
   display: block
   navigation
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index e7fbf55055..1d76f80b1b 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -1,5 +1,6 @@
 %products{"ng-controller" => "ProductsCtrl"}
   = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do
+    %input#search.text{"ng-model" => "query", placeholder: "Search"}
     %input.button.right{type: :submit, value: "Check Out"}
     %table
       %thead
@@ -9,11 +10,11 @@
         %th QTY
         %th Bulk
         %th Price
-      %tbody{"ng-repeat" => "product in data.products "}
+      %tbody{"ng-repeat" => "product in data.products | filter:query"}
         %tr.product
           %td
-            -#%img{src: "{{ product.master.images[0].small_url }}"}
-            -#{{product.master.images[0].alt}}
+            %img{src: "{{ product.master.images[0].small_url }}"}
+            {{product.master.images[0].alt}}
           %td
             %h5
               {{ product.name }}

From 177782fac58cebfd79e49f6d267200776272d163 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Mon, 6 Jan 2014 18:20:00 +0800
Subject: [PATCH 064/100] Status message works when updating products with
 filters applied

---
 .../admin/bulk_product_update.js.coffee       | 16 +++++++++++++--
 .../admin/products_controller_decorator.rb    |  9 +++++++--
 .../admin/bulk_product_update_spec.rb         | 20 +++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 9489411142..a56eefd83b 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -308,9 +308,13 @@ productsApp.controller "AdminBulkProductsCtrl", [
       $http(
         method: "POST"
         url: "/admin/products/bulk_update"
-        data: productsToSubmit
+        data:
+          products: productsToSubmit
+          filters: $scope.currentFilters
       ).success((data) ->
-        if angular.toJson($scope.productsWithoutDerivedAttributes()) == angular.toJson(data)
+        #if angular.toJson($scope.productsWithoutDerivedAttributes()) == angular.toJson(data)
+        # TODO: remove this check altogether, need to write controller tests if we want to test this behaviour properly
+        if subset($scope.productsWithoutDerivedAttributes(),data)
           $scope.resetProducts data
           $timeout -> $scope.displaySuccess()
         else
@@ -508,3 +512,11 @@ toObjectWithIDKeys = (array) ->
       object[array[i].id].variants = toObjectWithIDKeys(array[i].variants)  if array[i].hasOwnProperty("variants") and array[i].variants instanceof Array
   
   object
+
+subset = (bigArray,smallArray) ->
+  if smallArray instanceof Array && bigArray instanceof Array && smallArray.length > 0
+    for item in smallArray
+      return false if angular.toJson(bigArray).indexOf(angular.toJson(item)) == -1
+    return true
+  else
+    return false
\ No newline at end of file
diff --git a/app/controllers/spree/admin/products_controller_decorator.rb b/app/controllers/spree/admin/products_controller_decorator.rb
index e5c61ada05..a6c2967b87 100644
--- a/app/controllers/spree/admin/products_controller_decorator.rb
+++ b/app/controllers/spree/admin/products_controller_decorator.rb
@@ -11,11 +11,16 @@ Spree::Admin::ProductsController.class_eval do
   end
 
   def bulk_update
-    collection_hash = Hash[params[:_json].each_with_index.map { |p,i| [i,p] }]
+    collection_hash = Hash[params[:products].each_with_index.map { |p,i| [i,p] }]
     product_set = Spree::ProductSet.new({:collection_attributes => collection_hash})
 
+    params[:filters] ||= {}
+    bulk_index_query = params[:filters].reduce("") do |string, filter|
+      "#{string}q[#{filter[:property][:db_column]}_#{filter[:predicate][:predicate]}]=#{filter[:value]};"
+    end
+
     if product_set.save
-      redirect_to "/api/products/managed?template=bulk_index&page=1&per_page=500"
+      redirect_to "/api/products/managed?template=bulk_index;page=1;per_page=500;#{bulk_index_query}"
     else
       render :nothing => true, :status => 418
     end
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 17f4bfe53d..a43514009f 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -400,6 +400,26 @@ feature %q{
     Capybara.default_wait_time = 5
   end
 
+  describe "updating when a filter has been applied" do
+    it "works" do
+      p1 = FactoryGirl.create(:simple_product, :name => "product1")
+      p2 = FactoryGirl.create(:simple_product, :name => "product2")
+      login_to_admin_section
+
+      visit '/admin/products/bulk_edit'
+
+      select "Name", :from => "filter_property"
+      select "Contains", :from => "filter_predicate"
+      fill_in "filter_value", :with => "1"
+      click_button "Apply Filter"
+      page.should_not have_field "product_name", with: p2.name
+      fill_in "product_name", :with => "new product1"
+
+      click_on 'Update'
+      page.find("span#update-status-message").should have_content "Update complete"
+    end
+  end
+
   scenario "updating a product when there are more products than the default API page size" do
     26.times { FactoryGirl.create(:simple_product) }
     login_to_admin_section

From 8e0a7d907276febde2dce8f7255c26628a98725d Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 7 Jan 2014 11:04:40 +1100
Subject: [PATCH 065/100] Pretties, fixing the email validation issue with
 admin authentication steps

---
 app/assets/images/logo.png                    | Bin 0 -> 3139 bytes
 app/assets/stylesheets/darkswarm/footer.sass  |  12 +++++
 .../stylesheets/darkswarm/shop.css.sass       |  45 +-----------------
 .../stylesheets/darkswarm/variables.css.sass  |   1 +
 app/views/enterprises/_about_us.html.haml     |   1 -
 app/views/enterprises/_contact_us.html.haml   |   1 -
 app/views/shared/_copyright.html.haml         |   3 ++
 app/views/shop/_about_us.html.haml            |   3 ++
 app/views/shop/_contact_us.html.haml          |   8 ++++
 app/views/shop/show.html.haml                 |   8 ++--
 .../admin/bulk_product_update_spec.rb         |   2 +-
 .../request/authentication_workflow.rb        |   5 +-
 12 files changed, 37 insertions(+), 52 deletions(-)
 create mode 100644 app/assets/images/logo.png
 create mode 100644 app/assets/stylesheets/darkswarm/footer.sass
 create mode 100644 app/assets/stylesheets/darkswarm/variables.css.sass
 delete mode 100644 app/views/enterprises/_about_us.html.haml
 delete mode 100644 app/views/enterprises/_contact_us.html.haml
 create mode 100644 app/views/shared/_copyright.html.haml
 create mode 100644 app/views/shop/_about_us.html.haml
 create mode 100644 app/views/shop/_contact_us.html.haml

diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..aca7aac1dc200f071bf056e1dbfdf0ff4c62697c
GIT binary patch
literal 3139
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
O*Lots70<T|KKdW*wpK3y

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/darkswarm/footer.sass b/app/assets/stylesheets/darkswarm/footer.sass
new file mode 100644
index 0000000000..fea9689201
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/footer.sass
@@ -0,0 +1,12 @@
+@import variables
+
+#footer
+  padding: 74px 0px
+  background: $fawn
+  margin-top: 85px
+
+  #copyright 
+    clear: both
+    img
+      display: block
+      margin: 0px auto 8px
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 79bc00306b..0d6137fb3a 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -1,4 +1,5 @@
 @import mixins
+@import variables
 
 product
   display: block 
@@ -11,7 +12,7 @@ shop
   display: block
   navigation
     display: block
-    background: #f6efe5
+    background: $fawn 
     distributor.details
       box-sizing: border-box
       display: block
@@ -101,45 +102,3 @@ shop
           float: right
           padding-top: 14px
 
-  tabs
-    background: url("/assets/matte.png") top left repeat
-    display: block
-    .section-container.auto
-      margin-bottom: 0
-      & > section 
-        & > .content
-          background: none
-          border: none
-        & > .title, &.active > .title
-          text-transform: uppercase
-          line-height: 50px
-          border: none
-          &, &:hover
-            background: none
-          a
-            padding: 0px 2.2em
-
-  products
-    display: block
-    padding-top: 36px
-    table
-      width: 100%
-      border-collapse: collapse
-      border: none
-      th
-        line-height: 50px
-      .notes
-        max-width: 300px
-      td, th
-        background: #fff
-        border: 1px solid #cccccc
-        border-left: 0px
-        border-right: 0px
-      td
-        padding: 20px 0px
-      input[type=number]
-        width: 60px
-        margin: 0px
-      
-
-
diff --git a/app/assets/stylesheets/darkswarm/variables.css.sass b/app/assets/stylesheets/darkswarm/variables.css.sass
new file mode 100644
index 0000000000..a13eb9d014
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/variables.css.sass
@@ -0,0 +1 @@
+$fawn: #f6efe5 
diff --git a/app/views/enterprises/_about_us.html.haml b/app/views/enterprises/_about_us.html.haml
deleted file mode 100644
index 24cffec25e..0000000000
--- a/app/views/enterprises/_about_us.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-About Us
diff --git a/app/views/enterprises/_contact_us.html.haml b/app/views/enterprises/_contact_us.html.haml
deleted file mode 100644
index bb7297252b..0000000000
--- a/app/views/enterprises/_contact_us.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-Contact Us
diff --git a/app/views/shared/_copyright.html.haml b/app/views/shared/_copyright.html.haml
new file mode 100644
index 0000000000..271ba90c41
--- /dev/null
+++ b/app/views/shared/_copyright.html.haml
@@ -0,0 +1,3 @@
+#copyright.text-center
+  %img.copyright{src: "/assets/logo.png", alt: "Open Food Network"}
+  &copy; Copyright 2013 Open Food Foundation
diff --git a/app/views/shop/_about_us.html.haml b/app/views/shop/_about_us.html.haml
new file mode 100644
index 0000000000..74ef2eaa47
--- /dev/null
+++ b/app/views/shop/_about_us.html.haml
@@ -0,0 +1,3 @@
+.about.right.text-right.small-2.large-3.columns
+  %h3 About Us
+  %p= @distributor.long_description.andand.html_safe
diff --git a/app/views/shop/_contact_us.html.haml b/app/views/shop/_contact_us.html.haml
new file mode 100644
index 0000000000..2cb4d65984
--- /dev/null
+++ b/app/views/shop/_contact_us.html.haml
@@ -0,0 +1,8 @@
+.contact.small-2.large-3.columns
+  %h3 Contact
+  %ul
+    %li= @distributor.email
+    %li= @distributor.website
+  = @distributor.address.address1
+  = @distributor.address.address2
+  = @distributor.address.city
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index 2e874ed521..a4d54423b6 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -43,6 +43,8 @@
     
   %products.row
     = render partial: "shop/products"
-
-  -#= render partial: "enterprises/contact_us"
-  -#= render partial: "enterprises/about_us"
+  #footer
+    %section.row
+      = render partial: "shop/contact_us"
+      = render partial: "shop/about_us"
+      = render partial: "shared/copyright"
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 53fd4823b1..9992fd6d83 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -390,7 +390,7 @@ feature %q{
         page.should have_selector "a.clone-product", :count => 3
 
         first("a.clone-product").click
-
+        sleep 5
         page.should have_selector "a.clone-product", :count => 4
         page.should have_field "product_name", with: "COPY OF #{p1.name}"
         page.should have_select "supplier", selected: "#{p1.supplier.name}"
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 850157e2a0..3bcdabfcf2 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -1,13 +1,12 @@
 module AuthenticationWorkflow
   def login_to_admin_section
     admin_role = Spree::Role.find_or_create_by_name!('admin')
-    admin_user = Spree::User.create!({
-      :email => 'admin@ofn.org',
+    admin_user = create(:user, 
       :password => 'passw0rd',
       :password_confirmation => 'passw0rd',
       :remember_me => false,
       :persistence_token => 'pass',
-      :login => 'admin@ofn.org'})
+      :login => 'admin@ofn.org')
 
     admin_user.spree_roles << admin_role
 

From 641b7dcdf4a1b2ffad61275ef1522ce4a43e85f2 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 7 Jan 2014 11:05:10 +1100
Subject: [PATCH 066/100] Removing the image serializer, causing regression
 bugs

---
 app/serializers/spree/image_serializer.rb | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 app/serializers/spree/image_serializer.rb

diff --git a/app/serializers/spree/image_serializer.rb b/app/serializers/spree/image_serializer.rb
deleted file mode 100644
index 07e86eacb6..0000000000
--- a/app/serializers/spree/image_serializer.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module Spree
-
-  class ImageSerializer < ActiveModel::Serializer
-    attributes :id, :small_url, :alt
-
-    def small_url
-      object.attachment.url(:small, false)
-    end
-  end
-end

From 32c7682da2e07c06688f7273e1657f25ab94d889 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 7 Jan 2014 11:12:44 +1100
Subject: [PATCH 067/100] Removing the serializers to fix regression issues

---
 app/serializers/enterprise_serializer.rb    | 3 ---
 app/serializers/order_cycle_serializer.rb   | 3 ---
 app/serializers/spree/product_serializer.rb | 8 --------
 app/serializers/spree/variant_serializer.rb | 7 -------
 4 files changed, 21 deletions(-)
 delete mode 100644 app/serializers/enterprise_serializer.rb
 delete mode 100644 app/serializers/order_cycle_serializer.rb
 delete mode 100644 app/serializers/spree/product_serializer.rb
 delete mode 100644 app/serializers/spree/variant_serializer.rb

diff --git a/app/serializers/enterprise_serializer.rb b/app/serializers/enterprise_serializer.rb
deleted file mode 100644
index 5b6be8ecbe..0000000000
--- a/app/serializers/enterprise_serializer.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class EnterpriseSerializer < ActiveModel::Serializer
-  attributes :id, :name, :description
-end
diff --git a/app/serializers/order_cycle_serializer.rb b/app/serializers/order_cycle_serializer.rb
deleted file mode 100644
index 10efb7e165..0000000000
--- a/app/serializers/order_cycle_serializer.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class OrderCycleSerializer < ActiveModel::Serializer
-  attributes :orders_close_at, id: :order_cycle_id
-end
diff --git a/app/serializers/spree/product_serializer.rb b/app/serializers/spree/product_serializer.rb
deleted file mode 100644
index d230e51031..0000000000
--- a/app/serializers/spree/product_serializer.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Spree
-  class ProductSerializer < ActiveModel::Serializer
-    attributes :id, :name, :description, :price, :permalink
-    has_one :master
-    has_one :supplier
-    has_many :variants
-  end
-end
diff --git a/app/serializers/spree/variant_serializer.rb b/app/serializers/spree/variant_serializer.rb
deleted file mode 100644
index 37193a264c..0000000000
--- a/app/serializers/spree/variant_serializer.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Spree
-  class VariantSerializer < ActiveModel::Serializer
-    attributes :id, :is_master, :count_on_hand, :options_text
-    has_many :images
-  end
-end
-

From 4d03f657663166f0f36ffb1b0088ef7af96f013a Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 7 Jan 2014 15:06:47 +1100
Subject: [PATCH 068/100] Reworking everything to use RABL

---
 .../javascripts/darkswarm/shop.js.coffee      |  1 +
 app/controllers/shop_controller.rb            | 17 +++++----
 app/views/shop/_order_cycle.rabl              |  3 ++
 app/views/shop/_order_cycles.html.haml        |  2 +-
 app/views/shop/_products.html.haml            |  5 ++-
 app/views/shop/products.rabl                  | 25 +++++++++++++
 config/routes.rb                              |  1 +
 spec/controllers/shop_controller_spec.rb      | 37 ++++++++++++++-----
 spec/features/consumer/shopping_spec.rb       |  4 +-
 9 files changed, 73 insertions(+), 22 deletions(-)
 create mode 100644 app/views/shop/_order_cycle.rabl
 create mode 100644 app/views/shop/products.rabl

diff --git a/app/assets/javascripts/darkswarm/shop.js.coffee b/app/assets/javascripts/darkswarm/shop.js.coffee
index 3b30e222d6..85c94211e6 100644
--- a/app/assets/javascripts/darkswarm/shop.js.coffee
+++ b/app/assets/javascripts/darkswarm/shop.js.coffee
@@ -5,6 +5,7 @@ window.Shop = angular.module("Shop", ["ngResource", "filters"]).config ($httpPro
 
 angular.module("filters", []).filter "truncate", ->
   (text, length, end) ->
+    text = text || ""
     length = 10  if isNaN(length)
     end = "..."  if end is `undefined`
     if text.length <= length or text.length - end.length <= length
diff --git a/app/controllers/shop_controller.rb b/app/controllers/shop_controller.rb
index 36d3504c5a..dde9af99f4 100644
--- a/app/controllers/shop_controller.rb
+++ b/app/controllers/shop_controller.rb
@@ -10,25 +10,28 @@ class ShopController < BaseController
   end
   
   def products
-    if products = current_order_cycle.andand.products_distributed_by(@distributor)
-      render json: products, root: false 
-    else
+    unless @products = current_order_cycle.andand.products_distributed_by(@distributor)
       render json: "", status: 404 
     end
   end
 
   def order_cycle
-    if oc = OrderCycle.with_distributor(@distributor).active.find_by_id(params[:order_cycle_id])
-      current_order(true).set_order_cycle! oc
-      render status: 200, json: oc
+    if request.post?
+      if oc = OrderCycle.with_distributor(@distributor).active.find_by_id(params[:order_cycle_id])
+        current_order(true).set_order_cycle! oc
+        render partial: "shop/order_cycle"
+      else
+        render status: 404, json: ""
+      end
     else
-      render status: 404, json: ""
+      render partial: "shop/order_cycle"
     end
   end
 
   private
 
   def set_distributor
+
     unless @distributor = current_distributor 
       redirect_to root_path
     end
diff --git a/app/views/shop/_order_cycle.rabl b/app/views/shop/_order_cycle.rabl
new file mode 100644
index 0000000000..493dee1de2
--- /dev/null
+++ b/app/views/shop/_order_cycle.rabl
@@ -0,0 +1,3 @@
+object current_order_cycle
+attributes :orders_close_at
+attribute :id => :order_cycle_id
diff --git a/app/views/shop/_order_cycles.html.haml b/app/views/shop/_order_cycles.html.haml
index 4b0a7b4bbd..60d5997cf3 100644
--- a/app/views/shop/_order_cycles.html.haml
+++ b/app/views/shop/_order_cycles.html.haml
@@ -1,7 +1,7 @@
 %ordercycle{"ng-controller" => "OrderCycleCtrl"}
 
   :javascript
-    angular.module('Shop').value('orderCycleData', #{OrderCycleSerializer.new(current_order_cycle).to_json})
+    angular.module('Shop').value('orderCycleData', #{render "shop/order_cycle"})
 
 
   - if @order_cycles.empty?
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 1d76f80b1b..034cd53ab6 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -13,13 +13,14 @@
       %tbody{"ng-repeat" => "product in data.products | filter:query"}
         %tr.product
           %td
-            %img{src: "{{ product.master.images[0].small_url }}"}
-            {{product.master.images[0].alt}}
+            -#%img{src: "{{ product.master.images[0].small_url }}"}
+            -#{{product.master.images[0].alt}}
           %td
             %h5
               {{ product.name }}
             {{ product.supplier.name }}
           %td.notes {{ product.description | truncate:80 }}
+
           %td {{ product.master.options_text }}
           %td 
             %input{type: :number, value: 0, min: 0, name: "variants[{{product.master.id}}]"}
diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
new file mode 100644
index 0000000000..7d245447e9
--- /dev/null
+++ b/app/views/shop/products.rabl
@@ -0,0 +1,25 @@
+collection @products
+attributes :id, :name, :description, :price, :permalink
+
+child :supplier do
+  attributes :id, :name, :description
+end
+child :master => :master do
+  attributes :id, :is_master, :count_on_hand, :options_text
+  child :images => :images do
+    attributes :id, :alt
+    node do |img|
+      {:small_url => img.attachment.url(:small, false)}
+    end
+  end
+end
+child :variants => :variants do |variant|
+  attributes :id, :is_master, :count_on_hand, :options_text
+  child :images => :images do
+    attributes :id, :alt
+    node do |img|
+      {:small_url => img.attachment.url(:small, false)}
+    end
+  end
+end
+
diff --git a/config/routes.rb b/config/routes.rb
index 7a67be8d06..6e05b80384 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,6 +5,7 @@ Openfoodnetwork::Application.routes.draw do
   resource :shop, controller: :shop do
     get :products
     post :order_cycle
+    get :order_cycle
   end
 
   resources :enterprises do
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 5f2a677679..71f776163a 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -37,14 +37,27 @@ describe ShopController do
         controller.current_order_cycle.should == oc2
       end
 
-      it "should return the order cycle details when the oc is selected" do
-        oc1 = create(:order_cycle, distributors: [d])
-        oc2 = create(:order_cycle, distributors: [d])
-        
-        spree_post :order_cycle, order_cycle_id: oc2.id
-        response.body.should have_content OrderCycleSerializer.new(oc2).to_json
+      context "RABL tests" do
+        render_views 
+        it "should return the order cycle details when the oc is selected" do
+          oc1 = create(:order_cycle, distributors: [d])
+          oc2 = create(:order_cycle, distributors: [d])
+          
+          spree_post :order_cycle, order_cycle_id: oc2.id
+          response.should be_success
+          response.body.should have_content oc2.id 
+        end
+
+        it "should return the current order cycle when hit with GET" do
+          oc1 = create(:order_cycle, distributors: [d])
+          controller.stub(:current_order_cycle).and_return oc1
+          spree_get :order_cycle
+          response.body.should have_content oc1.id
+        end
+
       end
 
+
       it "should not allow the user to select an invalid order cycle" do
         oc1 = create(:order_cycle, distributors: [d])
         oc2 = create(:order_cycle, distributors: [d])
@@ -95,11 +108,15 @@ describe ShopController do
         response.body.should be_empty
       end
 
-      it "only returns products for the current order cycle" do
-        controller.stub(:current_order_cycle).and_return order_cycle
-        xhr :get, :products
-        response.body.should == [Spree::ProductSerializer.new(product)].to_json
+      context "RABL tests" do
+        render_views
+        it "only returns products for the current order cycle" do
+          controller.stub(:current_order_cycle).and_return order_cycle
+          xhr :get, :products
+          response.body.should have_content product.name
+        end
       end
+
     end
   end
 end
diff --git a/spec/features/consumer/shopping_spec.rb b/spec/features/consumer/shopping_spec.rb
index 9a136df99d..bbf127f1cb 100644
--- a/spec/features/consumer/shopping_spec.rb
+++ b/spec/features/consumer/shopping_spec.rb
@@ -108,8 +108,8 @@ feature "As a consumer I want to shop with a distributor", js: true do
           select "frogs", :from => "order_cycle_id"
         end
         it "should let us add products to our cart" do
-          fill_in "quantity_variant_#{variant.id}", with: "1"
-          find("form.custom > input.button.right:first-child").click
+          fill_in "variants[#{variant.id}]", with: "1"
+          first("form.custom > input.button.right").click
           current_path.should == "/cart" 
           page.should have_content product.name
         end

From 936d80b2c55ef702b2d9769e3f19a8f6cb311676 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 7 Jan 2014 15:16:36 +1100
Subject: [PATCH 069/100] Removing a redundant test: no longer show current
 distributor and order cycle

---
 .../features/consumer/browse_products_spec.rb | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/spec/features/consumer/browse_products_spec.rb b/spec/features/consumer/browse_products_spec.rb
index c14f290ac7..2e6e3e64af 100644
--- a/spec/features/consumer/browse_products_spec.rb
+++ b/spec/features/consumer/browse_products_spec.rb
@@ -137,32 +137,4 @@ feature %q{
       end
     end
   end
-
-  describe "selecting an order cycle" do
-
-    before(:each) do
-      OrderCyclesHelper.class_eval do
-        def order_cycles_enabled?
-          true
-        end
-      end
-    end
-
-    it "displays the distributor and order cycle name on the home page when an order cycle is selected" do
-      # Given a distributor with a product
-      d = create(:distributor_enterprise, :name => 'Melb Uni Co-op')
-      p = create(:product)
-      oc = create(:simple_order_cycle, :name => 'Bulk Foods', :distributors => [d], :variants => [p.master])
-
-      # When I select the distributor and order cycle
-      visit spree.product_path p
-      select d.name, :from => 'distributor_id'
-      select oc.name, :from => 'order_cycle_id'
-      click_button 'Add To Cart'
-
-      # Then I should see the name of the distributor and order cycle that I've selected
-      page.should have_content 'Melb Uni Co-op'
-      page.should_not have_selector 'div.distributor-description'
-    end
-  end
 end

From 06ab4d53843240b1a59147b0d8f896f44e381686 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 7 Jan 2014 15:28:11 +1100
Subject: [PATCH 070/100] Patching some further regression bugs

---
 spec/features/admin/products_spec.rb    | 3 +++
 spec/features/consumer/checkout_spec.rb | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index 646ed70346..d1251eac76 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -104,6 +104,9 @@ feature %q{
         product = create(:simple_product, supplier: @supplier2)
 
         click_link 'Products'
+        within "#sub_nav" do
+          click_link 'Products'
+        end
         click_link product.name
         within('#sidebar') { click_link 'Product Distributions' }
 
diff --git a/spec/features/consumer/checkout_spec.rb b/spec/features/consumer/checkout_spec.rb
index df4ea5500b..d148133b6d 100644
--- a/spec/features/consumer/checkout_spec.rb
+++ b/spec/features/consumer/checkout_spec.rb
@@ -122,6 +122,7 @@ feature %q{
     click_button 'Add To Cart'
 
     # Then I should see a breakdown of my delivery fees:
+
     checkout_fees_table.should ==
       [["Bananas - packing fee by supplier Supplier 1", "$3.00", ""],
        ["Bananas - transport fee by supplier Supplier 1", "$4.00", ""],
@@ -565,7 +566,7 @@ feature %q{
   end
 
   def checkout_fees_table
-    table = page.find 'tbody#cart_adjustments'
+    table = page.find 'tbody'
     rows = table.all 'tr'
     rows.map { |row| row.all('td').map { |cell| cell.text.strip } }
   end

From 5e041a6f4ff5902a7d8117c0b2f40d61d2f02f09 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 8 Jan 2014 10:35:27 +1100
Subject: [PATCH 071/100] Uncommenting the old OP code

---
 app/models/spree/order_populator_decorator.rb | 152 +++++++++---------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/app/models/spree/order_populator_decorator.rb b/app/models/spree/order_populator_decorator.rb
index 6d6881bc0b..b33b538e51 100644
--- a/app/models/spree/order_populator_decorator.rb
+++ b/app/models/spree/order_populator_decorator.rb
@@ -1,102 +1,102 @@
 Spree::OrderPopulator.class_eval do
-  #def populate_with_distribution_validation(from_hash)
-    #@distributor, @order_cycle = load_distributor_and_order_cycle(from_hash)
+  def populate_with_distribution_validation(from_hash)
+    @distributor, @order_cycle = load_distributor_and_order_cycle(from_hash)
 
-    #if !distribution_can_supply_products_in_cart(@distributor, @order_cycle)
-      #errors.add(:base, "That distributor or order cycle can't supply all the products in your cart. Please choose another.")
-    #end
+    if !distribution_can_supply_products_in_cart(@distributor, @order_cycle)
+      errors.add(:base, "That distributor or order cycle can't supply all the products in your cart. Please choose another.")
+    end
 
-    ## Set order distributor and order cycle
-    #@orig_distributor, @orig_order_cycle = orig_distributor_and_order_cycle
-    #cart_distribution_set = false
-    #if valid?
-      #set_cart_distributor_and_order_cycle @distributor, @order_cycle
-      #cart_distribution_set = true
-    #end
+    # Set order distributor and order cycle
+    @orig_distributor, @orig_order_cycle = orig_distributor_and_order_cycle
+    cart_distribution_set = false
+    if valid?
+      set_cart_distributor_and_order_cycle @distributor, @order_cycle
+      cart_distribution_set = true
+    end
 
-    #populate_without_distribution_validation(from_hash) if valid?
+    populate_without_distribution_validation(from_hash) if valid?
 
-    ## Undo distribution setting if validation failed when adding a product
-    #if !valid? && cart_distribution_set
-      #set_cart_distributor_and_order_cycle @orig_distributor, @orig_order_cycle
-    #end
+    # Undo distribution setting if validation failed when adding a product
+    if !valid? && cart_distribution_set
+      set_cart_distributor_and_order_cycle @orig_distributor, @orig_order_cycle
+    end
 
-    #valid?
-  #end
-  #alias_method_chain :populate, :distribution_validation
+    valid?
+  end
+  alias_method_chain :populate, :distribution_validation
 
 
-  # Copied from Spree::OrderPopulator, with additional validations added
-  #def attempt_cart_add(variant_id, quantity)
-    #quantity = quantity.to_i
-    #variant = Spree::Variant.find(variant_id)
-    #if quantity > 0
-      #if check_stock_levels(variant, quantity) &&
-          #check_distribution_provided_for(variant) &&
-          #check_variant_available_under_distribution(variant)
+   Copied from Spree::OrderPopulator, with additional validations added
+  def attempt_cart_add(variant_id, quantity)
+    quantity = quantity.to_i
+    variant = Spree::Variant.find(variant_id)
+    if quantity > 0
+      if check_stock_levels(variant, quantity) &&
+          check_distribution_provided_for(variant) &&
+          check_variant_available_under_distribution(variant)
 
-        #@order.add_variant(variant, quantity, currency)
-      #end
-    #end
-  #end
+        @order.add_variant(variant, quantity, currency)
+      end
+    end
+  end
 
 
   private
 
-  #def orig_distributor_and_order_cycle
-    #[@order.distributor, @order.order_cycle]
-  #end
+  def orig_distributor_and_order_cycle
+    [@order.distributor, @order.order_cycle]
+  end
 
 
-  #def load_distributor_and_order_cycle(from_hash)
-    #distributor = from_hash[:distributor_id].present? ?
-                    #Enterprise.is_distributor.find(from_hash[:distributor_id]) : nil
-    #order_cycle = from_hash[:order_cycle_id].present? ?
-                     #OrderCycle.find(from_hash[:order_cycle_id]) : nil
+  def load_distributor_and_order_cycle(from_hash)
+    distributor = from_hash[:distributor_id].present? ?
+                    Enterprise.is_distributor.find(from_hash[:distributor_id]) : nil
+    order_cycle = from_hash[:order_cycle_id].present? ?
+                     OrderCycle.find(from_hash[:order_cycle_id]) : nil
 
-    #[distributor, order_cycle]
-  #end
+    [distributor, order_cycle]
+  end
 
-  #def set_cart_distributor_and_order_cycle(distributor, order_cycle)
-    ## Using @order.reload or not performing any reload causes totals fields (ie. item_total)
-    ## to be set to zero
-    #@order = Spree::Order.find @order.id
+  def set_cart_distributor_and_order_cycle(distributor, order_cycle)
+    # Using @order.reload or not performing any reload causes totals fields (ie. item_total)
+    # to be set to zero
+    @order = Spree::Order.find @order.id
 
-    #@order.set_distribution! distributor, order_cycle
-  #end
+    @order.set_distribution! distributor, order_cycle
+  end
 
-  #def distribution_can_supply_products_in_cart(distributor, order_cycle)
-    #DistributionChangeValidator.new(@order).can_change_to_distribution?(distributor, order_cycle)
-  #end
+  def distribution_can_supply_products_in_cart(distributor, order_cycle)
+    DistributionChangeValidator.new(@order).can_change_to_distribution?(distributor, order_cycle)
+  end
 
-  #def check_distribution_provided_for(variant)
-    #distribution_provided = distribution_provided_for variant
+  def check_distribution_provided_for(variant)
+    distribution_provided = distribution_provided_for variant
 
-    #unless distribution_provided
-      #if order_cycle_required_for variant
-        #errors.add(:base, "Please choose a distributor and order cycle for this order.")
-      #else
-        #errors.add(:base, "Please choose a distributor for this order.")
-      #end
-    #end
+    unless distribution_provided
+      if order_cycle_required_for variant
+        errors.add(:base, "Please choose a distributor and order cycle for this order.")
+      else
+        errors.add(:base, "Please choose a distributor for this order.")
+      end
+    end
 
-    #distribution_provided
-  #end
+    distribution_provided
+  end
 
-  #def check_variant_available_under_distribution(variant)
-    #if DistributionChangeValidator.new(@order).variants_available_for_distribution(@distributor, @order_cycle).include? variant
-      #return true
-    #else
-      #errors.add(:base, "That product is not available from the chosen distributor or order cycle.")
-      #return false
-    #end
-  #end
+  def check_variant_available_under_distribution(variant)
+    if DistributionChangeValidator.new(@order).variants_available_for_distribution(@distributor, @order_cycle).include? variant
+      return true
+    else
+      errors.add(:base, "That product is not available from the chosen distributor or order cycle.")
+      return false
+    end
+  end
 
-  #def distribution_provided_for(variant)
-    #@distributor.present? && (!order_cycle_required_for(variant) || @order_cycle.present?)
-  #end
+  def distribution_provided_for(variant)
+    @distributor.present? && (!order_cycle_required_for(variant) || @order_cycle.present?)
+  end
 
-  #def order_cycle_required_for(variant)
-    #variant.product.product_distributions.empty?
-  #end
+  def order_cycle_required_for(variant)
+    variant.product.product_distributions.empty?
+  end
 end

From 2f98888acdc85d50a68bcd430bcc1541db2d1dfa Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:30:31 +1100
Subject: [PATCH 072/100] Remove active model serializers gem

---
 Gemfile                            | 1 -
 Gemfile.lock                       | 3 ---
 config/initializers/serializers.rb | 1 -
 3 files changed, 5 deletions(-)
 delete mode 100644 config/initializers/serializers.rb

diff --git a/Gemfile b/Gemfile
index cd232770e0..3271c30756 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,6 @@ gem 'geocoder'
 gem 'gmaps4rails'
 gem 'spinjs-rails'
 gem 'rack-ssl', :require => 'rack/ssl'
-gem "active_model_serializers"
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 67e7e0fe29..78b60d1977 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,8 +131,6 @@ GEM
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
     active_link_to (1.0.0)
-    active_model_serializers (0.8.1)
-      activemodel (>= 3.0)
     active_utils (2.0.1)
       activesupport (>= 2.3.11)
       i18n
@@ -496,7 +494,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_model_serializers
   andand
   awesome_print
   aws-sdk
diff --git a/config/initializers/serializers.rb b/config/initializers/serializers.rb
deleted file mode 100644
index 532184bec2..0000000000
--- a/config/initializers/serializers.rb
+++ /dev/null
@@ -1 +0,0 @@
-ActiveModel::Serializer.root = false

From 458f91ef918f37d8bf02675ec64eb43912ebe0c0 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:31:44 +1100
Subject: [PATCH 073/100] Add feature spec helper to select distributor and
 order cycle

---
 spec/spec_helper.rb                         |  1 +
 spec/support/request/distribution_helper.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 spec/support/request/distribution_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1ee17cbf40..66eb4753d1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -89,6 +89,7 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.include OpenFoodNetwork::FeatureToggleHelper
   config.include OpenFoodNetwork::EnterpriseGroupsHelper
+  config.include OpenFoodNetwork::DistributionHelper
   config.include ActionView::Helpers::DateHelper
 
   # Factory girl
diff --git a/spec/support/request/distribution_helper.rb b/spec/support/request/distribution_helper.rb
new file mode 100644
index 0000000000..57512562a8
--- /dev/null
+++ b/spec/support/request/distribution_helper.rb
@@ -0,0 +1,14 @@
+module OpenFoodNetwork
+  module DistributionHelper
+
+    def select_distribution(distributor, order_cycle)
+      create_enterprise_group_for distributor
+      visit root_path
+      click_link distributor.name
+
+      if page.has_select? 'order_order_cycle_id'
+        select_by_value order_cycle.id, from: 'order_order_cycle_id'
+      end
+    end
+  end
+end

From ef56574d826d56983eaa6c24b9e536e00fad3ab0 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:37:38 +1100
Subject: [PATCH 074/100] Pass quantity to OrderPopulator

---
 app/controllers/spree/orders_controller_decorator.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb
index 180c09bec6..d080b6bb8e 100644
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -5,13 +5,13 @@ Spree::OrdersController.class_eval do
   before_filter :update_distribution, :only => :update
   before_filter :filter_order_params, :only => :update
 
-  # Patch Orders#populate to provide distributor_id and order_cycle_id to OrderPopulator
+  # Patch Orders#populate to populate multi_cart (if enabled)
   def populate
     if OpenFoodNetwork::FeatureToggle.enabled? :multi_cart
       populate_cart params.slice(:products, :variants, :quantity, :distributor_id, :order_cycle_id)
     end
     populator = Spree::OrderPopulator.new(current_order(true), current_currency)
-    if populator.populate(params.slice(:products, :variants))
+    if populator.populate(params.slice(:products, :variants, :quantity))
       fire_event('spree.cart.add')
       fire_event('spree.order.contents_changed')
       respond_with(@order) do |format|

From 30eb11ad84e7333b7c5799c71dc5668263da30e6 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:38:21 +1100
Subject: [PATCH 075/100] Allow select_distribution to take no order_cycle

---
 spec/support/request/distribution_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/support/request/distribution_helper.rb b/spec/support/request/distribution_helper.rb
index 57512562a8..a35c4d0c61 100644
--- a/spec/support/request/distribution_helper.rb
+++ b/spec/support/request/distribution_helper.rb
@@ -1,12 +1,12 @@
 module OpenFoodNetwork
   module DistributionHelper
 
-    def select_distribution(distributor, order_cycle)
+    def select_distribution(distributor, order_cycle=nil)
       create_enterprise_group_for distributor
       visit root_path
       click_link distributor.name
 
-      if page.has_select? 'order_order_cycle_id'
+      if order_cycle && page.has_select?('order_order_cycle_id')
         select_by_value order_cycle.id, from: 'order_order_cycle_id'
       end
     end

From eda4f241e22700ee3acb70bb37357e592dc1b4c2 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:39:05 +1100
Subject: [PATCH 076/100] Remove add to cart distribution selection, remove
 distribution change functionality from OrderPopulator, remove now-redundant
 tests

---
 app/models/spree/order_populator_decorator.rb |  19 +-
 .../spree/products/_add_to_cart.html.haml     |  21 --
 spec/features/consumer/add_to_cart_spec.rb    | 222 +-----------------
 3 files changed, 9 insertions(+), 253 deletions(-)

diff --git a/app/models/spree/order_populator_decorator.rb b/app/models/spree/order_populator_decorator.rb
index b33b538e51..0ba79a4aa4 100644
--- a/app/models/spree/order_populator_decorator.rb
+++ b/app/models/spree/order_populator_decorator.rb
@@ -1,32 +1,21 @@
 Spree::OrderPopulator.class_eval do
   def populate_with_distribution_validation(from_hash)
-    @distributor, @order_cycle = load_distributor_and_order_cycle(from_hash)
+    @distributor, @order_cycle = orig_distributor_and_order_cycle
 
+    # Refactor: We may not need this validation - we can't change distribution here, so
+    # this validation probably can't fail
     if !distribution_can_supply_products_in_cart(@distributor, @order_cycle)
       errors.add(:base, "That distributor or order cycle can't supply all the products in your cart. Please choose another.")
     end
 
-    # Set order distributor and order cycle
-    @orig_distributor, @orig_order_cycle = orig_distributor_and_order_cycle
-    cart_distribution_set = false
-    if valid?
-      set_cart_distributor_and_order_cycle @distributor, @order_cycle
-      cart_distribution_set = true
-    end
-
     populate_without_distribution_validation(from_hash) if valid?
 
-    # Undo distribution setting if validation failed when adding a product
-    if !valid? && cart_distribution_set
-      set_cart_distributor_and_order_cycle @orig_distributor, @orig_order_cycle
-    end
-
     valid?
   end
   alias_method_chain :populate, :distribution_validation
 
 
-   Copied from Spree::OrderPopulator, with additional validations added
+  # Copied from Spree::OrderPopulator, with additional validations added
   def attempt_cart_add(variant_id, quantity)
     quantity = quantity.to_i
     variant = Spree::Variant.find(variant_id)
diff --git a/app/views/spree/products/_add_to_cart.html.haml b/app/views/spree/products/_add_to_cart.html.haml
index 49334fcce9..621b999ddc 100644
--- a/app/views/spree/products/_add_to_cart.html.haml
+++ b/app/views/spree/products/_add_to_cart.html.haml
@@ -13,27 +13,6 @@
   - else
     = render 'add_to_cart_quantity_fields', product: @product
 
-    -#temporary hiding the options to choose order cycles and distributors
-    %div.cleared.hide
-      %br
-      - available_distributors = available_distributors_for(order, @product)
-      - available_order_cycles = available_order_cycles_for(order, @product)
-
-      - if available_distributors.length > 1 || order.andand.distributor.nil?
-        = render 'add_to_cart_distributor_choice', distributor_collection: available_distributors
-      - else
-        - distributor = available_distributors.first
-        - changing_distributor = distributor != order.andand.distributor
-        = render 'add_to_cart_distributor_fixed', distributor: distributor, changing_distributor: changing_distributor
-
-      - if order_cycles_enabled?
-        - if available_order_cycles.length > 1 || order.andand.order_cycle.nil?
-          = render 'add_to_cart_order_cycle_choice', order_cycle_collection: available_order_cycles
-        - else
-          - order_cycle = available_order_cycles.first
-          - changing_order_cycle = order_cycle != order.andand.order_cycle
-          = render 'add_to_cart_order_cycle_fixed', order_cycle: order_cycle, changing_order_cycle: changing_order_cycle
-
     %br
     = button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do
       = t(:add_to_cart)
diff --git a/spec/features/consumer/add_to_cart_spec.rb b/spec/features/consumer/add_to_cart_spec.rb
index a2a677f556..181786f747 100644
--- a/spec/features/consumer/add_to_cart_spec.rb
+++ b/spec/features/consumer/add_to_cart_spec.rb
@@ -64,79 +64,6 @@ feature %q{
     end
 
     context "adding a subsequent product to the cart" do
-      it "when there are several valid distributors, allows a choice from these options" do
-        # Given two products, both distributed by two distributors
-        d1 = create(:distributor_enterprise)
-        d2 = create(:distributor_enterprise)
-        p1 = create(:product, :distributors => [d1, d2])
-        p2 = create(:product, :distributors => [d1, d2])
-
-        # When I add the first to my cart via d1
-        visit spree.product_path p1
-        select d1.name, :from => 'distributor_id'
-        click_button 'Add To Cart'
-
-        # And I go to add the second, I should have a choice of distributor
-        visit spree.product_path p2
-        page.should have_selector '#distributor_id option', :text => d1.name
-        page.should have_selector '#distributor_id option', :text => d2.name
-
-        # When I add the second, both should be in my cart, and my distributor should be the one chosen second
-        select d2.name, :from => 'distributor_id'
-        click_button 'Add To Cart'
-        visit spree.cart_path
-        page.should have_selector 'h4 a', :text => p1.name
-        page.should have_selector 'h4 a', :text => p2.name
-        page.should have_selector "#logo h1 a", :text => d2.name
-      end
-
-      it "when the only valid distributor is the chosen one, does not allow the user to choose a distributor" do
-        # Given two products, each at the same distributor
-        d = create(:distributor_enterprise)
-        p1 = create(:product, :distributors => [d])
-        p2 = create(:product, :distributors => [d])
-
-        # 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 go to add the second, I should not have a choice of distributor
-        visit spree.product_path p2
-        page.should_not have_selector 'select#distributor_id'
-        page.should     have_selector '.distributor-fixed', :text => "Your distributor for this order is #{d.name}"
-
-        # When I add the second, both should be in my cart
-        click_button 'Add To Cart'
-        visit spree.cart_path
-        page.should have_selector 'h4 a', :text => p1.name
-        page.should have_selector 'h4 a', :text => p2.name
-      end
-
-      it "when the only valid distributor differs from the chosen one, alerts the user and changes distributor on add to cart" do
-        # Given two products, one available at only one distributor
-        d1 = create(:distributor_enterprise)
-        d2 = create(:distributor_enterprise)
-        p1 = create(:product, :distributors => [d1, d2])
-        p2 = create(:product, :distributors => [d2])
-
-        # When I add the first to my cart
-        visit spree.product_path p1
-        select d1.name, from: 'distributor_id'
-        click_button 'Add To Cart'
-
-        # And I go to add the second
-        visit spree.product_path p2
-
-        # Then I should see a message offering to change distributor for my order
-        page.should have_content "Your distributor for this order will be changed to #{d2.name} if you add this product to your cart."
-
-        # When I add the second to my cart
-        click_button 'Add To Cart'
-
-        # Then My distributor should have changed
-        page.should have_selector "#logo h1 a", :text => d2.name
-      end
 
       it "does not allow the user to add a product from a distributor that cannot supply the cart's products" do
         # Given two products, each at a different distributor
@@ -146,8 +73,8 @@ feature %q{
         p2 = create(:product, :distributors => [d2])
 
         # When I add one of them to my cart
+        select_distribution d1
         visit spree.product_path p1
-        select d1.name, :from => 'distributor_id'
         click_button 'Add To Cart'
 
         # And I attempt to add the other
@@ -218,9 +145,8 @@ feature %q{
       oc = create(:simple_order_cycle, :distributors => [d], :variants => [p.master])
 
       # When I add an item to my cart
+      select_distribution d, oc
       visit spree.product_path p
-      select d.name, :from => 'distributor_id'
-      select oc.name, :from => 'order_cycle_id'
       click_button 'Add To Cart'
 
       # Then the correct totals should be displayed
@@ -239,144 +165,6 @@ feature %q{
       order.distributor.should == d
       order.order_cycle.should == oc
     end
-
-    scenario "adding a product to the cart with an invalid distribution combination" do
-      # Given a product and some distributors
-      d1 = create(:distributor_enterprise)
-      d2 = create(:distributor_enterprise)
-      p = create(:product, :price => 12.34)
-      oc1 = create(:simple_order_cycle, :distributors => [d1], :variants => [p.master])
-      oc2 = create(:simple_order_cycle, :distributors => [d2], :variants => [p.master])
-
-      # When I attempt to add the product to my cart with an invalid distribution
-      visit spree.product_path p
-      select d1.name, :from => 'distributor_id'
-      select oc2.name, :from => 'order_cycle_id'
-      click_button 'Add To Cart'
-
-      # Then I should see an error message
-      page.should have_content "That product is not available from the chosen distributor or order cycle."
-
-      # And the product should not be in my cart
-      Spree::Order.last.line_items.should be_empty
-    end
-
-
-    context "adding a subsequent product to the cart" do
-      it "when there are several valid order cycles, allows a choice from these options" do
-        # Given two products, both distributed by two distributors
-        d1 = create(:distributor_enterprise)
-        d2 = create(:distributor_enterprise)
-        p1 = create(:product)
-        p2 = create(:product)
-        oc1 = create(:simple_order_cycle,
-                     :distributors => [d1, d2], :variants => [p1.master, p2.master])
-        oc2 = create(:simple_order_cycle,
-                     :distributors => [d1, d2], :variants => [p1.master, p2.master])
-
-        # When I add the first to my cart via d1/oc1
-        visit spree.product_path p1
-        select d1.name, :from => 'distributor_id'
-        select oc1.name, :from => 'order_cycle_id'
-        click_button 'Add To Cart'
-
-        # And I go to add the second, I should have a choice of order cycle and distributor
-        visit spree.product_path p2
-        page.should have_selector '#distributor_id option', :text => d1.name
-        page.should have_selector '#distributor_id option', :text => d2.name
-        page.should have_selector '#order_cycle_id option', :text => oc1.name
-        page.should have_selector '#order_cycle_id option', :text => oc2.name
-
-        # When I add the second, both should be in my cart, and my
-        # distributor and order cycle should be the one chosen second
-        select d2.name, :from => 'distributor_id'
-        select oc2.name, :from => 'order_cycle_id'
-        click_button 'Add To Cart'
-        visit spree.cart_path
-        page.should have_selector 'h4 a', :text => p1.name
-        page.should have_selector 'h4 a', :text => p2.name
-        page.should have_selector "#logo h1 a", :text => d2.name
-      end
-
-      it "when the only valid order cycle is the chosen one, does not allow the user to choose an order cycle" do
-        # Given two products, each at the same distributor
-        d = create(:distributor_enterprise)
-        p1 = create(:product)
-        p2 = create(:product)
-        oc = create(:simple_order_cycle, :distributors => [d],
-                    :variants => [p1.master, p2.master])
-
-        # When I add the first to my cart
-        visit spree.product_path p1
-        select d.name, :from => 'distributor_id'
-        select oc.name, :from => 'order_cycle_id'
-        click_button 'Add To Cart'
-
-        # And I go to add the second, I should not have a choice of distributor or order cycle
-        visit spree.product_path p2
-        page.should_not have_selector 'select#distributor_id'
-        page.should     have_selector '.distributor-fixed', :text => "Your distributor for this order is #{d.name}"
-        page.should_not have_selector 'select#order_cycle_id'
-        page.should     have_selector '.order-cycle-fixed', :text => "Your order cycle for this order is #{oc.name}"
-
-        # When I add the second, both should be in my cart
-        click_button 'Add To Cart'
-        visit spree.cart_path
-        page.should have_selector 'h4 a', :text => p1.name
-        page.should have_selector 'h4 a', :text => p2.name
-      end
-
-      it "when the only valid distributor differs from the chosen one, alerts the user and changes distributor on add to cart" do
-        # Given two products, one available at only one distributor
-        d1 = create(:distributor_enterprise)
-        d2 = create(:distributor_enterprise)
-        p1 = create(:product)
-        p2 = create(:product)
-        oc1 = create(:simple_order_cycle, :distributors => [d1], :variants => [p1.master])
-        oc2 = create(:simple_order_cycle, :distributors => [d2], :variants => [p1.master, p2.master])
-
-        # When I add the first to my cart
-        visit spree.product_path p1
-        select d1.name, from: 'distributor_id'
-        select oc1.name, from: 'order_cycle_id'
-
-        click_button 'Add To Cart'
-
-        # And I go to add the second
-        visit spree.product_path p2
-
-        # Then I should see a message offering to change distributor for my order
-        page.should have_content "Your distributor for this order will be changed to #{d2.name} if you add this product to your cart."
-
-        # When I add the second to my cart
-        click_button 'Add To Cart'
-
-        # Then my distributor should have changed
-        page.should have_selector "#logo h1 a", :text => d2.name
-      end
-
-      it "does not allow the user to add a product from an order cycle that cannot supply the cart's products" do
-        # Given two products, each at a different order cycle
-        d = create(:distributor_enterprise)
-        p1 = create(:product)
-        p2 = create(:product)
-        oc1 = create(:simple_order_cycle, :distributors => [d], :variants => [p1.master])
-        oc2 = create(:simple_order_cycle, :distributors => [d], :variants => [p2.master])
-
-        # When I add one of them to my cart
-        visit spree.product_path p1
-        select d.name, :from => 'distributor_id'
-        select oc1.name, :from => 'order_cycle_id'
-        click_button 'Add To Cart'
-
-        # And I attempt to add the other
-        visit spree.product_path p2
-
-        # Then I should not be allowed to add the product
-        page.should_not have_selector "button#add-to-cart-button"
-        page.should have_content "Please complete your order from #{oc1.name} before shopping in a different order cycle."
-      end
-    end
   end
 
   context "group buys" do
@@ -386,8 +174,8 @@ feature %q{
       p = create(:product, :distributors => [d], :group_buy => true)
 
       # When I add the item to my cart
+      select_distribution d
       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'
@@ -407,8 +195,8 @@ feature %q{
       create(:variant, :product => p)
 
       # When I add the item to my cart
+      select_distribution d
       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'
@@ -438,8 +226,8 @@ feature %q{
       p = create(:product, :distributors => [d], :group_buy => true)
 
       # When I add the item to my cart
+      select_distribution d
       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'

From df53a14d4b6379b23947e882fbded95a0b07ac3d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:51:26 +1100
Subject: [PATCH 077/100] Remove specs that are no longer relevant -
 distribution selection on product page no longer present

---
 spec/features/consumer/add_to_cart_spec.rb  | 37 ---------------------
 spec/features/consumer/order_cycles_spec.rb | 19 -----------
 spec/features/consumer/product_spec.rb      | 19 -----------
 3 files changed, 75 deletions(-)

diff --git a/spec/features/consumer/add_to_cart_spec.rb b/spec/features/consumer/add_to_cart_spec.rb
index 181786f747..bcf7e6039c 100644
--- a/spec/features/consumer/add_to_cart_spec.rb
+++ b/spec/features/consumer/add_to_cart_spec.rb
@@ -27,44 +27,7 @@ feature %q{
       Spree::Order.last.line_items.should be_empty
     end
 
-    scenario "adding the first product to the cart", :future => true do
-      # Given a product, some distributors and a defined shipping cost
-      d1 = create(:distributor_enterprise, :name => "Green Grass")
-      d2 = create(:distributor_enterprise, :name => "AusFarmers United")
-      create(:product, :distributors => [d2])
-      p = create(:product, :price => 12.34)
-      create(:product_distribution, :product => p, :distributor => d1)
-
-      # ... with a flat rate distribution fee of $1.23
-      ef = p.product_distributions.first.enterprise_fee
-      ef.calculator = Spree::Calculator::FlatRate.new preferred_amount: 1.23
-      ef.calculator.save!
-
-      # When I choose a distributor
-      visit spree.root_path
-      click_on "AusFarmers United"
-
-      # 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 correct totals should be displayed
-      page.should have_selector 'span.item-total', :text => '$12.34'
-      page.should have_selector 'span.distribution-total', :text => '$1.23'
-      page.should have_selector 'span.grand-total', :text => '$13.57'
-
-      # And the item should be in my cart
-      order = Spree::Order.last
-      line_item = order.line_items.first
-      line_item.product.should == p
-
-      # And my order should have its distributor set to the chosen distributor
-      order.distributor.should == d1
-    end
-
     context "adding a subsequent product to the cart" do
-
       it "does not allow the user to add a product from a distributor that cannot supply the cart's products" do
         # Given two products, each at a different distributor
         d1 = create(:distributor_enterprise)
diff --git a/spec/features/consumer/order_cycles_spec.rb b/spec/features/consumer/order_cycles_spec.rb
index dedd77e1cb..591b7af002 100644
--- a/spec/features/consumer/order_cycles_spec.rb
+++ b/spec/features/consumer/order_cycles_spec.rb
@@ -279,25 +279,6 @@ feature %q{
         page.should have_selector "input[value='#{@oc1.id}'][checked='checked']"
         page.should have_selector "option[value='#{@d1.id}'][selected='selected']"
       end
-
-      scenario "selection form is not shown when there are products in the cart" do
-        # Given a product
-        d = create(:distributor_enterprise)
-        p = create(:product, :distributors => [d])
-
-        # When I go to the products listing page, I should see the selection form
-        visit spree.products_path
-        page.should have_selector "#distribution-selection"
-
-        # When I add a product to the cart
-        visit spree.product_path p
-        select d.name, :from => 'distributor_id'
-        click_button 'Add To Cart'
-
-        # Then I should no longer see the selection form
-        visit spree.products_path
-        page.should_not have_selector "#distribution-selection"
-      end
     end
   end
 
diff --git a/spec/features/consumer/product_spec.rb b/spec/features/consumer/product_spec.rb
index ee45de379b..9b45b21ef1 100644
--- a/spec/features/consumer/product_spec.rb
+++ b/spec/features/consumer/product_spec.rb
@@ -51,24 +51,5 @@ feature %q{
         end
       end
     end
-
-    context "with Javascript", js: true do
-      it "changes distributor details when the distributor is changed" do
-        d1 = create(:distributor_enterprise)
-        d2 = create(:distributor_enterprise)
-        d3 = create(:distributor_enterprise)
-        p = create(:product, :distributors => [d1, d2, d3])
-
-        visit spree.product_path p
-
-        [d1, d2, d3].each do |d|
-          select d.name, :from => 'distributor_id'
-
-          within '#product-distributor-details' do
-            page.should have_selector 'h2', :text => d.name
-          end
-        end
-      end
-    end
   end
 end

From 4f7fdd430f5f49f8c3a653da154771bb529ca8cd Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 11:58:53 +1100
Subject: [PATCH 078/100] Update failing controller spec - order needs
 distributor set

---
 spec/controllers/spree/orders_controller_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 08f2db80f7..d5e709aabe 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -102,11 +102,12 @@ describe Spree::OrdersController do
       p = create(:product, :distributors => [distributor_product], :group_buy => true)
 
       order = subject.current_order(true)
+      order.stub(:distributor) { distributor_product }
       order.should_receive(:set_variant_attributes).with(p.master, {'max_quantity' => '3'})
       controller.stub(:current_order).and_return(order)
 
       expect do
-        spree_post :populate, :variants => {p.master.id => 1}, :variant_attributes => {p.master.id => {:max_quantity => 3}}, :distributor_id => distributor_product.id
+        spree_post :populate, :variants => {p.master.id => 1}, :variant_attributes => {p.master.id => {:max_quantity => 3}}
       end.to change(Spree::LineItem, :count).by(1)
     end
   end

From dd169344969172f87138b77e77ec62d2401c8b2e Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 13:22:34 +1100
Subject: [PATCH 079/100] Remove redundant serializer spec, reinstate creation
 of order distribution charges

---
 app/models/spree/order_decorator.rb             | 6 +++---
 spec/features/consumer/checkout_spec.rb         | 2 +-
 spec/serializers/spree/image_serializer_spec.rb | 9 ---------
 3 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 spec/serializers/spree/image_serializer_spec.rb

diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index 1a1f62d0f9..45caf95df9 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -1,8 +1,8 @@
 require 'open_food_network/distribution_change_validator'
 
-#ActiveSupport::Notifications.subscribe('spree.order.contents_changed') do |name, start, finish, id, payload|
-  #payload[:order].reload.update_distribution_charge!
-#end
+ActiveSupport::Notifications.subscribe('spree.order.contents_changed') do |name, start, finish, id, payload|
+  payload[:order].reload.update_distribution_charge!
+end
 
 Spree::Order.class_eval do
   belongs_to :order_cycle
diff --git a/spec/features/consumer/checkout_spec.rb b/spec/features/consumer/checkout_spec.rb
index d148133b6d..2a13023ce8 100644
--- a/spec/features/consumer/checkout_spec.rb
+++ b/spec/features/consumer/checkout_spec.rb
@@ -566,7 +566,7 @@ feature %q{
   end
 
   def checkout_fees_table
-    table = page.find 'tbody'
+    table = page.find 'tbody#cart_adjustments'
     rows = table.all 'tr'
     rows.map { |row| row.all('td').map { |cell| cell.text.strip } }
   end
diff --git a/spec/serializers/spree/image_serializer_spec.rb b/spec/serializers/spree/image_serializer_spec.rb
deleted file mode 100644
index ced92da3c3..0000000000
--- a/spec/serializers/spree/image_serializer_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Spree::ImageSerializer do
-  it "should give us the small url" do
-    image = Spree::Image.new(attachment: double(:attachment))
-    image.attachment.should_receive(:url).with(:small, false)
-    Spree::ImageSerializer.new(image).to_json
-  end
-end

From 20ad906f7af662b970b3fb8d4c6218936b49e232 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 14:13:19 +1100
Subject: [PATCH 080/100] Fix multicart use of OrderPopulator

---
 app/models/cart.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/cart.rb b/app/models/cart.rb
index 845a80187d..fee1a25a44 100644
--- a/app/models/cart.rb
+++ b/app/models/cart.rb
@@ -8,7 +8,7 @@ class Cart < ActiveRecord::Base
     order = create_or_find_order_for_distributor distributor, order_cycle, currency
 
     @populator = Spree::OrderPopulator.new(order, currency)
-    @populator.populate({ :variants => { variant_id => quantity }, :distributor_id => distributor.id, :order_cycle_id => order_cycle })
+    @populator.populate({ :variants => { variant_id => quantity } })
   end
 
   def create_or_find_order_for_distributor distributor, order_cycle, currency
@@ -17,6 +17,7 @@ class Cart < ActiveRecord::Base
       order_for_distributor = Spree::Order.create(:currency => currency, :distributor => distributor)
       order_for_distributor.distributor = distributor
       order_for_distributor.order_cycle = order_cycle
+      order_for_distributor.save!
       orders << order_for_distributor
     end
 

From ea3e697b73c7d3053ecad80ef6c78d88ca600ec0 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 14:14:45 +1100
Subject: [PATCH 081/100] Rename method for clarity, remove outdated specs for
 OrderPopulator

---
 app/models/spree/order_populator_decorator.rb |  4 +-
 spec/models/spree/order_populator_spec.rb     | 51 +++----------------
 2 files changed, 8 insertions(+), 47 deletions(-)

diff --git a/app/models/spree/order_populator_decorator.rb b/app/models/spree/order_populator_decorator.rb
index 0ba79a4aa4..755473f949 100644
--- a/app/models/spree/order_populator_decorator.rb
+++ b/app/models/spree/order_populator_decorator.rb
@@ -1,6 +1,6 @@
 Spree::OrderPopulator.class_eval do
   def populate_with_distribution_validation(from_hash)
-    @distributor, @order_cycle = orig_distributor_and_order_cycle
+    @distributor, @order_cycle = distributor_and_order_cycle
 
     # Refactor: We may not need this validation - we can't change distribution here, so
     # this validation probably can't fail
@@ -32,7 +32,7 @@ Spree::OrderPopulator.class_eval do
 
   private
 
-  def orig_distributor_and_order_cycle
+  def distributor_and_order_cycle
     [@order.distributor, @order.order_cycle]
   end
 
diff --git a/spec/models/spree/order_populator_spec.rb b/spec/models/spree/order_populator_spec.rb
index e224aad805..e91e304d9c 100644
--- a/spec/models/spree/order_populator_spec.rb
+++ b/spec/models/spree/order_populator_spec.rb
@@ -7,59 +7,20 @@ module Spree
     let(:params) { double(:params) }
     let(:distributor) { double(:distributor) }
     let(:order_cycle) { double(:order_cycle) }
-    let(:orig_distributor) { double(:distributor) }
-    let(:orig_order_cycle) { double(:order_cycle) }
     let(:op) { OrderPopulator.new(order, currency) }
 
     describe "populate" do
 
       it "checks that distribution can supply all products in the cart" do
-        op.should_receive(:load_distributor_and_order_cycle).with(params).
+        op.should_receive(:distributor_and_order_cycle).
           and_return([distributor, order_cycle])
         op.should_receive(:distribution_can_supply_products_in_cart).
           with(distributor, order_cycle).and_return(false)
-        op.stub(:orig_distributor_and_order_cycle).and_return([orig_distributor,
-                                                               orig_order_cycle])
         op.should_receive(:populate_without_distribution_validation).never
-        op.should_receive(:set_cart_distributor_and_order_cycle).never
 
         op.populate(params).should be_false
         op.errors.to_a.should == ["That distributor or order cycle can't supply all the products in your cart. Please choose another."]
       end
-
-      it "resets cart distributor and order cycle if populate fails" do
-        op.should_receive(:load_distributor_and_order_cycle).with(params).
-          and_return([distributor, order_cycle])
-        op.should_receive(:distribution_can_supply_products_in_cart).
-          with(distributor, order_cycle).and_return(true)
-        op.stub(:orig_distributor_and_order_cycle).and_return([orig_distributor,
-                                                               orig_order_cycle])
-
-        op.class_eval do
-          def populate_without_distribution_validation(from_hash)
-            errors.add(:base, "Something went wrong.")
-          end
-        end
-
-        op.should_receive(:set_cart_distributor_and_order_cycle).with(distributor, order_cycle)
-        op.should_receive(:set_cart_distributor_and_order_cycle).with(orig_distributor, orig_order_cycle)
-
-        op.populate(params).should be_false
-        op.errors.to_a.should == ["Something went wrong."]
-      end
-
-      it "sets cart distributor and order cycle when populate succeeds" do
-        op.should_receive(:load_distributor_and_order_cycle).with(params).
-          and_return([distributor, order_cycle])
-        op.should_receive(:distribution_can_supply_products_in_cart).
-          with(distributor, order_cycle).and_return(true)
-        op.stub(:orig_distributor_and_order_cycle).and_return([orig_distributor,
-                                                               orig_order_cycle])
-        op.should_receive(:populate_without_distribution_validation).with(params)
-        op.should_receive(:set_cart_distributor_and_order_cycle).with(distributor, order_cycle)
-
-        op.populate(params).should be_true
-      end
     end
 
     describe "attempt_cart_add" do
@@ -210,11 +171,11 @@ module Spree
         end
       end
 
-      it "provides the original distributor and order cycle for the order" do
-        order.should_receive(:distributor).and_return(orig_distributor)
-        order.should_receive(:order_cycle).and_return(orig_order_cycle)
-        op.send(:orig_distributor_and_order_cycle).should == [orig_distributor,
-                                                              orig_order_cycle]
+      it "provides the distributor and order cycle for the order" do
+        order.should_receive(:distributor).and_return(distributor)
+        order.should_receive(:order_cycle).and_return(order_cycle)
+        op.send(:distributor_and_order_cycle).should == [distributor,
+                                                         order_cycle]
       end
     end
   end

From 4a74c2624c41d6c35648ff715a3ab62806b85a0d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 14:15:06 +1100
Subject: [PATCH 082/100] Remove specs for removed features

---
 .../spree/orders_controller_spec.rb           | 86 -------------------
 1 file changed, 86 deletions(-)

diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index d5e709aabe..d4424aa45e 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -31,71 +31,6 @@ describe Spree::OrdersController do
     order.distributor.should be_nil
   end
 
-  describe "adding a product to the cart with a distribution combination that can't service the existing cart" do
-    before do
-      @request.env["HTTP_REFERER"] = 'http://test.host/'
-    end
-
-    pending "errors when an invalid distributor is selected" do
-      # Given a product and some distributors
-      d1 = create(:distributor_enterprise)
-      d2 = create(:distributor_enterprise)
-      p = create(:product, :price => 12.34)
-      oc = create(:simple_order_cycle, :distributors => [d1], :variants => [p.master])
-
-      # When I attempt to add the product to the cart with an invalid distributor, it should not be added
-      expect do
-        spree_post :populate, variants: {p.master.id => 1}, distributor_id: d2.id, order_cycle_id: oc.id
-        response.should redirect_to :back
-      end.to change(self, :num_items_in_cart).by(0)
-
-      # And I should see an error
-      flash[:error].should == "That product is not available from the chosen distributor or order cycle."
-    end
-
-    pending "errors when an invalid order cycle is selected" do
-      # Given a product and some order cycles
-      d = create(:distributor_enterprise)
-      p = create(:product, :price => 12.34)
-      oc1 = create(:simple_order_cycle, :distributors => [d], :variants => [p.master])
-      oc2 = create(:simple_order_cycle, :distributors => [d], :variants => [])
-
-      # When I attempt to add the product to my cart with an invalid order cycle, it should not be added
-      expect do
-        spree_post :populate, variants: {p.master.id => 1}, distributor_id: d.id, order_cycle_id: oc2.id
-        response.should redirect_to :back
-      end.to change(self, :num_items_in_cart).by(0)
-
-      # And I should see an error
-      flash[:error].should == "That product is not available from the chosen distributor or order cycle."
-    end
-
-    pending "errors when distribution is valid for the new product but does not cover the cart" do
-      # Given two products with different distributors
-      d1 = create(:distributor_enterprise)
-      d2 = create(:distributor_enterprise)
-      p1 = create(:product, :price => 12.34)
-      p2 = create(:product, :price => 23.45)
-      oc1 = create(:simple_order_cycle, :distributors => [d1], :variants => [p1.master])
-      oc2 = create(:simple_order_cycle, :distributors => [d2], :variants => [p2.master])
-
-      # When I add the first to my cart
-      expect do
-        spree_post :populate, variants: {p1.master.id => 1}, distributor_id: d1.id, order_cycle_id: oc1.id
-        response.should redirect_to spree.cart_path
-      end.to change(self, :num_items_in_cart).by(1)
-
-      # And I attempt to add the second, then the product should not be added to my cart
-      expect do
-        spree_post :populate, variants: {p2.master.id => 1}, distributor_id: d2.id, order_cycle_id: oc2.id
-        response.should redirect_to :back
-      end.to change(self, :num_items_in_cart).by(0)
-
-      # And I should see an error
-      flash[:error].should == "That distributor or order cycle can't supply all the products in your cart. Please choose another."
-    end
-  end
-
   context "adding a group buy product to the cart" do
     it "sets a variant attribute for the max quantity" do
       distributor_product = create(:distributor_enterprise)
@@ -141,27 +76,6 @@ describe Spree::OrdersController do
     end
   end
 
-  context "#populate" do
-    let(:user) { create(:user) }
-    let(:order) { mock_model(Spree::Order, :number => "R123", :reload => nil, :save! => true, :coupon_code => nil, :user => user, :completed? => false, :currency => "USD", :token => 'a1b2c3d4')}
-    let(:populator) { double('OrderPopulator') }
-    before do
-        order.stub(:last_ip_address=)
-        Spree::Order.stub(:find).and_return(order)
-        Spree::OrderPopulator.should_receive(:new).and_return(populator)
-        Spree::Order.stub(:new).and_return(order)
-        if Spree::BaseController.spree_responders[:OrdersController].present?
-          Spree::BaseController.spree_responders[:OrdersController].clear
-        end
-    end
-
-    context "with Variant" do
-      it "should handle multiple variants, each with their own quantity" do
-        populator.should_receive(:populate).with("variants" => { 1 => "10", 3 => "7" }).and_return(true)
-        spree_post :populate, { order_id: order.id, :variants => {1 => 10, 3 => 7} }
-      end
-    end
-  end
 
   private
 

From c42d741d3d6546f480fe68eed51df5f208415c2b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 14:41:06 +1100
Subject: [PATCH 083/100] Remove browse product specs for removed feature

---
 .../spree/orders_controller_spec.rb           |  4 --
 .../features/consumer/browse_products_spec.rb | 46 -------------------
 2 files changed, 50 deletions(-)

diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index d4424aa45e..9883914736 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe Spree::OrdersController do
-  def current_user
-    controller.current_user
-  end
-
   it "selects distributors" do
     d = create(:distributor_enterprise)
     p = create(:product, :distributors => [d])
diff --git a/spec/features/consumer/browse_products_spec.rb b/spec/features/consumer/browse_products_spec.rb
index 2e6e3e64af..a12899d4bc 100644
--- a/spec/features/consumer/browse_products_spec.rb
+++ b/spec/features/consumer/browse_products_spec.rb
@@ -90,51 +90,5 @@ feature %q{
         page.all('#product-variants li input').count.should == 1
       end
     end
-
-    context "viewing a product, it provides a choice of distributor when adding to cart" do
-      it "works when no distributor is chosen" do
-        # Given a distributor and a product under it
-        distributor = create(:distributor_enterprise)
-        product = create(:product, :distributors => [distributor])
-
-        # When we view the product
-        visit spree.product_path(product)
-
-        # Then we should see a choice of distributor, with no default
-        page.should have_selector "select#distributor_id option", :text => distributor.name
-        page.should_not have_selector "select#distributor_id option[selected='selected']"
-      end
-
-      it "displays the local distributor as the default choice when available for the current product" do
-        # Given a distributor and a product under it
-        distributor1 = create(:distributor_enterprise)
-        distributor2 = create(:distributor_enterprise)
-        product = create(:product, :distributors => [distributor1,distributor2])
-
-        # When we select the distributor and view the product
-        visit spree.select_distributor_order_path(distributor1)
-        visit spree.product_path(product)
-
-        # Then we should see our distributor as the default option when adding the item to our cart
-        page.should have_selector "select#distributor_id option[value='#{distributor1.id}'][selected='selected']"
-      end
-
-      it "works when viewing a product from a remote distributor" do
-        # Given two distributors and our product under one
-        distributor_product = create(:distributor_enterprise)
-        distributor_no_product = create(:distributor_enterprise)
-        product = create(:product, :distributors => [distributor_product])
-        create(:product, :distributors => [distributor_no_product])
-
-        # When we select the distributor without the product and then view the product
-        visit spree.select_distributor_order_path(distributor_no_product)
-        visit spree.root_path
-        visit spree.product_path(product)
-
-        # Then we should be told that our distributor will be set to the one with the product
-        page.should_not have_selector "select#distributor_id"
-        page.should have_content "our distributor for this order will be changed to #{distributor_product.name} if you add this product to your cart."
-      end
-    end
   end
 end

From 5f4d787d26e3bba240d19f1eaabeee4998ad32d9 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 14:43:46 +1100
Subject: [PATCH 084/100] Fix sorting error in spec

---
 spec/models/spree/shipping_method_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/spree/shipping_method_spec.rb b/spec/models/spree/shipping_method_spec.rb
index 2e4a7e6923..b2aad5b4db 100644
--- a/spec/models/spree/shipping_method_spec.rb
+++ b/spec/models/spree/shipping_method_spec.rb
@@ -15,7 +15,7 @@ module Spree
       sm.distributors << d1
       sm.distributors << d2
 
-      sm.reload.distributors.should == [d1, d2]
+      sm.reload.distributors.sort.should == [d1, d2].sort
     end
 
     it "finds shipping methods for a particular distributor" do

From 7838d759eec9b5128d7d91b3d57f949243898383 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 8 Jan 2014 14:45:25 +1100
Subject: [PATCH 085/100] Removing redundant functionality from the Order
 Populator

---
 app/models/spree/order_populator_decorator.rb | 40 ++-------
 spec/models/spree/order_populator_spec.rb     | 88 +++----------------
 2 files changed, 18 insertions(+), 110 deletions(-)

diff --git a/app/models/spree/order_populator_decorator.rb b/app/models/spree/order_populator_decorator.rb
index 755473f949..aad019e06f 100644
--- a/app/models/spree/order_populator_decorator.rb
+++ b/app/models/spree/order_populator_decorator.rb
@@ -21,7 +21,7 @@ Spree::OrderPopulator.class_eval do
     variant = Spree::Variant.find(variant_id)
     if quantity > 0
       if check_stock_levels(variant, quantity) &&
-          check_distribution_provided_for(variant) &&
+          check_order_cycle_provided_for(variant) &&
           check_variant_available_under_distribution(variant)
 
         @order.add_variant(variant, quantity, currency)
@@ -36,40 +36,14 @@ Spree::OrderPopulator.class_eval do
     [@order.distributor, @order.order_cycle]
   end
 
-
-  def load_distributor_and_order_cycle(from_hash)
-    distributor = from_hash[:distributor_id].present? ?
-                    Enterprise.is_distributor.find(from_hash[:distributor_id]) : nil
-    order_cycle = from_hash[:order_cycle_id].present? ?
-                     OrderCycle.find(from_hash[:order_cycle_id]) : nil
-
-    [distributor, order_cycle]
-  end
-
-  def set_cart_distributor_and_order_cycle(distributor, order_cycle)
-    # Using @order.reload or not performing any reload causes totals fields (ie. item_total)
-    # to be set to zero
-    @order = Spree::Order.find @order.id
-
-    @order.set_distribution! distributor, order_cycle
-  end
-
   def distribution_can_supply_products_in_cart(distributor, order_cycle)
     DistributionChangeValidator.new(@order).can_change_to_distribution?(distributor, order_cycle)
   end
 
-  def check_distribution_provided_for(variant)
-    distribution_provided = distribution_provided_for variant
-
-    unless distribution_provided
-      if order_cycle_required_for variant
-        errors.add(:base, "Please choose a distributor and order cycle for this order.")
-      else
-        errors.add(:base, "Please choose a distributor for this order.")
-      end
-    end
-
-    distribution_provided
+  def check_order_cycle_provided_for(variant)
+    order_cycle_provided = (!order_cycle_required_for(variant) || @order_cycle.present?)
+    errors.add(:base, "Please choose an order cycle for this order.") unless order_cycle_provided
+    order_cycle_provided
   end
 
   def check_variant_available_under_distribution(variant)
@@ -81,10 +55,6 @@ Spree::OrderPopulator.class_eval do
     end
   end
 
-  def distribution_provided_for(variant)
-    @distributor.present? && (!order_cycle_required_for(variant) || @order_cycle.present?)
-  end
-
   def order_cycle_required_for(variant)
     variant.product.product_distributions.empty?
   end
diff --git a/spec/models/spree/order_populator_spec.rb b/spec/models/spree/order_populator_spec.rb
index e91e304d9c..1e983872bb 100644
--- a/spec/models/spree/order_populator_spec.rb
+++ b/spec/models/spree/order_populator_spec.rb
@@ -30,7 +30,7 @@ module Spree
         Spree::Variant.stub(:find).and_return(variant)
 
         op.should_receive(:check_stock_levels).with(variant, quantity).and_return(true)
-        op.should_receive(:check_distribution_provided_for).with(variant).and_return(true)
+        op.should_receive(:check_order_cycle_provided_for).with(variant).and_return(true)
         op.should_receive(:check_variant_available_under_distribution).with(variant).
           and_return(true)
         order.should_receive(:add_variant).with(variant, quantity, currency)
@@ -50,30 +50,22 @@ module Spree
         end
       end
 
-      describe "checking distribution is provided for a variant" do
+      describe "checking order cycle is provided for a variant, OR is not needed" do
         let(:variant) { double(:variant) }
 
-        it "returns false and errors when distribution is not provided and order cycle is required" do
-          op.should_receive(:distribution_provided_for).with(variant).and_return(false)
-          op.should_receive(:order_cycle_required_for).with(variant).and_return(true)
-
-          op.send(:check_distribution_provided_for, variant).should be_false
-          op.errors.to_a.should == ["Please choose a distributor and order cycle for this order."]
+        it "returns false and errors when order cycle is not provided and is required" do
+          op.stub(:order_cycle_required_for).and_return true
+          op.send(:check_order_cycle_provided_for, variant).should be_false
+          op.errors.to_a.should == ["Please choose an order cycle for this order."]
         end
-
-        it "returns false and errors when distribution is not provided and order cycle is not required" do
-          op.should_receive(:distribution_provided_for).with(variant).and_return(false)
-          op.should_receive(:order_cycle_required_for).with(variant).and_return(false)
-
-          op.send(:check_distribution_provided_for, variant).should be_false
-          op.errors.to_a.should == ["Please choose a distributor for this order."]
+        it "returns true when order cycle is provided" do
+          op.stub(:order_cycle_required_for).and_return true
+          op.instance_variable_set :@order_cycle,  double(:order_cycle)
+          op.send(:check_order_cycle_provided_for, variant).should be_true
         end
-
-        it "returns true and does not error otherwise" do
-          op.should_receive(:distribution_provided_for).with(variant).and_return(true)
-
-          op.send(:check_distribution_provided_for, variant).should be_true
-          op.errors.should be_empty
+        it "returns true when order cycle is not required" do
+          op.stub(:order_cycle_required_for).and_return false
+          op.send(:check_order_cycle_provided_for, variant).should be_true
         end
       end
 
@@ -103,60 +95,6 @@ module Spree
 
 
     describe "support" do
-      describe "loading distributor and order cycle from hash" do
-        it "loads distributor and order cycle when present" do
-          params = {distributor_id: 1, order_cycle_id: 2}
-          distributor = double(:distributor)
-          order_cycle = double(:order_cycle)
-
-          enterprise_scope = double(:enterprise_scope)
-          enterprise_scope.should_receive(:find).with(1).and_return(distributor)
-          Enterprise.should_receive(:is_distributor).and_return(enterprise_scope)
-          OrderCycle.should_receive(:find).with(2).and_return(order_cycle)
-
-          op.send(:load_distributor_and_order_cycle, params).should ==
-            [distributor, order_cycle]
-        end
-
-        it "returns nil when not present" do
-          op.send(:load_distributor_and_order_cycle, {}).should == [nil, nil]
-        end
-      end
-
-      it "sets cart distributor and order cycle" do
-        Spree::Order.should_receive(:find).with(order.id).and_return(order)
-        order.should_receive(:set_distribution!).with(distributor, order_cycle)
-
-        op.send(:set_cart_distributor_and_order_cycle, distributor, order_cycle)
-      end
-
-      describe "checking if distribution is provided for a variant" do
-        let(:variant) { double(:variant) }
-
-        it "returns false when distributor is nil" do
-          op.instance_eval { @distributor = nil }
-          op.send(:distribution_provided_for, variant).should be_false
-        end
-
-        it "returns false when order cycle is nil when it's required" do
-          op.instance_eval { @distributor = 1; @order_cycle = nil }
-          op.should_receive(:order_cycle_required_for).with(variant).and_return(true)
-          op.send(:distribution_provided_for, variant).should be_false
-        end
-
-        it "returns true when distributor is present and order cycle is not required" do
-          op.instance_eval { @distributor = 1; @order_cycle = nil }
-          op.should_receive(:order_cycle_required_for).with(variant).and_return(false)
-          op.send(:distribution_provided_for, variant).should be_true
-        end
-
-        it "returns true when distributor is present and order cycle is required and present" do
-          op.instance_eval { @distributor = 1; @order_cycle = 1 }
-          op.should_receive(:order_cycle_required_for).with(variant).and_return(true)
-          op.send(:distribution_provided_for, variant).should be_true
-        end
-      end
-
       describe "checking if order cycle is required for a variant" do
         it "requires an order cycle when the product has no product distributions" do
           product = double(:product, product_distributions: [])

From e5514920c82b185928e6d45325f9673607983b2b Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 8 Jan 2014 15:11:23 +1100
Subject: [PATCH 086/100] Fixing up the error messages in our specs

---
 spec/features/consumer/add_to_cart_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/consumer/add_to_cart_spec.rb b/spec/features/consumer/add_to_cart_spec.rb
index bcf7e6039c..7e7650a9b9 100644
--- a/spec/features/consumer/add_to_cart_spec.rb
+++ b/spec/features/consumer/add_to_cart_spec.rb
@@ -21,7 +21,7 @@ feature %q{
       click_button 'Add To Cart'
 
       # Then I should see an error message
-      page.should have_content "Please choose a distributor for this order."
+      page.should have_content "That product is not available from the chosen distributor or order cycle"
 
       # And the product should not have been added to my cart
       Spree::Order.last.line_items.should be_empty
@@ -95,7 +95,7 @@ feature %q{
       click_button 'Add To Cart'
 
       # Then I should see an error message
-      page.should have_content "Please choose a distributor and order cycle for this order."
+      page.should have_content "Please choose an order cycle for this order."
 
       # And the product should not have been added to my cart
       Spree::Order.last.line_items.should be_empty

From c08c42b08754efd6fcfcbec60415c4cf50eca4f3 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 15:11:38 +1100
Subject: [PATCH 087/100] Fix inconsistent test fails - insignificant ordering

---
 spec/controllers/spree/admin/reports_controller_spec.rb | 2 +-
 spec/features/admin/shipping_methods_spec.rb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/spree/admin/reports_controller_spec.rb b/spec/controllers/spree/admin/reports_controller_spec.rb
index 64b4e27e2b..6e2c3b9543 100644
--- a/spec/controllers/spree/admin/reports_controller_spec.rb
+++ b/spec/controllers/spree/admin/reports_controller_spec.rb
@@ -168,7 +168,7 @@ describe Spree::Admin::ReportsController do
 
     it "should build distributors for the current user" do
       spree_get :products_and_inventory
-      assigns(:distributors).should == [d1, d2, d3]
+      assigns(:distributors).sort.should == [d1, d2, d3].sort
     end
 
     it "builds suppliers for the current user" do
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 86a2348bd0..575e2b7da4 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -30,7 +30,7 @@ feature 'shipping methods' do
 
       sm = Spree::ShippingMethod.last
       sm.name.should == 'Carrier Pidgeon'
-      sm.distributors.should == [d1, d2]
+      sm.distributors.sort.should == [d1, d2].sort
     end
 
     it "at checkout, user can only see shipping methods for their current distributor (checkout spec)"

From 533a987684caf53bd13b7948e7e5321fb9294136 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 8 Jan 2014 15:20:18 +1100
Subject: [PATCH 088/100] Uncommenting imgs for Angular, disabling image
 loading in Poltergeist/Phantom

---
 app/views/shop/_products.html.haml | 4 ++--
 spec/spec_helper.rb                | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 034cd53ab6..3019d22967 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -13,8 +13,8 @@
       %tbody{"ng-repeat" => "product in data.products | filter:query"}
         %tr.product
           %td
-            -#%img{src: "{{ product.master.images[0].small_url }}"}
-            -#{{product.master.images[0].alt}}
+            %img{"ng-src" => "{{ product.master.images[0].small_url }}"}
+            {{product.master.images[0].alt}}
           %td
             %h5
               {{ product.name }}
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 66eb4753d1..b58653c8a8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -33,9 +33,10 @@ require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
 
 # For debugging, extend poltergeist's timeout
-# Capybara.register_driver :poltergeist do |app|
-#   Capybara::Poltergeist::Driver.new(app, timeout: 5.minutes)
-# end
+ Capybara.register_driver :poltergeist do |app|
+   #Capybara::Poltergeist::Driver.new(app, timeout: 5.minutes)
+   Capybara::Poltergeist::Driver.new(app, phantomjs_options: ['--load-images=no'] )
+ end
 
 
 require "paperclip/matchers"

From ac17502046a3e161297912a7ba684248250a04b9 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Wed, 8 Jan 2014 12:30:32 +0800
Subject: [PATCH 089/100] Fix test

---
 .../admin/bulk_product_update_spec.rb         | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index a43514009f..31d45838bf 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -400,24 +400,22 @@ feature %q{
     Capybara.default_wait_time = 5
   end
 
-  describe "updating when a filter has been applied" do
-    it "works" do
-      p1 = FactoryGirl.create(:simple_product, :name => "product1")
-      p2 = FactoryGirl.create(:simple_product, :name => "product2")
-      login_to_admin_section
+  scenario "updating when a filter has been applied" do
+    p1 = FactoryGirl.create(:simple_product, :name => "product1")
+    p2 = FactoryGirl.create(:simple_product, :name => "product2")
+    login_to_admin_section
 
-      visit '/admin/products/bulk_edit'
+    visit '/admin/products/bulk_edit'
 
-      select "Name", :from => "filter_property"
-      select "Contains", :from => "filter_predicate"
-      fill_in "filter_value", :with => "1"
-      click_button "Apply Filter"
-      page.should_not have_field "product_name", with: p2.name
-      fill_in "product_name", :with => "new product1"
+    select "Name", :from => "filter_property"
+    select "Contains", :from => "filter_predicate"
+    fill_in "filter_value", :with => "1"
+    click_button "Apply Filter"
+    page.should_not have_field "product_name", with: p2.name
+    fill_in "product_name", :with => "new product1"
 
-      click_on 'Update'
-      page.find("span#update-status-message").should have_content "Update complete"
-    end
+    click_on 'Update'
+    page.find("span#update-status-message").should have_content "Update complete"
   end
 
   scenario "updating a product when there are more products than the default API page size" do

From a67cea3fcd44aab40acf219cd123a63416df0c69 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 15:58:47 +1100
Subject: [PATCH 090/100] Precompile darkswarm css and js

---
 config/application.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/application.rb b/config/application.rb
index 590c658a7d..49936d7baf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -81,6 +81,7 @@ module Openfoodnetwork
     config.assets.initialize_on_precompile = true
     config.assets.precompile += ['store/all.css', 'store/all.js', 'store/shop_front.js']
     config.assets.precompile += ['admin/all.css', 'admin/restore_spree_from_cms.css', 'admin/*.js', 'admin/**/*.js']
+    config.assets.precompile += ['darkswarm/all.css', 'darkswarm/all.js']
     config.assets.precompile += ['comfortable_mexican_sofa/*']
     config.assets.precompile += ['search/all.css', 'search/*.js']
     config.assets.precompile += ['shared/*']

From 39c28034936240aea0665b6454b4aa695d257524 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 16:45:21 +1100
Subject: [PATCH 091/100] Turn off name mangling to make DI more natural in
 angular -
 https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4

---
 config/environments/production.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index e02b8f942d..2e08f8e029 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -45,6 +45,8 @@ Openfoodnetwork::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
 
+  config.assets.js_compressor = Uglifier.new(mangle: false)
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

From 6c5539a1daa9b45d6bb7dfddaf3ff948f3c98bc9 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 8 Jan 2014 17:25:32 +1100
Subject: [PATCH 092/100] Update js compressor for staging as well as
 production

---
 config/environments/staging.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 2d9321357d..bee008922f 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -45,6 +45,8 @@ Openfoodnetwork::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
 
+  config.assets.js_compressor = Uglifier.new(mangle: false)
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

From 3b3815a09d4e7ee467458f94f9f0a5876f55fe04 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 9 Jan 2014 09:35:29 +1100
Subject: [PATCH 093/100] Require uglifier, should fix asset precompilation

---
 config/environments/production.rb | 1 +
 config/environments/staging.rb    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2e08f8e029..a780f486fb 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -45,6 +45,7 @@ Openfoodnetwork::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
 
+  require 'uglifier'
   config.assets.js_compressor = Uglifier.new(mangle: false)
 
   # Disable delivery errors, bad email addresses will be ignored
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index bee008922f..ee6fa16e8a 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -45,6 +45,7 @@ Openfoodnetwork::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
 
+  require 'uglifier'
   config.assets.js_compressor = Uglifier.new(mangle: false)
 
   # Disable delivery errors, bad email addresses will be ignored

From e35eccca93fa58eb4520f1e35be212fb49a0e4e4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 9 Jan 2014 11:18:54 +1100
Subject: [PATCH 094/100] Revert 3b3815a 6c5539a 39c2803 - remove non-mangling
 js compression which breaks build

---
 config/environments/production.rb | 3 ---
 config/environments/staging.rb    | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index a780f486fb..e02b8f942d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -45,9 +45,6 @@ Openfoodnetwork::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
 
-  require 'uglifier'
-  config.assets.js_compressor = Uglifier.new(mangle: false)
-
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index ee6fa16e8a..2d9321357d 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -45,9 +45,6 @@ Openfoodnetwork::Application.configure do
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   # config.assets.precompile += %w( search.js )
 
-  require 'uglifier'
-  config.assets.js_compressor = Uglifier.new(mangle: false)
-
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

From 8f479868b4b58e04d5eca850ea8658c36cab68d1 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 9 Jan 2014 11:44:03 +1100
Subject: [PATCH 095/100] Fix js test errors - foundation not found, but not
 reqd for testing angular

---
 config/ng-test.conf.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js
index 95d05a75fc..f317ee9409 100644
--- a/config/ng-test.conf.js
+++ b/config/ng-test.conf.js
@@ -17,7 +17,11 @@ module.exports = function(config) {
       'spec/javascripts/unit/**/*.js*'
     ],
 
-    exclude: ['**/.#*'],
+    exclude: [
+      '**/.#*',
+      'app/assets/javascripts/darkswarm/all.js.coffee',
+      'app/assets/javascripts/darkswarm/overrides.js.coffee'
+    ],
 
     coffeePreprocessor: {
       options: {

From 420ff37562b51b0e9963b0a936daa066346d10d6 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 9 Jan 2014 12:09:50 +1100
Subject: [PATCH 096/100] Provide explicit ordering for intermittently failing
 spec

---
 spec/features/admin/order_cycles_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 4e6564756c..8f2c1b2a34 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -379,8 +379,8 @@ feature %q{
 
     # Then my times should have been saved
     flash_message.should == 'Order cycles have been updated.'
-    OrderCycle.all.map { |oc| oc.orders_open_at.sec }.should == [0, 2, 4]
-    OrderCycle.all.map { |oc| oc.orders_close_at.sec }.should == [1, 3, 5]
+    OrderCycle.order('id ASC').map { |oc| oc.orders_open_at.sec }.should == [0, 2, 4]
+    OrderCycle.order('id ASC').map { |oc| oc.orders_close_at.sec }.should == [1, 3, 5]
   end
 
   scenario "cloning an order cycle" do

From c396c2a21f084c5b519a6437b1de492d6c1938c8 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 9 Jan 2014 12:37:43 +1100
Subject: [PATCH 097/100] Improve speed of BPE specs

---
 spec/features/admin/bulk_product_update_spec.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 7ac48ac0c0..3e9ce76649 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -22,7 +22,7 @@ feature %q{
     end
 
     it "displays a 'loading' splash for products" do
-      101.times{ FactoryGirl.create(:product) }
+      FactoryGirl.create(:simple_product)
 
       visit '/admin/products/bulk_edit'
 
@@ -45,8 +45,8 @@ feature %q{
       page.should have_text "No matching products found."
     end
 
-    it "displays a message when number of products is too great" do
-      501.times{ FactoryGirl.create(:simple_product) }
+    pending "displays a message when number of products is too great" do
+      501.times { FactoryGirl.create(:simple_product) }
 
       visit '/admin/products/bulk_edit'
 
@@ -523,7 +523,6 @@ feature %q{
         page.should have_selector "a.clone-product", :count => 3
 
         first("a.clone-product").click
-        sleep 5
         page.should have_selector "a.clone-product", :count => 4
         page.should have_field "product_name", with: "COPY OF #{p1.name}"
         page.should have_select "supplier", selected: "#{p1.supplier.name}"

From ee2da3e00822a0855a8bdb11d187e689a52d419a Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 10 Jan 2014 00:26:54 +0800
Subject: [PATCH 098/100] Toggle new view controls on BPE

---
 .../admin/bulk_product_update.js.coffee       |  9 +++
 .../stylesheets/admin/products.css.scss       | 45 +++++++++---
 .../spree/admin/products/bulk_edit.html.haml  | 70 +++++++++----------
 .../admin/bulk_product_update_spec.rb         | 46 +++++++++++-
 4 files changed, 125 insertions(+), 45 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index a56eefd83b..328b813ebf 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -65,6 +65,7 @@ productsApp.directive "ofnToggleVariants", ->
           element.addClass "icon-chevron-down"
 
 
+
 productsApp.directive "ofnToggleColumn", ->
   link: (scope, element, attrs) ->
     element.addClass "unselected"  unless scope.column.visible
@@ -148,7 +149,11 @@ productsApp.controller "AdminBulkProductsCtrl", [
       { name: "Contains",       predicate: "cont" }
     ]
 
+    $scope.optionTabs =
+      filters:        { title: "Filter Products",   visible: false }
+      column_toggle:  { title: "Toggle Columns",    visible: false }
 
+    $scope.visibleTab = { title: "Lala" }
     $scope.perPage = 25
     $scope.currentPage = 1
     $scope.products = []
@@ -244,6 +249,10 @@ productsApp.controller "AdminBulkProductsCtrl", [
         onHand = "error"
       onHand
 
+    $scope.shiftTab = (tab) ->
+      $scope.visibleTab.visible = false unless $scope.visibleTab == tab
+      tab.visible = !tab.visible
+      $scope.visibleTab = tab
 
     $scope.addFilter = (filter) ->
       if $scope.filterableColumns.indexOf(filter.property) >= 0
diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss
index 97e52ac291..026e4cf83b 100644
--- a/app/assets/stylesheets/admin/products.css.scss
+++ b/app/assets/stylesheets/admin/products.css.scss
@@ -16,9 +16,7 @@ div.pagination_info {
 	text-align: right;
 }
 
-div.filters {
-	margin-bottom: 10px;
-}
+
 
 div.applied_filter {
 	margin-bottom: 5px;
@@ -30,6 +28,33 @@ div.applied_filter {
 	}
 }
 
+div.option_tabs {
+	div.applied_filters, div.filters, div.column_toggle {
+		margin-bottom: 10px;
+	}
+}
+
+div.option_tab_titles {
+	h6 {
+		border-radius: 3px;
+		border: 1px solid #cee1f4;
+		padding: 3px;
+		text-align: center;
+		color: darken(#cee1f4, 3);
+		cursor: pointer;
+		-moz-user-select: none;
+		-khtml-user-select: none;
+		-webkit-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
+	}
+	h6.selected {
+		border: 1px solid #5498da;
+		color: #5498da;
+	}
+	margin-bottom: 10px;
+}
+
 tbody.odd {
 	tr.product { td { background-color: white; } }
 	tr.variant.odd { td { background-color: lighten(#eff5fc, 3); } }
@@ -55,11 +80,18 @@ li.column-list-item {
   border-radius: 3px;
   padding: 2px 20px;
   margin: 2px 1px;
-  border: 2px solid darken(#5498da, 3);
+  border: 2px solid #5498da;
   background-color: #5498da;
   color: white;
   font-size: 100%;
   cursor: default;
+  text-align: center;
+  cursor: pointer;
+  -moz-user-select: none;
+  -khtml-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 li.column-list-item.unselected {
@@ -70,10 +102,7 @@ li.column-list-item.unselected {
 }
 
 ul.column-list {
-  padding: 5px 8px;
-  border-radius: 3px;
-  border: solid 1px darkgray;
-  list-style:none
+  list-style: none;
 }
 
 table#listing_products.bulk {
diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index 3a946a8c46..e5a4d4a3b7 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -16,33 +16,41 @@
 %div{ 'ng-app' => 'bulk_product_update', 'ng-controller' => 'AdminBulkProductsCtrl', 'ng-init' => "initialise('#{@spree_api_key}');loading=true;" }
   %div{ 'ng-show' => '!spree_api_key_ok' }
     {{ api_error_msg }}
-  %div.filters{ :class => "sixteen columns alpha" }
-    %h5 Filter Products
-    %div{ :class => "four columns alpha" }
-      Column:
-      %br.clear
-      %select.select2.fullwidth{ 'ng-model' => 'filterProperty', :name => "filter_property", 'ng-options' => 'fc.name for fc in filterableColumns' }
-    %div{ :class => "four columns omega" }
-      Filter Type:
-      %br.clear
-      %select.select2.fullwidth{ 'ng-model' => 'filterPredicate', :name => "filter_predicate", 'ng-options' => 'ft.name for ft in filterTypes' }
-    %div{ :class => "six columns omega" }
-      Value:
-      %br.clear
-      %input{ :class => "four columns alpha", 'ng-model' => 'filterValue', :name => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
-    %div{ :class => "two columns omega" }
-      &nbsp;
-      %input.fullwidth{ :name => "add_filter", :value => "Apply Filter", :type => "button", "ng-click" => "addFilter({property:filterProperty,predicate:filterPredicate,value:filterValue})" }
-  %div.applied_filter{ :class => "sixteen columns alpha", 'ng-repeat' => 'filter in currentFilters' }
-    %div{ :class => "four columns alpha" }
-      {{ filter.property.name }}
-    %div{ :class => "four columns omega" }
-      {{ filter.predicate.name }}
-    %div{ :class => "six columns omega" }
-      {{ filter.value }}
-    %div{ :class => "two columns omega" }
-      %a{ 'ng-click' => "removeFilter(filter)" } Remove Filter
-  %hr
+  %div.option_tab_titles{ :class => "sixteen columns alpha" }
+    %h6{ :class => "three columns alpha", 'ng-repeat' => "tab in optionTabs", "ng-click" => "shiftTab(tab)", "ng-class" => "tab.visible && 'selected' || !tab.visible && 'unselected'"}
+      {{ tab.title }}
+  %div.option_tabs{ :class => "sixteen columns alpha" }
+    %div.filters{ :class => "sixteen columns alpha", "ng-show" => 'optionTabs.filters.visible' }
+      %div{ :class => "four columns alpha" }
+        Column:
+        %br.clear
+        %select.select2.fullwidth{ 'ng-model' => 'filterProperty', :name => "filter_property", 'ng-options' => 'fc.name for fc in filterableColumns' }
+      %div{ :class => "four columns omega" }
+        Filter Type:
+        %br.clear
+        %select.select2.fullwidth{ 'ng-model' => 'filterPredicate', :name => "filter_predicate", 'ng-options' => 'ft.name for ft in filterTypes' }
+      %div{ :class => "six columns omega" }
+        Value:
+        %br.clear
+        %input{ :class => "four columns alpha", 'ng-model' => 'filterValue', :name => "filter_value", :type => "text", 'placeholder' => 'Filter Value' }
+      %div{ :class => "two columns omega" }
+        &nbsp;
+        %input.fullwidth{ :name => "add_filter", :value => "Apply Filter", :type => "button", "ng-click" => "addFilter({property:filterProperty,predicate:filterPredicate,value:filterValue})" }
+    %div.applied_filters{ :class => "sixteen columns alpha", "ng-show" => 'optionTabs.filters.visible && currentFilters.length > 0' }
+      %div.applied_filter{ :class => "sixteen columns alpha", 'ng-repeat' => 'filter in currentFilters' }
+        %div{ :class => "four columns alpha" }
+          {{ filter.property.name }}
+        %div{ :class => "four columns omega" }
+          {{ filter.predicate.name }}
+        %div{ :class => "six columns omega" }
+          {{ filter.value }}
+        %div{ :class => "two columns omega" }
+          %a{ 'ng-click' => "removeFilter(filter)" } Remove Filter
+    %div.column_toggle{ :class => "sixteen columns alpha", "ng-show" => 'optionTabs.column_toggle.visible' }
+      %ul.column-list{ :class => "sixteen columns alpha" }
+        %li.column-list-item{ :class => "three columns alpha", 'ofn-toggle-column' => 'column', 'ng-repeat' => 'column in columns' }
+          {{ column.name }}
+    %hr
   %div.loading{ 'ng-show' => 'loading' }
     %h4 Loading Products...
   %div{ 'ng-show' => '!loading && products.length == 0' }
@@ -50,14 +58,6 @@
   %div{ 'ng-show' => 'products.length == 500' }
     %h6 Search returned too many products to display (500+), please apply more search filters to reduce the number of matching products
   %div{ 'ng-hide' => 'loading || products.length == 500 || products.length == 0' }
-    %div.column_toggle
-      %h5 Toggle Columns
-      %input{ :type => 'button', :value => 'Toggle Columns', 'ofn-toggle-column-list' => true }
-      %div{ :style => 'display: none;' }
-        %ul.column-list{ style: 'border: 1px solid darkgray; background-color: white;' }
-          %li.column-list-item{ 'ofn-toggle-column' => 'column', 'ng-repeat' => 'column in columns' }
-            {{ column.name }}
-    %hr
     %div.quick_search{ :class => "five columns omega" }
       %input.search{ :class => "four columns alpha", 'ng-model' => 'query', :name => "quick_filter", :type => 'text', 'placeholder' => 'Quick Search' }
     %div.pagination{ :class => "seven columns omega" }
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 3e9ce76649..e9dae33a81 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -407,6 +407,8 @@ feature %q{
 
     visit '/admin/products/bulk_edit'
 
+    first("div.option_tab_titles h6", :text => "Filter Products").click
+
     select "Name", :from => "filter_property"
     select "Contains", :from => "filter_predicate"
     fill_in "filter_value", :with => "1"
@@ -537,6 +539,41 @@ feature %q{
   end
 
   describe "using the page" do
+    describe "using tabs to hide and display page controls" do
+      it "shows a column display toggle button, which shows a list of columns when clicked" do
+        FactoryGirl.create(:simple_product)
+        login_to_admin_section
+
+        visit '/admin/products/bulk_edit'
+
+        page.should have_selector "div.column_toggle", :visible => false
+
+        page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
+        first("div.option_tab_titles h6", :text => "Toggle Columns").click
+
+        page.should have_selector "div.option_tab_titles h6.selected", :text => "Toggle Columns"
+        page.should have_selector "div.column_toggle", :visible => true
+        page.should have_selector "li.column-list-item", text: "Available On"
+
+        page.should have_selector "div.filters", :visible => false
+
+        page.should have_selector "div.option_tab_titles h6.unselected", :text => "Filter Products"
+        first("div.option_tab_titles h6", :text => "Filter Products").click
+
+        page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
+        page.should have_selector "div.option_tab_titles h6.selected", :text => "Filter Products"
+        page.should have_selector "div.filters", :visible => true
+        page.should have_selector "li.column-list-item", text: "Available On"
+
+        first("div.option_tab_titles h6", :text => "Filter Products").click
+
+        page.should have_selector "div.option_tab_titles h6.unselected", :text => "Filter Products"
+        page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
+        page.should have_selector "div.filters", :visible => false
+        page.should have_selector "div.column_toggle", :visible => false
+      end
+    end
+
     describe "using column display toggle" do
       it "shows a column display toggle button, which shows a list of columns when clicked" do
         FactoryGirl.create(:simple_product)
@@ -550,9 +587,9 @@ feature %q{
         page.should have_selector "th", :text => "ON HAND"
         page.should have_selector "th", :text => "AV. ON"
 
-        page.should have_button "Toggle Columns"
+        page.should have_selector "div.option_tab_titles h6", :text => "Toggle Columns"
 
-        click_button "Toggle Columns"
+        first("div.option_tab_titles h6", :text => "Toggle Columns").click
 
         page.should have_selector "div ul.column-list li.column-list-item", text: "Supplier"
         all("div ul.column-list li.column-list-item").select{ |e| e.text == "Supplier" }.first.click
@@ -648,6 +685,9 @@ feature %q{
         login_to_admin_section
         visit '/admin/products/bulk_edit'
 
+        page.should have_selector "div.option_tab_titles h6", :text => "Filter Products"
+        first("div.option_tab_titles h6", :text => "Filter Products").click
+
         page.should have_select "filter_property", :with_options => ["Supplier", "Name"]
         page.should have_select "filter_predicate", :with_options => ["Equals", "Contains"]
         page.should have_field "filter_value"
@@ -661,6 +701,8 @@ feature %q{
           login_to_admin_section
           visit '/admin/products/bulk_edit'
 
+          first("div.option_tab_titles h6", :text => "Filter Products").click
+
           select "Name", :from => "filter_property"
           select "Equals", :from => "filter_predicate"
           fill_in "filter_value", :with => "Product1"

From 29ba0ccc9755b82ca27e201766fb92b275a6b7b4 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 10 Jan 2014 00:46:42 +0800
Subject: [PATCH 099/100] Initialise BPE page with 'Available On' column hidden

---
 .../javascripts/admin/bulk_product_update.js.coffee |  2 +-
 spec/features/admin/bulk_product_update_spec.rb     | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 328b813ebf..90b612ccd3 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -127,7 +127,7 @@ productsApp.controller "AdminBulkProductsCtrl", [
       unit:         {name: "Unit",         visible: true}
       price:        {name: "Price",        visible: true}
       on_hand:      {name: "On Hand",      visible: true}
-      available_on: {name: "Available On", visible: true}
+      available_on: {name: "Available On", visible: false}
 
     $scope.variant_unit_options = [
       ["Weight (g)", "weight_1"],
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index e9dae33a81..a61123be5a 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -240,6 +240,9 @@ feature %q{
     login_to_admin_section
 
     visit '/admin/products/bulk_edit'
+    
+    first("div.option_tab_titles h6", :text => "Toggle Columns").click
+    first("li.column-list-item", text: "Available On").click
 
     page.should have_field "product_name", with: p.name
     page.should have_select "supplier", selected: s1.name
@@ -580,6 +583,9 @@ feature %q{
         login_to_admin_section
 
         visit '/admin/products/bulk_edit'
+        
+        first("div.option_tab_titles h6", :text => "Toggle Columns").click
+        first("li.column-list-item", text: "Available On").click
 
         page.should have_selector "th", :text => "NAME"
         page.should have_selector "th", :text => "SUPPLIER"
@@ -589,10 +595,8 @@ feature %q{
 
         page.should have_selector "div.option_tab_titles h6", :text => "Toggle Columns"
 
-        first("div.option_tab_titles h6", :text => "Toggle Columns").click
-
         page.should have_selector "div ul.column-list li.column-list-item", text: "Supplier"
-        all("div ul.column-list li.column-list-item").select{ |e| e.text == "Supplier" }.first.click
+        first("li.column-list-item", text: "Supplier").click
 
         page.should_not have_selector "th", :text => "SUPPLIER"
         page.should have_selector "th", :text => "NAME"
@@ -789,6 +793,9 @@ feature %q{
       p = product_supplied
 
       visit '/admin/products/bulk_edit'
+      
+      first("div.option_tab_titles h6", :text => "Toggle Columns").click
+      first("li.column-list-item", text: "Available On").click
 
       page.should have_field "product_name", with: p.name
       page.should have_select "supplier", selected: s1.name

From aff35e5749010906eda61b8c8fa126b1d9c4e94f Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 10 Jan 2014 01:08:03 +0800
Subject: [PATCH 100/100] Remove unused toggle-column-list directive

---
 .../admin/bulk_product_update.js.coffee        | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 90b612ccd3..e3634eb6a8 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -78,24 +78,6 @@ productsApp.directive "ofnToggleColumn", ->
           scope.column.visible = true
           element.removeClass "unselected"
 
-
-productsApp.directive "ofnToggleColumnList", [
-  "$compile"
-  ($compile) ->
-    return link: (scope, element, attrs) ->
-      dialogDiv = element.next()
-      element.on "click", ->
-        pos = element.position()
-        height = element.outerHeight()
-        dialogDiv.css(
-          position: "absolute"
-          top: (pos.top + height) + "px"
-          left: pos.left + "px"
-        ).toggle()
-
-]
-
-
 productsApp.directive "datetimepicker", [
   "$parse"
   ($parse) ->