From 4414a3f28755ca8cff89c44f13eb8212218cfdca Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Sat, 9 Apr 2016 10:05:45 +0100
Subject: [PATCH 01/45] Fix spelling mistake

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

diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index 17473fd521..10a1c28972 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -55,7 +55,7 @@ Spree.user_class.class_eval do
   end
 
   # Returns orders and their associated payments for all distributors that have been ordered from
-  def compelete_orders_by_distributor
+  def complete_orders_by_distributor
     Enterprise
       .includes(distributed_orders: { payments: :payment_method })
       .where(enterprises: { id: enterprises_ordered_from },
@@ -65,7 +65,7 @@ Spree.user_class.class_eval do
 
   def orders_by_distributor
     # Remove uncompleted payments as these will not be reflected in order balance
-    data_array = compelete_orders_by_distributor.to_a
+    data_array = complete_orders_by_distributor.to_a
     remove_uncompleted_payments(data_array)
     data_array.sort! { |a, b| b.distributed_orders.length <=> a.distributed_orders.length }
   end

From bc048a943c776f910ff6cabe44df773d65b59e53 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Sun, 10 Apr 2016 22:23:39 +0100
Subject: [PATCH 02/45] Show all payments, format unsuccessful payments grey,
 add 'invalid' translation.

---
 .../stylesheets/darkswarm/account.css.sass    |  7 +++++
 app/models/spree/user_decorator.rb            |  6 ++--
 app/serializers/api/payment_serializer.rb     |  2 +-
 app/views/spree/users/_fat.html.haml          |  6 ++--
 config/locales/en-GB.yml                      | 31 +++++++++++++++++++
 config/locales/en.yml                         |  1 +
 6 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/account.css.sass b/app/assets/stylesheets/darkswarm/account.css.sass
index f582545b74..0f3de5af57 100644
--- a/app/assets/stylesheets/darkswarm/account.css.sass
+++ b/app/assets/stylesheets/darkswarm/account.css.sass
@@ -32,6 +32,13 @@
   .debit
     color: $clr-brick
 
+  .invalid
+    color: $ofn-grey
+    .credit
+      color: $ofn-grey
+    .debit
+      color: $ofn-grey
+
   .distributor-balance.paid
     visibility: hidden
 
diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index 10a1c28972..274330d1da 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -66,7 +66,7 @@ Spree.user_class.class_eval do
   def orders_by_distributor
     # Remove uncompleted payments as these will not be reflected in order balance
     data_array = complete_orders_by_distributor.to_a
-    remove_uncompleted_payments(data_array)
+    remove_payments_in_checkout(data_array)
     data_array.sort! { |a, b| b.distributed_orders.length <=> a.distributed_orders.length }
   end
 
@@ -78,10 +78,10 @@ Spree.user_class.class_eval do
     end
   end
 
-  def remove_uncompleted_payments(enterprises)
+  def remove_payments_in_checkout(enterprises)
     enterprises.each do |enterprise|
       enterprise.distributed_orders.each do |order|
-        order.payments.keep_if { |payment| payment.state == "completed" }
+        order.payments.keep_if { |payment| payment.state != "checkout" }
       end
     end
   end
diff --git a/app/serializers/api/payment_serializer.rb b/app/serializers/api/payment_serializer.rb
index d48f75a07f..8465998db6 100644
--- a/app/serializers/api/payment_serializer.rb
+++ b/app/serializers/api/payment_serializer.rb
@@ -1,6 +1,6 @@
 module Api
   class PaymentSerializer < ActiveModel::Serializer
-    attributes :amount, :updated_at, :payment_method
+    attributes :amount, :updated_at, :payment_method, :state
     def payment_method
       object.payment_method.name
     end
diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml
index c10cf8254a..9f9ad67b10 100644
--- a/app/views/spree/users/_fat.html.haml
+++ b/app/views/spree/users/_fat.html.haml
@@ -19,10 +19,10 @@
           %td.order5.text-right{"ng-class" => "{'credit' : order.total < 0, 'debit' : order.total > 0, 'paid' : order.total == 0}","bo-text" => "order.total | localizeCurrency"}
           %td.order6.text-right.show-for-large-up{"ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}", "bo-text" => "order.outstanding_balance | localizeCurrency"}
           %td.order7.text-right{"ng-class" => "{'credit' : order.running_balance < 0, 'debit' : order.running_balance > 0, 'paid' : order.running_balance == 0}", "bo-text" => "order.running_balance | localizeCurrency"}
-          %tr.payment-row{"ng-repeat" => "payment in order.payments"}
-            %td.order1= t :payment
+          %tr.payment-row{"ng-repeat" => "payment in order.payments", "ng-class" => "{'invalid': payment.state != 'completed'}"}
+            %td.order1{"bo-text" => "payment.payment_method"}
             %td.order2{"bo-text" => "payment.updated_at"}
-            %td.order3.show-for-large-up{"bo-text" => "payment.payment_method"}
+            %td.order3.show-for-large-up{"bo-text" => "'spree.payment_states.' + payment.state | t | capitalize"}
             %td.order4.show-for-large-up
             %td.order5.text-right{"ng-class" => "{'credit' : payment.amount > 0, 'debit' : payment.amount < 0, 'paid' : payment.amount == 0}","bo-text" => "payment.amount | localizeCurrency"}
             %td.order6.show-for-large-up
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 7301ef4f2c..3e793f88a4 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -635,3 +635,34 @@ Please follow the instructions there to make your enterprise visible on the Open
   price_graph: "Price graph"
   included_tax: "Included tax"
   remove_tax: "Remove tax"
+  spree:
+    shipment_states:
+      backorder: backorder
+      partial: partial
+      pending: pending
+      ready: ready
+      shipped: shipped
+    payment_states:
+      balance_due: balance due
+      completed: completed
+      checkout: checkout
+      credit_owed: credit owed
+      failed: failed
+      paid: paid
+      pending: pending
+      processing: processing
+      void: void
+      invalid: invalid
+    order_state:
+      address: address
+      adjustments: adjustments
+      awaiting_return: awaiting return
+      canceled: canceled
+      cart: cart
+      complete: complete
+      confirm: confirm
+      delivery: delivery
+      payment: payment
+      resumed: resumed
+      returned: returned
+      skrill: skrill
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5bf35d1aa5..020011ea8d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -996,6 +996,7 @@ Please follow the instructions there to make your enterprise visible on the Open
       pending: pending
       processing: processing
       void: void
+      invalid: invalid
     order_state:
       address: address
       adjustments: adjustments

From 14830237692bb005c409a83fde4df9caace58a0d Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Sun, 10 Apr 2016 22:48:38 +0100
Subject: [PATCH 03/45] Add a sweet warning sign

---
 app/views/spree/users/_fat.html.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml
index 9f9ad67b10..df5bd71c5d 100644
--- a/app/views/spree/users/_fat.html.haml
+++ b/app/views/spree/users/_fat.html.haml
@@ -22,7 +22,9 @@
           %tr.payment-row{"ng-repeat" => "payment in order.payments", "ng-class" => "{'invalid': payment.state != 'completed'}"}
             %td.order1{"bo-text" => "payment.payment_method"}
             %td.order2{"bo-text" => "payment.updated_at"}
-            %td.order3.show-for-large-up{"bo-text" => "'spree.payment_states.' + payment.state | t | capitalize"}
+            %td.order3.show-for-large-up
+              %i{"ng-class" => "{'ofn-i_012-warning': payment.state == 'invalid' || payment.state == 'void'}"}
+              %span{"bo-text" => "'spree.payment_states.' + payment.state | t | capitalize"}
             %td.order4.show-for-large-up
             %td.order5.text-right{"ng-class" => "{'credit' : payment.amount > 0, 'debit' : payment.amount < 0, 'paid' : payment.amount == 0}","bo-text" => "payment.amount | localizeCurrency"}
             %td.order6.show-for-large-up

From fc719230a3ea29a4b9fd16c5bb4a075c323aa0e0 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Fri, 15 Apr 2016 08:26:12 +0100
Subject: [PATCH 04/45] Add failed payments, update spec

---
 app/views/spree/users/_fat.html.haml | 2 +-
 spec/models/spree/user_spec.rb       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml
index df5bd71c5d..5c87077b4c 100644
--- a/app/views/spree/users/_fat.html.haml
+++ b/app/views/spree/users/_fat.html.haml
@@ -23,7 +23,7 @@
             %td.order1{"bo-text" => "payment.payment_method"}
             %td.order2{"bo-text" => "payment.updated_at"}
             %td.order3.show-for-large-up
-              %i{"ng-class" => "{'ofn-i_012-warning': payment.state == 'invalid' || payment.state == 'void'}"}
+              %i{"ng-class" => "{'ofn-i_012-warning': payment.state == 'invalid' || payment.state == 'void' || payment.state == 'failed'}"}
               %span{"bo-text" => "'spree.payment_states.' + payment.state | t | capitalize"}
             %td.order4.show-for-large-up
             %td.order5.text-right{"ng-class" => "{'credit' : payment.amount > 0, 'debit' : payment.amount < 0, 'paid' : payment.amount == 0}","bo-text" => "payment.amount | localizeCurrency"}
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index ee01326316..9911c16a51 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -92,7 +92,7 @@ describe Spree.user_class do
     let!(:d2o1) { create(:completed_order_with_totals, distributor: distributor2, user_id: u2.id)}
 
     let!(:completed_payment) { create(:payment, order: d1o1, state: 'completed')}
-    let!(:payment) { create(:payment, order: d1o2, state: 'invalid')}
+    let!(:payment) { create(:payment, order: d1o2, state: 'checkout')}
 
     it "returns enterprises that the user has ordered from" do
       expect(u1.enterprises_ordered_from).to eq [distributor1.id]
@@ -114,7 +114,7 @@ describe Spree.user_class do
       expect(u1.orders_by_distributor.first.distributed_orders).not_to include d1o3
     end
 
-    it "doesn't return uncompleted payments" do
+    it "doesn't return payments that are still at checkout stage" do
       expect(u1.orders_by_distributor.first.distributed_orders.map{|o| o.payments}.flatten).not_to include payment
     end
   end

From 7f38f1dd1c63f7b4b804fa05a519fcfb3bfa61e9 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Tue, 26 Apr 2016 03:14:13 +0100
Subject: [PATCH 05/45] Exclude Accounts & Billing distributor

---
 app/models/spree/user_decorator.rb     | 5 ++++-
 spec/features/consumer/account_spec.rb | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index 9a992ba910..7e3a38afb2 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -56,7 +56,10 @@ Spree.user_class.class_eval do
 
   # Returns Enterprise IDs for distributors that the user has shopped at
   def enterprises_ordered_from
-    orders.where(state: :complete).map(&:distributor_id).uniq
+    orders.where(state: :complete)
+      .where('distributor_id != ?', Spree::Config.accounts_distributor_id)
+      .map(&:distributor_id)
+      .uniq
   end
 
   # Returns orders and their associated payments for all distributors that have been ordered from
diff --git a/spec/features/consumer/account_spec.rb b/spec/features/consumer/account_spec.rb
index b072a24357..1203d459de 100644
--- a/spec/features/consumer/account_spec.rb
+++ b/spec/features/consumer/account_spec.rb
@@ -13,6 +13,8 @@ feature %q{
   let!(:distributor2) { create(:distributor_enterprise) }
   let!(:distributor_credit) { create(:distributor_enterprise) }
   let!(:distributor_without_orders) { create(:distributor_enterprise) }
+  let!(:accounts_distributor) {create :distributor_enterprise}
+  let!(:order_account_invoice) { create(:order, distributor: accounts_distributor, user: user) }
   let!(:d1o1) { create(:completed_order_with_totals, distributor_id: distributor1.id, user_id: user.id, total: 10000)}
   let!(:d1o2) { create(:order_without_full_payment, distributor_id: distributor1.id, user_id: user.id, total: 5000)}
   let!(:d2o1) { create(:completed_order_with_totals, distributor_id: distributor2.id, user_id: user.id)}
@@ -21,19 +23,24 @@ feature %q{
 
 
   before do
+    Spree::Config.accounts_distributor_id = accounts_distributor.id
     credit_order.update!
     login_as user
     visit "/account"
   end
 
   it "shows all hubs that have been ordered from with balance or credit" do
+    # Single test to avoid re-rendering page
     expect(page).to have_content distributor1.name
     expect(page).to have_content distributor2.name
     expect(page).not_to have_content distributor_without_orders.name
+    # Exclude the special Accounts & Billing distributor
+    expect(page).not_to have_content accounts_distributor.name
     expect(page).to have_content distributor1.name + " " + "Balance due"
     expect(page).to have_content distributor_credit.name + " Credit"
   end
 
+
   it "reveals table of orders for distributors when clicked" do
     expand_active_table_node distributor1.name
     expect(page).to have_link "Order " + d1o1.number, href:"/orders/#{d1o1.number}"

From 43d6e49c3a372dba3021af7c834d4a7740b8af84 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Tue, 26 Apr 2016 03:31:56 +0100
Subject: [PATCH 06/45] Fix spec

---
 spec/features/consumer/account_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/consumer/account_spec.rb b/spec/features/consumer/account_spec.rb
index 1203d459de..58d4e1acc6 100644
--- a/spec/features/consumer/account_spec.rb
+++ b/spec/features/consumer/account_spec.rb
@@ -14,7 +14,7 @@ feature %q{
   let!(:distributor_credit) { create(:distributor_enterprise) }
   let!(:distributor_without_orders) { create(:distributor_enterprise) }
   let!(:accounts_distributor) {create :distributor_enterprise}
-  let!(:order_account_invoice) { create(:order, distributor: accounts_distributor, user: user) }
+  let!(:order_account_invoice) { create(:order, distributor: accounts_distributor, state: 'complete', user: user) }
   let!(:d1o1) { create(:completed_order_with_totals, distributor_id: distributor1.id, user_id: user.id, total: 10000)}
   let!(:d1o2) { create(:order_without_full_payment, distributor_id: distributor1.id, user_id: user.id, total: 5000)}
   let!(:d2o1) { create(:completed_order_with_totals, distributor_id: distributor2.id, user_id: user.id)}

From ad6037ac63193a921ed9bb18c118b79acbd19290 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Tue, 26 Apr 2016 04:21:50 +0100
Subject: [PATCH 07/45] Fix user spec, check config is set

---
 app/models/spree/user_decorator.rb | 11 +++++++----
 spec/models/spree/user_spec.rb     |  8 +++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index ac62fee8d1..011bffc5dd 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -51,10 +51,13 @@ Spree.user_class.class_eval do
 
   # Returns Enterprise IDs for distributors that the user has shopped at
   def enterprises_ordered_from
-    orders.where(state: :complete)
-      .where('distributor_id != ?', Spree::Config.accounts_distributor_id)
-      .map(&:distributor_id)
-      .uniq
+    enterprise_ids = orders.where(state: :complete).map(&:distributor_id).uniq
+    # Exclude the accounts distributor
+    if Spree::Config.accounts_distributor_id
+      enterprise_ids = enterprise_ids.keep_if{|a| a != Spree::Config.accounts_distributor_id}
+    end
+    enterprise_ids
+
   end
 
   # Returns orders and their associated payments for all distributors that have been ordered from
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index 0c15da5378..441757bf38 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -90,11 +90,17 @@ describe Spree.user_class do
     let!(:d1_order_for_u2) { create(:completed_order_with_totals, distributor: distributor1, user_id: u2.id) }
     let!(:d1o3) { create(:order, state: 'cart', distributor: distributor1, user_id: u1.id) }
     let!(:d2o1) { create(:completed_order_with_totals, distributor: distributor2, user_id: u2.id) }
+    let!(:accounts_distributor) {create :distributor_enterprise}
+    let!(:order_account_invoice) { create(:order, distributor: accounts_distributor, state: 'complete', user: u1) }
 
     let!(:completed_payment) { create(:payment, order: d1o1, state: 'completed') }
     let!(:payment) { create(:payment, order: d1o2, state: 'checkout') }
 
-    it "returns enterprises that the user has ordered from" do
+    before do
+      Spree::Config.accounts_distributor_id = accounts_distributor.id
+    end
+
+    it "returns enterprises that the user has ordered from, excluding accounts distributor" do
       expect(u1.enterprises_ordered_from).to eq [distributor1.id]
     end
 

From 2b921542a527bc0bb21f59c9281dbe5a366c1e5d Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Tue, 26 Apr 2016 04:24:44 +0100
Subject: [PATCH 08/45] Code styling

---
 app/models/spree/user_decorator.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/spree/user_decorator.rb b/app/models/spree/user_decorator.rb
index 011bffc5dd..afd32bd294 100644
--- a/app/models/spree/user_decorator.rb
+++ b/app/models/spree/user_decorator.rb
@@ -54,10 +54,9 @@ Spree.user_class.class_eval do
     enterprise_ids = orders.where(state: :complete).map(&:distributor_id).uniq
     # Exclude the accounts distributor
     if Spree::Config.accounts_distributor_id
-      enterprise_ids = enterprise_ids.keep_if{|a| a != Spree::Config.accounts_distributor_id}
+      enterprise_ids = enterprise_ids.keep_if { |a| a != Spree::Config.accounts_distributor_id }
     end
     enterprise_ids
-
   end
 
   # Returns orders and their associated payments for all distributors that have been ordered from

From ef0e41e624ec626c17cb17855e75cd23e0b14470 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 20 Apr 2016 15:31:11 +1000
Subject: [PATCH 09/45] Use save bar on order cycle form

---
 .../admin/order_cycles/controllers/edit.js.coffee            | 5 +++++
 app/assets/javascripts/templates/admin/save_bar.html.haml    | 2 +-
 app/views/admin/order_cycles/edit.html.haml                  | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index fd426eb455..a17f52e42c 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -12,6 +12,9 @@ angular.module('admin.orderCycles')
 
     $scope.StatusMessage = StatusMessage
 
+    $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+
     $scope.loaded = ->
       Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
 
@@ -81,4 +84,6 @@ angular.module('admin.orderCycles')
       OrderCycle.removeDistributionOfVariant(variant_id)
 
     $scope.submit = (destination) ->
+      StatusMessage.display 'progress', "Saving..."
       OrderCycle.update(destination)
+      this.order_cycle_form.$setPristine()
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index 452e81f6e3..ac4fa55de5 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,4 +1,4 @@
-#save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
+#save-bar.animate-show{ ng: { show: 'StatusMessage.active()' } }
   .twelve.columns.alpha
     %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
       {{ StatusMessage.statusMessage.text || "&nbsp;" }}
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index f3b0bdb721..6ecb65d87e 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -27,7 +27,9 @@
 
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
+  %save-bar{ save: "submit()", form: "order_cycle_form" }
+
   - if order_cycles_simple_form
     = render 'simple_form', f: f
   - else

From 00858656b5b4f16cf4e9d04c72529663db9704c0 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 27 Apr 2016 12:15:20 +1000
Subject: [PATCH 10/45] Extend save_bar directive to support more buttons

---
 .../javascripts/admin/utils/directives/save_bar.js.coffee     | 1 +
 app/assets/javascripts/templates/admin/save_bar.html.haml     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
index 13e4f84bc6..9cd25d97cd 100644
--- a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
@@ -3,6 +3,7 @@ angular.module("admin.utils").directive "saveBar", (StatusMessage) ->
   scope:
     save: "&"
     form: "="
+    buttons: "="
   templateUrl: "admin/save_bar.html"
   link: (scope, element, attrs) ->
     scope.StatusMessage = StatusMessage
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index ac4fa55de5..83beac81a5 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -3,4 +3,6 @@
     %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
       {{ StatusMessage.statusMessage.text || "&nbsp;" }}
   .four.columns.omega.text-right
-    %input.red{type: "button", value: "Save Changes", ng: { disabled: '!form.$dirty', click: "save()" } }
+
+    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "save({param: button.param})" } }
+

From 33d0f9fc1b2598aa27d161d17d3e763894a65adf Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 27 Apr 2016 12:16:13 +1000
Subject: [PATCH 11/45] Use save_bar on order cycle update form

---
 app/views/admin/order_cycles/_form.html.haml       | 14 ++++++--------
 .../admin/order_cycles/_simple_form.html.haml      | 13 +++++--------
 app/views/admin/order_cycles/edit.html.haml        |  3 ++-
 .../admin/variant_overrides/_products.html.haml    |  2 +-
 .../spree/admin/orders/bulk_management.html.haml   |  2 +-
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml
index c447d35d58..13b317c314 100644
--- a/app/views/admin/order_cycles/_form.html.haml
+++ b/app/views/admin/order_cycles/_form.html.haml
@@ -52,14 +52,12 @@
 .actions
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  - else
-    = f.submit 'Update', 'ng-click' => "submit(null)", 'ng-disabled' => '!loaded()'
-    = f.submit 'Update and Close', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  %span{'ng-show' => 'loaded()'}
-    or
-    = link_to 'Cancel', main_app.admin_order_cycles_path
-  %span{'ng-hide' => 'loaded()'} Loading...
-  = render 'spree/admin/shared/status_message'
+
+    %span{'ng-show' => 'loaded()'}
+      or
+      = link_to 'Cancel', main_app.admin_order_cycles_path
+    %span{'ng-hide' => 'loaded()'} Loading...
+    = render 'spree/admin/shared/status_message'
 
 
 - unless Rails.env.production?
diff --git a/app/views/admin/order_cycles/_simple_form.html.haml b/app/views/admin/order_cycles/_simple_form.html.haml
index 4dc64a012b..34ea062102 100644
--- a/app/views/admin/order_cycles/_simple_form.html.haml
+++ b/app/views/admin/order_cycles/_simple_form.html.haml
@@ -23,12 +23,9 @@
 .actions
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  - else
-    = f.submit 'Update', 'ng-click' => "submit(null)", 'ng-disabled' => '!loaded()'
-    = f.submit 'Update and Close', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-  %span{'ng-show' => 'loaded()'}
-    or
-    = link_to 'Cancel', main_app.admin_order_cycles_path
-  %span{'ng-hide' => 'loaded()'} Loading...
-  = render 'spree/admin/shared/status_message'
+    %span{'ng-show' => 'loaded()'}
+      or
+      = link_to 'Cancel', main_app.admin_order_cycles_path
+    %span{'ng-hide' => 'loaded()'} Loading...
+    = render 'spree/admin/shared/status_message'
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 6ecb65d87e..4b2a397e49 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -28,7 +28,8 @@
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
-  %save-bar{ save: "submit()", form: "order_cycle_form" }
+
+  %save-bar{ buttons: "[{text: 'Update', param: null}, {text: 'Update and Close', param: '#{main_app.admin_order_cycles_path}'}]", save: "submit(param)", form: "order_cycle_form" }
 
   - if order_cycles_simple_form
     = render 'simple_form', f: f
diff --git a/app/views/admin/variant_overrides/_products.html.haml b/app/views/admin/variant_overrides/_products.html.haml
index c17e4c189a..70ae2c79bf 100644
--- a/app/views/admin/variant_overrides/_products.html.haml
+++ b/app/views/admin/variant_overrides/_products.html.haml
@@ -1,5 +1,5 @@
 %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
-  %save-bar{ save: "update()", form: "variant_overrides_form" }
+  %save-bar{ save: "update()", form: "variant_overrides_form", buttons: "[{text: 'Save Changes'}]" }
   %table.index.bulk#variant-overrides
     %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
     %col.product{ width: "20%", ng: { show: 'columns.product.visible' } }
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index 43983e87ea..b4d7de740d 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -10,7 +10,7 @@
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
 %div{ ng: { controller: 'LineItemsCtrl' } }
-  %save-bar{ save: "submit()", form: "bulk_order_form" }
+  %save-bar{ save: "submit()", form: "bulk_order_form", buttons: "[{text: 'Save Changes'}]" }
   .filters{ :class => "sixteen columns alpha" }
     .date_filter{ :class => "two columns alpha" }
       %label{ :for => 'start_date_filter' }

From 70ce58f5e1d87dbc57ae831469c4ea29d257894f Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 27 Apr 2016 13:47:04 +1000
Subject: [PATCH 12/45] Tweak save_bar css

---
 app/assets/stylesheets/admin/components/save_bar.sass | 2 +-
 app/assets/stylesheets/admin/openfoodnetwork.css.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index c6b1236490..fcc60dbfc3 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -3,7 +3,7 @@
   bottom: 0px
   padding: 8px 10px
   font-weight: bold
-  background-color: #fff
+  background-color: #eff5fc
   color: #5498da
   h5
     color: #5498da
diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
index 17d43ff3a5..1fc95face8 100644
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -37,6 +37,7 @@ text-angular .ta-editor {
 
 input.red {
 	background-color: #DA5354;
+  margin-right: 5px;
 }
 
 input.search {

From 63b644551cef53c0d484369d04a029987abc8fc0 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 29 Apr 2016 10:43:28 +1000
Subject: [PATCH 13/45] Keep the action with save button

---
 .../javascripts/admin/order_cycles/controllers/edit.js.coffee | 2 +-
 .../javascripts/admin/utils/directives/save_bar.js.coffee     | 1 -
 app/assets/javascripts/templates/admin/save_bar.html.haml     | 4 ++--
 app/views/admin/order_cycles/edit.html.haml                   | 2 +-
 app/views/admin/variant_overrides/_products.html.haml         | 2 +-
 app/views/spree/admin/orders/bulk_management.html.haml        | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index a17f52e42c..068447d161 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -86,4 +86,4 @@ angular.module('admin.orderCycles')
     $scope.submit = (destination) ->
       StatusMessage.display 'progress', "Saving..."
       OrderCycle.update(destination)
-      this.order_cycle_form.$setPristine()
+      $scope.order_cycle_form.$setPristine()
diff --git a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
index 9cd25d97cd..0999679394 100644
--- a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
@@ -1,7 +1,6 @@
 angular.module("admin.utils").directive "saveBar", (StatusMessage) ->
   restrict: "E"
   scope:
-    save: "&"
     form: "="
     buttons: "="
   templateUrl: "admin/save_bar.html"
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index 83beac81a5..ddc535d001 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,8 +1,8 @@
-#save-bar.animate-show{ ng: { show: 'StatusMessage.active()' } }
+#save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
   .twelve.columns.alpha
     %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
       {{ StatusMessage.statusMessage.text || "&nbsp;" }}
   .four.columns.omega.text-right
 
-    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "save({param: button.param})" } }
+    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
 
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 4b2a397e49..4f3e5d8516 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -29,7 +29,7 @@
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
 
-  %save-bar{ buttons: "[{text: 'Update', param: null}, {text: 'Update and Close', param: '#{main_app.admin_order_cycles_path}'}]", save: "submit(param)", form: "order_cycle_form" }
+  %save-bar{ buttons: "[{ text: 'Update', action: submit, param: null }, { text: 'Update and Close', action: submit, param: '#{main_app.admin_order_cycles_path}' }]", form: "order_cycle_form" }
 
   - if order_cycles_simple_form
     = render 'simple_form', f: f
diff --git a/app/views/admin/variant_overrides/_products.html.haml b/app/views/admin/variant_overrides/_products.html.haml
index 70ae2c79bf..34c8d02bb2 100644
--- a/app/views/admin/variant_overrides/_products.html.haml
+++ b/app/views/admin/variant_overrides/_products.html.haml
@@ -1,5 +1,5 @@
 %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
-  %save-bar{ save: "update()", form: "variant_overrides_form", buttons: "[{text: 'Save Changes'}]" }
+  %save-bar{ form: "variant_overrides_form", buttons: "[{ text: 'Save Changes', action: update }]" }
   %table.index.bulk#variant-overrides
     %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
     %col.product{ width: "20%", ng: { show: 'columns.product.visible' } }
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index b4d7de740d..2bd58a4cc5 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -10,7 +10,7 @@
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
 %div{ ng: { controller: 'LineItemsCtrl' } }
-  %save-bar{ save: "submit()", form: "bulk_order_form", buttons: "[{text: 'Save Changes'}]" }
+  %save-bar{ form: "bulk_order_form", buttons: "[{ text: 'Save Changes', action: submit }]" }
   .filters{ :class => "sixteen columns alpha" }
     .date_filter{ :class => "two columns alpha" }
       %label{ :for => 'start_date_filter' }

From 885d489bc3431f09ee8677ff381fd162ad62e4a9 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 29 Apr 2016 15:23:19 +1000
Subject: [PATCH 14/45] Fix failed test for the default form

---
 .../order_cycles/controllers/edit.js.coffee   |  1 +
 spec/features/admin/order_cycles_spec.rb      | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index 068447d161..db63a8cbaa 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -63,6 +63,7 @@ angular.module('admin.orderCycles')
     $scope.removeExchange = ($event, exchange) ->
       $event.preventDefault()
       OrderCycle.removeExchange(exchange)
+      $scope.order_cycle_form.$dirty = true
 
     $scope.addCoordinatorFee = ($event) ->
       $event.preventDefault()
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index aafaa5ee77..4827f9b916 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -317,10 +317,10 @@ feature %q{
     # And I add a supplier and some products
     select 'My supplier', from: 'new_supplier_id'
     click_button 'Add supplier'
-    page.all("table.exchanges tr.supplier td.products input").each { |e| e.click }
+    page.all("table.exchanges tr.supplier td.products input").each { |e| e.trigger('click') }
 
     page.should have_selector "#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true
-    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).click # uncheck (with visible:true filter)
+    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).trigger('click') # uncheck (with visible:true filter)
     check "order_cycle_incoming_exchange_2_variants_#{v1.id}"
     check "order_cycle_incoming_exchange_2_variants_#{v2.id}"
 
@@ -343,7 +343,7 @@ feature %q{
     fill_in 'order_cycle_outgoing_exchange_1_pickup_time', with: 'New time 1'
     fill_in 'order_cycle_outgoing_exchange_1_pickup_instructions', with: 'New instructions 1'
 
-    page.all("table.exchanges tr.distributor td.products input").each { |e| e.click }
+    page.all("table.exchanges tr.distributor td.products input").each { |e| e.trigger('click') }
 
     uncheck "order_cycle_outgoing_exchange_2_variants_#{v1.id}"
     check "order_cycle_outgoing_exchange_2_variants_#{v2.id}"
@@ -359,7 +359,8 @@ feature %q{
     select 'Distributor fee 2', from: 'order_cycle_outgoing_exchange_2_enterprise_fees_0_enterprise_fee_id'
 
     # And I click Update
-    click_button 'Update and Close'
+    expect(page).to have_selector "#save-bar"
+    find_button('Update and Close').trigger('click')
 
     # Then my order cycle should have been updated
     page.should have_content 'Your order cycle has been updated.'
@@ -607,9 +608,9 @@ feature %q{
         page.all('tr.supplier').count.should == 3
         page.all('tr.distributor').count.should == 3
 
-        # When I save, then those exchanges should remain
-        click_button 'Update'
-        page.should have_content "Your order cycle has been updated."
+        # # When I save, then those exchanges should remain
+        # click_button 'Update'
+        # page.should have_content "Your order cycle has been updated."
 
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
@@ -699,8 +700,8 @@ feature %q{
         expect(page).to have_field "order_cycle_outgoing_exchange_0_variants_#{v2.id}", disabled: true
 
         # When I save, any exchanges that I can't manage remain
-        click_button 'Update'
-        page.should have_content "Your order cycle has been updated."
+        # click_button 'Update'
+        # page.should have_content "Your order cycle has been updated."
 
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
@@ -752,8 +753,8 @@ feature %q{
         expect(page).to have_field "order_cycle_incoming_exchange_0_variants_#{v2.id}", disabled: true
 
         # When I save, any exchange that I can't manage remains
-        click_button 'Update'
-        page.should have_content "Your order cycle has been updated."
+        # click_button 'Update'
+        # page.should have_content "Your order cycle has been updated."
 
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]

From 019e16c5ba87b403370e992e0208de559546ebd1 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Tue, 3 May 2016 22:58:09 +1000
Subject: [PATCH 15/45] Update AdminEditOrderCycleCtrl unit tests

---
 spec/javascripts/unit/order_cycle_spec.js.coffee | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 973b348383..2f1893bc43 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -9,7 +9,7 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = {}
+      scope = { order_cycle_form: { $dirty: false}}
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       OrderCycle =
@@ -169,7 +169,9 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = {}
+      scope =
+        order_cycle_form: jasmine.createSpyObj('order_cycle_form', ['$dirty', '$setPristine'])
+        $watch: jasmine.createSpy('$watch')
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       location =
@@ -292,6 +294,7 @@ describe 'OrderCycle controllers', ->
       scope.removeExchange(event, 'exchange')
       expect(event.preventDefault).toHaveBeenCalled()
       expect(OrderCycle.removeExchange).toHaveBeenCalledWith('exchange')
+      expect(scope.order_cycle_form.$dirty).toEqual true
 
     it 'Adds coordinator fees', ->
       scope.addCoordinatorFee(event)
@@ -320,6 +323,7 @@ describe 'OrderCycle controllers', ->
     it 'Submits the order cycle via OrderCycle update', ->
       scope.submit('/admin/order_cycles')
       expect(OrderCycle.update).toHaveBeenCalledWith('/admin/order_cycles')
+      expect(scope.order_cycle_form.$setPristine.calls.length).toEqual 1
 
 
 describe 'OrderCycle services', ->

From 1833f0dd5d2283c6e0e52b82325ba9073aeec6b8 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 11:22:25 +1000
Subject: [PATCH 16/45] Add save_bar to the order cycles simple editing form

---
 .../order_cycles/controllers/simple_edit.js.coffee  |  4 ++++
 spec/features/admin/order_cycles_spec.rb            | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
index bf00bb3df1..99c2e2649c 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -9,6 +9,9 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
   $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
     $scope.init()
 
+  $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+
   $scope.loaded = ->
     Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
 
@@ -35,5 +38,6 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
     OrderCycle.removeCoordinatorFee(index)
 
   $scope.submit = (destination) ->
+    StatusMessage.display 'progress', "Saving..."
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update(destination)
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 4827f9b916..8b451fa7c0 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -889,10 +889,10 @@ feature %q{
       fill_in 'order_cycle_outgoing_exchange_0_pickup_instructions', with: 'zzy'
 
       # And I make some product selections
-      uncheck "order_cycle_incoming_exchange_0_variants_#{v1.id}"
-      check   "order_cycle_incoming_exchange_0_variants_#{v2.id}"
-      check   "order_cycle_incoming_exchange_0_variants_#{v3.id}"
-      uncheck "order_cycle_incoming_exchange_0_variants_#{v3.id}"
+      find("#order_cycle_incoming_exchange_0_variants_#{v1.id}").trigger('click')
+      find("#order_cycle_incoming_exchange_0_variants_#{v2.id}").trigger('click')
+      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
+      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
 
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
@@ -901,9 +901,10 @@ feature %q{
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
-      click_button 'Update'
+      find_button('Update').trigger('click')
       page.should have_content 'Your order cycle has been updated.'
-      click_button 'Update and Close'
+
+      find_button('Update and Close').trigger('click')
 
       # Then my order cycle should have been updated
       page.should have_content 'Your order cycle has been updated.'

From 8b5e5105a8ce940e6fa6782852c2bb1776c96b29 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 12:11:03 +1000
Subject: [PATCH 17/45] Fix failed tests

---
 spec/features/admin/order_cycles_spec.rb               | 10 +++++-----
 .../order_cycles/controllers/simple_edit.js.coffee     |  3 ++-
 spec/javascripts/unit/order_cycle_spec.js.coffee       |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 8b451fa7c0..99069e9f7c 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -624,10 +624,10 @@ feature %q{
         visit edit_admin_order_cycle_path(oc)
 
         # When I remove all the exchanges and save
-        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
-        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
+        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").trigger('click')
+        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").trigger('click')
+        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").trigger('click')
+        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").trigger('click')
         click_button 'Update'
 
         # Then the exchanges should be removed
@@ -897,7 +897,7 @@ feature %q{
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
       page.should_not have_select 'order_cycle_coordinator_fee_0_id'
-      click_button 'Add coordinator fee'
+      find_button('Add coordinator fee').trigger('click')
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
index dbad5a9f05..f5ccd25aac 100644
--- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -10,7 +10,8 @@ describe "AdminSimpleEditOrderCycleCtrl", ->
   outgoing_exchange = {}
 
   beforeEach ->
-    scope = {}
+    scope =
+      $watch: jasmine.createSpy('$watch')
     location =
       absUrl: ->
         'example.com/admin/order_cycles/27/edit'
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 2f1893bc43..b66acfcb1d 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -9,7 +9,7 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = { order_cycle_form: { $dirty: false}}
+      scope = {}
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       OrderCycle =

From 57ec7bb9a967df03b922e113241e088cfa187f26 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 12:27:24 +1000
Subject: [PATCH 18/45] Remove unused test code

---
 .../stylesheets/admin/components/save_bar.sass       |  2 +-
 spec/features/admin/order_cycles_spec.rb             | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index fcc60dbfc3..c6b1236490 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -3,7 +3,7 @@
   bottom: 0px
   padding: 8px 10px
   font-weight: bold
-  background-color: #eff5fc
+  background-color: #fff
   color: #5498da
   h5
     color: #5498da
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 99069e9f7c..8caf156af4 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -608,10 +608,6 @@ feature %q{
         page.all('tr.supplier').count.should == 3
         page.all('tr.distributor').count.should == 3
 
-        # # When I save, then those exchanges should remain
-        # click_button 'Update'
-        # page.should have_content "Your order cycle has been updated."
-
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
         oc.coordinator.should == distributor_managed
@@ -699,10 +695,6 @@ feature %q{
         # I should be able to see but not toggle v2, because I don't have permission
         expect(page).to have_field "order_cycle_outgoing_exchange_0_variants_#{v2.id}", disabled: true
 
-        # When I save, any exchanges that I can't manage remain
-        # click_button 'Update'
-        # page.should have_content "Your order cycle has been updated."
-
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
         oc.coordinator.should == distributor_managed
@@ -752,10 +744,6 @@ feature %q{
         # I should be able to see but not toggle v2, because I don't have permission
         expect(page).to have_field "order_cycle_incoming_exchange_0_variants_#{v2.id}", disabled: true
 
-        # When I save, any exchange that I can't manage remains
-        # click_button 'Update'
-        # page.should have_content "Your order cycle has been updated."
-
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
         oc.coordinator.should == distributor_managed

From 3cac9c452f2cb78d8cb7ad32089a54759d2c6b10 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 14:48:15 +1000
Subject: [PATCH 19/45] Tweaks

---
 app/views/admin/order_cycles/_form.html.haml        | 8 +++-----
 app/views/admin/order_cycles/_simple_form.html.haml | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml
index 13b317c314..ed2d3acbc2 100644
--- a/app/views/admin/order_cycles/_form.html.haml
+++ b/app/views/admin/order_cycles/_form.html.haml
@@ -53,11 +53,9 @@
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-    %span{'ng-show' => 'loaded()'}
-      or
-      = link_to 'Cancel', main_app.admin_order_cycles_path
-    %span{'ng-hide' => 'loaded()'} Loading...
-    = render 'spree/admin/shared/status_message'
+  %span{'ng-show' => 'loaded()'}
+    = link_to 'Cancel', main_app.admin_order_cycles_path
+  %span{'ng-hide' => 'loaded()'} Loading...
 
 
 - unless Rails.env.production?
diff --git a/app/views/admin/order_cycles/_simple_form.html.haml b/app/views/admin/order_cycles/_simple_form.html.haml
index 34ea062102..9364d080ff 100644
--- a/app/views/admin/order_cycles/_simple_form.html.haml
+++ b/app/views/admin/order_cycles/_simple_form.html.haml
@@ -24,8 +24,6 @@
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-    %span{'ng-show' => 'loaded()'}
-      or
-      = link_to 'Cancel', main_app.admin_order_cycles_path
-    %span{'ng-hide' => 'loaded()'} Loading...
-    = render 'spree/admin/shared/status_message'
+  %span{'ng-show' => 'loaded()'}
+    = link_to 'Cancel', main_app.admin_order_cycles_path
+  %span{'ng-hide' => 'loaded()'} Loading...

From 064e3c426ebf37028540d629dff22a059e2d33ae Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 6 May 2016 11:00:34 +1000
Subject: [PATCH 20/45] Make the save bar look better

---
 .../javascripts/templates/admin/save_bar.html.haml   | 12 ++++++------
 .../stylesheets/admin/components/save_bar.sass       |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index ddc535d001..0a4a055c87 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,8 +1,8 @@
 #save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
-  .twelve.columns.alpha
-    %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
-      {{ StatusMessage.statusMessage.text || "&nbsp;" }}
-  .four.columns.omega.text-right
-
-    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
+  .container
+    .twelve.columns.alpha
+      %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
+        {{ StatusMessage.statusMessage.text || "&nbsp;" }}
+    .four.columns.omega.text-right
+      %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
 
diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index c6b1236490..23585d05f5 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -1,9 +1,11 @@
 #save-bar
   position: fixed
+  width: 100%
   bottom: 0px
-  padding: 8px 10px
+  left: 0
+  padding: 8px 8px
   font-weight: bold
-  background-color: #fff
+  background-color: #eff5fc
   color: #5498da
   h5
     color: #5498da

From 3e231da472d82a6353f211b5af6c38be881649d0 Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Fri, 6 May 2016 11:13:15 +1000
Subject: [PATCH 21/45] Translate subjects of enterprise emails

Minor text change

Fix #906

Thanks to Nicolas Blanc:
https://github.com/openfoodfoundation/openfoodnetwork/pull/937
---
 app/mailers/enterprise_mailer.rb       | 19 +++++++++++++------
 config/locales/en.yml                  |  5 +++++
 spec/mailers/enterprise_mailer_spec.rb |  4 ++--
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/mailers/enterprise_mailer.rb b/app/mailers/enterprise_mailer.rb
index 248e31f109..dfd3f21636 100644
--- a/app/mailers/enterprise_mailer.rb
+++ b/app/mailers/enterprise_mailer.rb
@@ -4,19 +4,26 @@ class EnterpriseMailer < Spree::BaseMailer
 
   def welcome(enterprise)
     @enterprise = enterprise
-    mail(:to => enterprise.email, :from => from_address,
-         :subject => "#{enterprise.name} is now on #{Spree::Config[:site_name]}")
+    subject = t('enterprise_mailer.welcome.subject',
+                enterprise: @enterprise.name,
+                sitename: Spree::Config[:site_name])
+    mail(:to => enterprise.email,
+         :from => from_address,
+         :subject => subject)
   end
 
-  def confirmation_instructions(record, token, opts={})
+  def confirmation_instructions(record, token)
     @token = token
     find_enterprise(record)
-    mail(subject: "Please confirm your email for #{@enterprise.name}",
-         to: ( @enterprise.unconfirmed_email || @enterprise.email ),
-         from: from_address)
+    subject = t('enterprise_mailer.confirmation_instructions.subject',
+                enterprise: @enterprise.name)
+    mail(to: (@enterprise.unconfirmed_email || @enterprise.email),
+         from: from_address,
+         subject: subject)
   end
 
   private
+
   def find_enterprise(enterprise)
     @enterprise = enterprise.is_a?(Enterprise) ? enterprise : Enterprise.find(enterprise)
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e9de6c9abd..b1595ba117 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,6 +32,11 @@ en:
         not_confirmed: Your email address could not be confirmed. Perhaps you have already completed this step?
         confirmation_sent: "Confirmation email sent!"
         confirmation_not_sent: "Could not send a confirmation email."
+  enterprise_mailer:
+    confirmation_instructions:
+      subject: "Please confirm the email address for %{enterprise}"
+    welcome:
+      subject: "%{enterprise} is now on %{sitename}"
   home: "OFN"
   title: Open Food Network
   welcome_to: 'Welcome to '
diff --git a/spec/mailers/enterprise_mailer_spec.rb b/spec/mailers/enterprise_mailer_spec.rb
index eaa21b54ae..2399d4146a 100644
--- a/spec/mailers/enterprise_mailer_spec.rb
+++ b/spec/mailers/enterprise_mailer_spec.rb
@@ -12,7 +12,7 @@ describe EnterpriseMailer do
       EnterpriseMailer.confirmation_instructions(enterprise, 'token').deliver
       ActionMailer::Base.deliveries.count.should == 1
       mail = ActionMailer::Base.deliveries.first
-      expect(mail.subject).to eq "Please confirm your email for #{enterprise.name}"
+      expect(mail.subject).to eq "Please confirm the email address for #{enterprise.name}"
       expect(mail.to).to include enterprise.email
       expect(mail.reply_to).to be_nil
     end
@@ -28,7 +28,7 @@ describe EnterpriseMailer do
       EnterpriseMailer.confirmation_instructions(enterprise, 'token').deliver
       ActionMailer::Base.deliveries.count.should == 1
       mail = ActionMailer::Base.deliveries.first
-      expect(mail.subject).to eq "Please confirm your email for #{enterprise.name}"
+      expect(mail.subject).to eq "Please confirm the email address for #{enterprise.name}"
       expect(mail.to).to include enterprise.unconfirmed_email
     end
   end

From 08f0011244cf47a31a236b3bcf2d45d497c9528e Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 6 May 2016 12:43:50 +1000
Subject: [PATCH 22/45] Make the page long enough to avoid the save bar
 overlaying the form

---
 spec/features/admin/order_cycles_spec.rb | 38 ++++++++++++++----------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 8caf156af4..701780622f 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -267,6 +267,9 @@ feature %q{
 
 
   scenario "updating an order cycle", js: true do
+    # Make the page long enough to avoid the save bar overlaying the form
+    page.driver.resize(1280, 3600)
+
     # Given an order cycle with all the settings
     oc = create(:order_cycle)
     initial_variants = oc.variants.sort_by &:id
@@ -317,10 +320,10 @@ feature %q{
     # And I add a supplier and some products
     select 'My supplier', from: 'new_supplier_id'
     click_button 'Add supplier'
-    page.all("table.exchanges tr.supplier td.products input").each { |e| e.trigger('click') }
+    page.all("table.exchanges tr.supplier td.products input").each { |e| e.click }
 
     page.should have_selector "#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true
-    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).trigger('click') # uncheck (with visible:true filter)
+    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).click # uncheck (with visible:true filter)
     check "order_cycle_incoming_exchange_2_variants_#{v1.id}"
     check "order_cycle_incoming_exchange_2_variants_#{v2.id}"
 
@@ -343,7 +346,7 @@ feature %q{
     fill_in 'order_cycle_outgoing_exchange_1_pickup_time', with: 'New time 1'
     fill_in 'order_cycle_outgoing_exchange_1_pickup_instructions', with: 'New instructions 1'
 
-    page.all("table.exchanges tr.distributor td.products input").each { |e| e.trigger('click') }
+    page.all("table.exchanges tr.distributor td.products input").each { |e| e.click }
 
     uncheck "order_cycle_outgoing_exchange_2_variants_#{v1.id}"
     check "order_cycle_outgoing_exchange_2_variants_#{v2.id}"
@@ -360,7 +363,8 @@ feature %q{
 
     # And I click Update
     expect(page).to have_selector "#save-bar"
-    find_button('Update and Close').trigger('click')
+    save_screenshot('abc.png')
+    click_button 'Update and Close'
 
     # Then my order cycle should have been updated
     page.should have_content 'Your order cycle has been updated.'
@@ -620,10 +624,11 @@ feature %q{
         visit edit_admin_order_cycle_path(oc)
 
         # When I remove all the exchanges and save
-        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").trigger('click')
-        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").trigger('click')
-        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").trigger('click')
-        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").trigger('click')
+        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
+        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
+        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
+        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
+
         click_button 'Update'
 
         # Then the exchanges should be removed
@@ -857,6 +862,9 @@ feature %q{
     end
 
     scenario "updating an order cycle" do
+      # Make the page long enough to avoid the save bar overlaying the form
+      page.driver.resize(1280, 3600)
+
       # Given an order cycle with pickup time and instructions
       fee1 = create(:enterprise_fee, name: 'my fee', enterprise: enterprise)
       fee2 = create(:enterprise_fee, name: 'that fee', enterprise: enterprise)
@@ -877,22 +885,22 @@ feature %q{
       fill_in 'order_cycle_outgoing_exchange_0_pickup_instructions', with: 'zzy'
 
       # And I make some product selections
-      find("#order_cycle_incoming_exchange_0_variants_#{v1.id}").trigger('click')
-      find("#order_cycle_incoming_exchange_0_variants_#{v2.id}").trigger('click')
-      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
-      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
+      uncheck "order_cycle_incoming_exchange_0_variants_#{v1.id}"
+      check   "order_cycle_incoming_exchange_0_variants_#{v2.id}"
+      check   "order_cycle_incoming_exchange_0_variants_#{v3.id}"
+      uncheck "order_cycle_incoming_exchange_0_variants_#{v3.id}"
 
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
       page.should_not have_select 'order_cycle_coordinator_fee_0_id'
-      find_button('Add coordinator fee').trigger('click')
+      click_button 'Add coordinator fee'
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
-      find_button('Update').trigger('click')
+      click_button 'Update'
       page.should have_content 'Your order cycle has been updated.'
 
-      find_button('Update and Close').trigger('click')
+      click_button 'Update and Close'
 
       # Then my order cycle should have been updated
       page.should have_content 'Your order cycle has been updated.'

From a37820a9636e6359a96828587f7d7438c7ebe7e6 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 6 May 2016 14:55:16 +1000
Subject: [PATCH 23/45] Resize window to fix failed test

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

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 701780622f..cd5ef0a07e 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -619,6 +619,9 @@ feature %q{
       end
 
       scenario "editing an order cycle" do
+        # Make the page long enough to avoid the save bar overlaying the form
+        page.driver.resize(1280, 3600)
+
         oc = create(:simple_order_cycle, { suppliers: [supplier_managed, supplier_permitted, supplier_unmanaged], coordinator: distributor_managed, distributors: [distributor_managed, distributor_permitted, distributor_unmanaged], name: 'Order Cycle 1' } )
 
         visit edit_admin_order_cycle_path(oc)

From 38efa218d08db5c3e696a1d1f656b97ed05fbf80 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 20 Apr 2016 15:31:11 +1000
Subject: [PATCH 24/45] Use save bar on order cycle form

---
 .../admin/order_cycles/controllers/edit.js.coffee            | 5 +++++
 app/assets/javascripts/templates/admin/save_bar.html.haml    | 2 +-
 app/views/admin/order_cycles/edit.html.haml                  | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index fd426eb455..a17f52e42c 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -12,6 +12,9 @@ angular.module('admin.orderCycles')
 
     $scope.StatusMessage = StatusMessage
 
+    $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+
     $scope.loaded = ->
       Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
 
@@ -81,4 +84,6 @@ angular.module('admin.orderCycles')
       OrderCycle.removeDistributionOfVariant(variant_id)
 
     $scope.submit = (destination) ->
+      StatusMessage.display 'progress', "Saving..."
       OrderCycle.update(destination)
+      this.order_cycle_form.$setPristine()
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index 452e81f6e3..ac4fa55de5 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,4 +1,4 @@
-#save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
+#save-bar.animate-show{ ng: { show: 'StatusMessage.active()' } }
   .twelve.columns.alpha
     %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
       {{ StatusMessage.statusMessage.text || "&nbsp;" }}
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index f3b0bdb721..6ecb65d87e 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -27,7 +27,9 @@
 
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
-= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller} do |f|
+= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
+  %save-bar{ save: "submit()", form: "order_cycle_form" }
+
   - if order_cycles_simple_form
     = render 'simple_form', f: f
   - else

From d10719330daaae1475c4e7e9d1d9d86edaa635a2 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 27 Apr 2016 12:15:20 +1000
Subject: [PATCH 25/45] Extend save_bar directive to support more buttons

---
 .../javascripts/admin/utils/directives/save_bar.js.coffee     | 1 +
 app/assets/javascripts/templates/admin/save_bar.html.haml     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
index 13e4f84bc6..9cd25d97cd 100644
--- a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
@@ -3,6 +3,7 @@ angular.module("admin.utils").directive "saveBar", (StatusMessage) ->
   scope:
     save: "&"
     form: "="
+    buttons: "="
   templateUrl: "admin/save_bar.html"
   link: (scope, element, attrs) ->
     scope.StatusMessage = StatusMessage
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index ac4fa55de5..83beac81a5 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -3,4 +3,6 @@
     %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
       {{ StatusMessage.statusMessage.text || "&nbsp;" }}
   .four.columns.omega.text-right
-    %input.red{type: "button", value: "Save Changes", ng: { disabled: '!form.$dirty', click: "save()" } }
+
+    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "save({param: button.param})" } }
+

From 2214c83ec7c644a172e25fab22d85a6294a82bce Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 27 Apr 2016 12:16:13 +1000
Subject: [PATCH 26/45] Use save_bar on order cycle update form

---
 app/views/admin/order_cycles/_form.html.haml       | 14 ++++++--------
 .../admin/order_cycles/_simple_form.html.haml      | 13 +++++--------
 app/views/admin/order_cycles/edit.html.haml        |  3 ++-
 .../admin/variant_overrides/_products.html.haml    |  2 +-
 .../spree/admin/orders/bulk_management.html.haml   |  2 +-
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml
index c447d35d58..13b317c314 100644
--- a/app/views/admin/order_cycles/_form.html.haml
+++ b/app/views/admin/order_cycles/_form.html.haml
@@ -52,14 +52,12 @@
 .actions
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  - else
-    = f.submit 'Update', 'ng-click' => "submit(null)", 'ng-disabled' => '!loaded()'
-    = f.submit 'Update and Close', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  %span{'ng-show' => 'loaded()'}
-    or
-    = link_to 'Cancel', main_app.admin_order_cycles_path
-  %span{'ng-hide' => 'loaded()'} Loading...
-  = render 'spree/admin/shared/status_message'
+
+    %span{'ng-show' => 'loaded()'}
+      or
+      = link_to 'Cancel', main_app.admin_order_cycles_path
+    %span{'ng-hide' => 'loaded()'} Loading...
+    = render 'spree/admin/shared/status_message'
 
 
 - unless Rails.env.production?
diff --git a/app/views/admin/order_cycles/_simple_form.html.haml b/app/views/admin/order_cycles/_simple_form.html.haml
index 4dc64a012b..34ea062102 100644
--- a/app/views/admin/order_cycles/_simple_form.html.haml
+++ b/app/views/admin/order_cycles/_simple_form.html.haml
@@ -23,12 +23,9 @@
 .actions
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
-  - else
-    = f.submit 'Update', 'ng-click' => "submit(null)", 'ng-disabled' => '!loaded()'
-    = f.submit 'Update and Close', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-  %span{'ng-show' => 'loaded()'}
-    or
-    = link_to 'Cancel', main_app.admin_order_cycles_path
-  %span{'ng-hide' => 'loaded()'} Loading...
-  = render 'spree/admin/shared/status_message'
+    %span{'ng-show' => 'loaded()'}
+      or
+      = link_to 'Cancel', main_app.admin_order_cycles_path
+    %span{'ng-hide' => 'loaded()'} Loading...
+    = render 'spree/admin/shared/status_message'
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 6ecb65d87e..4b2a397e49 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -28,7 +28,8 @@
 
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
-  %save-bar{ save: "submit()", form: "order_cycle_form" }
+
+  %save-bar{ buttons: "[{text: 'Update', param: null}, {text: 'Update and Close', param: '#{main_app.admin_order_cycles_path}'}]", save: "submit(param)", form: "order_cycle_form" }
 
   - if order_cycles_simple_form
     = render 'simple_form', f: f
diff --git a/app/views/admin/variant_overrides/_products.html.haml b/app/views/admin/variant_overrides/_products.html.haml
index c17e4c189a..70ae2c79bf 100644
--- a/app/views/admin/variant_overrides/_products.html.haml
+++ b/app/views/admin/variant_overrides/_products.html.haml
@@ -1,5 +1,5 @@
 %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
-  %save-bar{ save: "update()", form: "variant_overrides_form" }
+  %save-bar{ save: "update()", form: "variant_overrides_form", buttons: "[{text: 'Save Changes'}]" }
   %table.index.bulk#variant-overrides
     %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
     %col.product{ width: "20%", ng: { show: 'columns.product.visible' } }
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index 43983e87ea..b4d7de740d 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -10,7 +10,7 @@
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
 %div{ ng: { controller: 'LineItemsCtrl' } }
-  %save-bar{ save: "submit()", form: "bulk_order_form" }
+  %save-bar{ save: "submit()", form: "bulk_order_form", buttons: "[{text: 'Save Changes'}]" }
   .filters{ :class => "sixteen columns alpha" }
     .date_filter{ :class => "two columns alpha" }
       %label{ :for => 'start_date_filter' }

From 7fc37e4737339fca09eff6232facf39870c18632 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 27 Apr 2016 13:47:04 +1000
Subject: [PATCH 27/45] Tweak save_bar css

---
 app/assets/stylesheets/admin/components/save_bar.sass | 2 +-
 app/assets/stylesheets/admin/openfoodnetwork.css.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index c6b1236490..fcc60dbfc3 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -3,7 +3,7 @@
   bottom: 0px
   padding: 8px 10px
   font-weight: bold
-  background-color: #fff
+  background-color: #eff5fc
   color: #5498da
   h5
     color: #5498da
diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
index 17d43ff3a5..1fc95face8 100644
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -37,6 +37,7 @@ text-angular .ta-editor {
 
 input.red {
 	background-color: #DA5354;
+  margin-right: 5px;
 }
 
 input.search {

From 78b4a35d129843f4140608074cd5b62c18a36f48 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 29 Apr 2016 10:43:28 +1000
Subject: [PATCH 28/45] Keep the action with save button

---
 .../javascripts/admin/order_cycles/controllers/edit.js.coffee | 2 +-
 .../javascripts/admin/utils/directives/save_bar.js.coffee     | 1 -
 app/assets/javascripts/templates/admin/save_bar.html.haml     | 4 ++--
 app/views/admin/order_cycles/edit.html.haml                   | 2 +-
 app/views/admin/variant_overrides/_products.html.haml         | 2 +-
 app/views/spree/admin/orders/bulk_management.html.haml        | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index a17f52e42c..068447d161 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -86,4 +86,4 @@ angular.module('admin.orderCycles')
     $scope.submit = (destination) ->
       StatusMessage.display 'progress', "Saving..."
       OrderCycle.update(destination)
-      this.order_cycle_form.$setPristine()
+      $scope.order_cycle_form.$setPristine()
diff --git a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
index 9cd25d97cd..0999679394 100644
--- a/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
+++ b/app/assets/javascripts/admin/utils/directives/save_bar.js.coffee
@@ -1,7 +1,6 @@
 angular.module("admin.utils").directive "saveBar", (StatusMessage) ->
   restrict: "E"
   scope:
-    save: "&"
     form: "="
     buttons: "="
   templateUrl: "admin/save_bar.html"
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index 83beac81a5..ddc535d001 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,8 +1,8 @@
-#save-bar.animate-show{ ng: { show: 'StatusMessage.active()' } }
+#save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
   .twelve.columns.alpha
     %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
       {{ StatusMessage.statusMessage.text || "&nbsp;" }}
   .four.columns.omega.text-right
 
-    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "save({param: button.param})" } }
+    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
 
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 4b2a397e49..4f3e5d8516 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -29,7 +29,7 @@
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
 
-  %save-bar{ buttons: "[{text: 'Update', param: null}, {text: 'Update and Close', param: '#{main_app.admin_order_cycles_path}'}]", save: "submit(param)", form: "order_cycle_form" }
+  %save-bar{ buttons: "[{ text: 'Update', action: submit, param: null }, { text: 'Update and Close', action: submit, param: '#{main_app.admin_order_cycles_path}' }]", form: "order_cycle_form" }
 
   - if order_cycles_simple_form
     = render 'simple_form', f: f
diff --git a/app/views/admin/variant_overrides/_products.html.haml b/app/views/admin/variant_overrides/_products.html.haml
index 70ae2c79bf..34c8d02bb2 100644
--- a/app/views/admin/variant_overrides/_products.html.haml
+++ b/app/views/admin/variant_overrides/_products.html.haml
@@ -1,5 +1,5 @@
 %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
-  %save-bar{ save: "update()", form: "variant_overrides_form", buttons: "[{text: 'Save Changes'}]" }
+  %save-bar{ form: "variant_overrides_form", buttons: "[{ text: 'Save Changes', action: update }]" }
   %table.index.bulk#variant-overrides
     %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
     %col.product{ width: "20%", ng: { show: 'columns.product.visible' } }
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index b4d7de740d..2bd58a4cc5 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -10,7 +10,7 @@
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
 %div{ ng: { controller: 'LineItemsCtrl' } }
-  %save-bar{ save: "submit()", form: "bulk_order_form", buttons: "[{text: 'Save Changes'}]" }
+  %save-bar{ form: "bulk_order_form", buttons: "[{ text: 'Save Changes', action: submit }]" }
   .filters{ :class => "sixteen columns alpha" }
     .date_filter{ :class => "two columns alpha" }
       %label{ :for => 'start_date_filter' }

From d59dea29ab8967fa8bb19eda77ba460e87d4860a Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 29 Apr 2016 15:23:19 +1000
Subject: [PATCH 29/45] Fix failed test for the default form

---
 .../order_cycles/controllers/edit.js.coffee   |  1 +
 spec/features/admin/order_cycles_spec.rb      | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index 068447d161..db63a8cbaa 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -63,6 +63,7 @@ angular.module('admin.orderCycles')
     $scope.removeExchange = ($event, exchange) ->
       $event.preventDefault()
       OrderCycle.removeExchange(exchange)
+      $scope.order_cycle_form.$dirty = true
 
     $scope.addCoordinatorFee = ($event) ->
       $event.preventDefault()
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index aafaa5ee77..4827f9b916 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -317,10 +317,10 @@ feature %q{
     # And I add a supplier and some products
     select 'My supplier', from: 'new_supplier_id'
     click_button 'Add supplier'
-    page.all("table.exchanges tr.supplier td.products input").each { |e| e.click }
+    page.all("table.exchanges tr.supplier td.products input").each { |e| e.trigger('click') }
 
     page.should have_selector "#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true
-    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).click # uncheck (with visible:true filter)
+    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).trigger('click') # uncheck (with visible:true filter)
     check "order_cycle_incoming_exchange_2_variants_#{v1.id}"
     check "order_cycle_incoming_exchange_2_variants_#{v2.id}"
 
@@ -343,7 +343,7 @@ feature %q{
     fill_in 'order_cycle_outgoing_exchange_1_pickup_time', with: 'New time 1'
     fill_in 'order_cycle_outgoing_exchange_1_pickup_instructions', with: 'New instructions 1'
 
-    page.all("table.exchanges tr.distributor td.products input").each { |e| e.click }
+    page.all("table.exchanges tr.distributor td.products input").each { |e| e.trigger('click') }
 
     uncheck "order_cycle_outgoing_exchange_2_variants_#{v1.id}"
     check "order_cycle_outgoing_exchange_2_variants_#{v2.id}"
@@ -359,7 +359,8 @@ feature %q{
     select 'Distributor fee 2', from: 'order_cycle_outgoing_exchange_2_enterprise_fees_0_enterprise_fee_id'
 
     # And I click Update
-    click_button 'Update and Close'
+    expect(page).to have_selector "#save-bar"
+    find_button('Update and Close').trigger('click')
 
     # Then my order cycle should have been updated
     page.should have_content 'Your order cycle has been updated.'
@@ -607,9 +608,9 @@ feature %q{
         page.all('tr.supplier').count.should == 3
         page.all('tr.distributor').count.should == 3
 
-        # When I save, then those exchanges should remain
-        click_button 'Update'
-        page.should have_content "Your order cycle has been updated."
+        # # When I save, then those exchanges should remain
+        # click_button 'Update'
+        # page.should have_content "Your order cycle has been updated."
 
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
@@ -699,8 +700,8 @@ feature %q{
         expect(page).to have_field "order_cycle_outgoing_exchange_0_variants_#{v2.id}", disabled: true
 
         # When I save, any exchanges that I can't manage remain
-        click_button 'Update'
-        page.should have_content "Your order cycle has been updated."
+        # click_button 'Update'
+        # page.should have_content "Your order cycle has been updated."
 
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
@@ -752,8 +753,8 @@ feature %q{
         expect(page).to have_field "order_cycle_incoming_exchange_0_variants_#{v2.id}", disabled: true
 
         # When I save, any exchange that I can't manage remains
-        click_button 'Update'
-        page.should have_content "Your order cycle has been updated."
+        # click_button 'Update'
+        # page.should have_content "Your order cycle has been updated."
 
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]

From 26bb1a9beb353c36039b2c95fa52293b7860e67c Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Tue, 3 May 2016 22:58:09 +1000
Subject: [PATCH 30/45] Update AdminEditOrderCycleCtrl unit tests

---
 spec/javascripts/unit/order_cycle_spec.js.coffee | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 973b348383..2f1893bc43 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -9,7 +9,7 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = {}
+      scope = { order_cycle_form: { $dirty: false}}
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       OrderCycle =
@@ -169,7 +169,9 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = {}
+      scope =
+        order_cycle_form: jasmine.createSpyObj('order_cycle_form', ['$dirty', '$setPristine'])
+        $watch: jasmine.createSpy('$watch')
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       location =
@@ -292,6 +294,7 @@ describe 'OrderCycle controllers', ->
       scope.removeExchange(event, 'exchange')
       expect(event.preventDefault).toHaveBeenCalled()
       expect(OrderCycle.removeExchange).toHaveBeenCalledWith('exchange')
+      expect(scope.order_cycle_form.$dirty).toEqual true
 
     it 'Adds coordinator fees', ->
       scope.addCoordinatorFee(event)
@@ -320,6 +323,7 @@ describe 'OrderCycle controllers', ->
     it 'Submits the order cycle via OrderCycle update', ->
       scope.submit('/admin/order_cycles')
       expect(OrderCycle.update).toHaveBeenCalledWith('/admin/order_cycles')
+      expect(scope.order_cycle_form.$setPristine.calls.length).toEqual 1
 
 
 describe 'OrderCycle services', ->

From 3760a34b2ba66f6e5bc615af8d41eb861219d97a Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 11:22:25 +1000
Subject: [PATCH 31/45] Add save_bar to the order cycles simple editing form

---
 .../order_cycles/controllers/simple_edit.js.coffee  |  4 ++++
 spec/features/admin/order_cycles_spec.rb            | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
index bf00bb3df1..99c2e2649c 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -9,6 +9,9 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
   $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
     $scope.init()
 
+  $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+
   $scope.loaded = ->
     Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
 
@@ -35,5 +38,6 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
     OrderCycle.removeCoordinatorFee(index)
 
   $scope.submit = (destination) ->
+    StatusMessage.display 'progress', "Saving..."
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update(destination)
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 4827f9b916..8b451fa7c0 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -889,10 +889,10 @@ feature %q{
       fill_in 'order_cycle_outgoing_exchange_0_pickup_instructions', with: 'zzy'
 
       # And I make some product selections
-      uncheck "order_cycle_incoming_exchange_0_variants_#{v1.id}"
-      check   "order_cycle_incoming_exchange_0_variants_#{v2.id}"
-      check   "order_cycle_incoming_exchange_0_variants_#{v3.id}"
-      uncheck "order_cycle_incoming_exchange_0_variants_#{v3.id}"
+      find("#order_cycle_incoming_exchange_0_variants_#{v1.id}").trigger('click')
+      find("#order_cycle_incoming_exchange_0_variants_#{v2.id}").trigger('click')
+      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
+      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
 
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
@@ -901,9 +901,10 @@ feature %q{
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
-      click_button 'Update'
+      find_button('Update').trigger('click')
       page.should have_content 'Your order cycle has been updated.'
-      click_button 'Update and Close'
+
+      find_button('Update and Close').trigger('click')
 
       # Then my order cycle should have been updated
       page.should have_content 'Your order cycle has been updated.'

From e5d2e5010b72d93a9751091c017896141bfc2eac Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 12:11:03 +1000
Subject: [PATCH 32/45] Fix failed tests

---
 spec/features/admin/order_cycles_spec.rb               | 10 +++++-----
 .../order_cycles/controllers/simple_edit.js.coffee     |  3 ++-
 spec/javascripts/unit/order_cycle_spec.js.coffee       |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 8b451fa7c0..99069e9f7c 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -624,10 +624,10 @@ feature %q{
         visit edit_admin_order_cycle_path(oc)
 
         # When I remove all the exchanges and save
-        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
-        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
-        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
+        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").trigger('click')
+        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").trigger('click')
+        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").trigger('click')
+        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").trigger('click')
         click_button 'Update'
 
         # Then the exchanges should be removed
@@ -897,7 +897,7 @@ feature %q{
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
       page.should_not have_select 'order_cycle_coordinator_fee_0_id'
-      click_button 'Add coordinator fee'
+      find_button('Add coordinator fee').trigger('click')
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
index dbad5a9f05..f5ccd25aac 100644
--- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
+++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_edit.js.coffee
@@ -10,7 +10,8 @@ describe "AdminSimpleEditOrderCycleCtrl", ->
   outgoing_exchange = {}
 
   beforeEach ->
-    scope = {}
+    scope =
+      $watch: jasmine.createSpy('$watch')
     location =
       absUrl: ->
         'example.com/admin/order_cycles/27/edit'
diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee
index 2f1893bc43..b66acfcb1d 100644
--- a/spec/javascripts/unit/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/order_cycle_spec.js.coffee
@@ -9,7 +9,7 @@ describe 'OrderCycle controllers', ->
     EnterpriseFee = null
 
     beforeEach ->
-      scope = { order_cycle_form: { $dirty: false}}
+      scope = {}
       event =
         preventDefault: jasmine.createSpy('preventDefault')
       OrderCycle =

From ed1a06495bb38bfa8d6fe8c5786f43754548d754 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 12:27:24 +1000
Subject: [PATCH 33/45] Remove unused test code

---
 .../stylesheets/admin/components/save_bar.sass       |  2 +-
 spec/features/admin/order_cycles_spec.rb             | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index fcc60dbfc3..c6b1236490 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -3,7 +3,7 @@
   bottom: 0px
   padding: 8px 10px
   font-weight: bold
-  background-color: #eff5fc
+  background-color: #fff
   color: #5498da
   h5
     color: #5498da
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 99069e9f7c..8caf156af4 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -608,10 +608,6 @@ feature %q{
         page.all('tr.supplier').count.should == 3
         page.all('tr.distributor').count.should == 3
 
-        # # When I save, then those exchanges should remain
-        # click_button 'Update'
-        # page.should have_content "Your order cycle has been updated."
-
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
         oc.coordinator.should == distributor_managed
@@ -699,10 +695,6 @@ feature %q{
         # I should be able to see but not toggle v2, because I don't have permission
         expect(page).to have_field "order_cycle_outgoing_exchange_0_variants_#{v2.id}", disabled: true
 
-        # When I save, any exchanges that I can't manage remain
-        # click_button 'Update'
-        # page.should have_content "Your order cycle has been updated."
-
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
         oc.coordinator.should == distributor_managed
@@ -752,10 +744,6 @@ feature %q{
         # I should be able to see but not toggle v2, because I don't have permission
         expect(page).to have_field "order_cycle_incoming_exchange_0_variants_#{v2.id}", disabled: true
 
-        # When I save, any exchange that I can't manage remains
-        # click_button 'Update'
-        # page.should have_content "Your order cycle has been updated."
-
         oc.reload
         oc.suppliers.should match_array [supplier_managed, supplier_permitted, supplier_unmanaged]
         oc.coordinator.should == distributor_managed

From 7bf6881cb2f6707f3e1629457896918cfe4ac47f Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Wed, 4 May 2016 14:48:15 +1000
Subject: [PATCH 34/45] Tweaks

---
 app/views/admin/order_cycles/_form.html.haml        | 8 +++-----
 app/views/admin/order_cycles/_simple_form.html.haml | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml
index 13b317c314..ed2d3acbc2 100644
--- a/app/views/admin/order_cycles/_form.html.haml
+++ b/app/views/admin/order_cycles/_form.html.haml
@@ -53,11 +53,9 @@
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-    %span{'ng-show' => 'loaded()'}
-      or
-      = link_to 'Cancel', main_app.admin_order_cycles_path
-    %span{'ng-hide' => 'loaded()'} Loading...
-    = render 'spree/admin/shared/status_message'
+  %span{'ng-show' => 'loaded()'}
+    = link_to 'Cancel', main_app.admin_order_cycles_path
+  %span{'ng-hide' => 'loaded()'} Loading...
 
 
 - unless Rails.env.production?
diff --git a/app/views/admin/order_cycles/_simple_form.html.haml b/app/views/admin/order_cycles/_simple_form.html.haml
index 34ea062102..9364d080ff 100644
--- a/app/views/admin/order_cycles/_simple_form.html.haml
+++ b/app/views/admin/order_cycles/_simple_form.html.haml
@@ -24,8 +24,6 @@
   - if @order_cycle.new_record?
     = f.submit 'Create', 'ng-click' => "submit('#{main_app.admin_order_cycles_path}')", 'ng-disabled' => '!loaded()'
 
-    %span{'ng-show' => 'loaded()'}
-      or
-      = link_to 'Cancel', main_app.admin_order_cycles_path
-    %span{'ng-hide' => 'loaded()'} Loading...
-    = render 'spree/admin/shared/status_message'
+  %span{'ng-show' => 'loaded()'}
+    = link_to 'Cancel', main_app.admin_order_cycles_path
+  %span{'ng-hide' => 'loaded()'} Loading...

From 89ae77dfd9eee0ae0ff1c4932a90653215bff161 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 6 May 2016 11:00:34 +1000
Subject: [PATCH 35/45] Make the save bar look better

---
 .../javascripts/templates/admin/save_bar.html.haml   | 12 ++++++------
 .../stylesheets/admin/components/save_bar.sass       |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index ddc535d001..0a4a055c87 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,8 +1,8 @@
 #save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
-  .twelve.columns.alpha
-    %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
-      {{ StatusMessage.statusMessage.text || "&nbsp;" }}
-  .four.columns.omega.text-right
-
-    %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
+  .container
+    .twelve.columns.alpha
+      %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
+        {{ StatusMessage.statusMessage.text || "&nbsp;" }}
+    .four.columns.omega.text-right
+      %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
 
diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index c6b1236490..23585d05f5 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -1,9 +1,11 @@
 #save-bar
   position: fixed
+  width: 100%
   bottom: 0px
-  padding: 8px 10px
+  left: 0
+  padding: 8px 8px
   font-weight: bold
-  background-color: #fff
+  background-color: #eff5fc
   color: #5498da
   h5
     color: #5498da

From fed3ae9e858d4d60aa25251da43107e193fa1567 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 6 May 2016 12:43:50 +1000
Subject: [PATCH 36/45] Make the page long enough to avoid the save bar
 overlaying the form

---
 spec/features/admin/order_cycles_spec.rb | 38 ++++++++++++++----------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 8caf156af4..701780622f 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -267,6 +267,9 @@ feature %q{
 
 
   scenario "updating an order cycle", js: true do
+    # Make the page long enough to avoid the save bar overlaying the form
+    page.driver.resize(1280, 3600)
+
     # Given an order cycle with all the settings
     oc = create(:order_cycle)
     initial_variants = oc.variants.sort_by &:id
@@ -317,10 +320,10 @@ feature %q{
     # And I add a supplier and some products
     select 'My supplier', from: 'new_supplier_id'
     click_button 'Add supplier'
-    page.all("table.exchanges tr.supplier td.products input").each { |e| e.trigger('click') }
+    page.all("table.exchanges tr.supplier td.products input").each { |e| e.click }
 
     page.should have_selector "#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true
-    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).trigger('click') # uncheck (with visible:true filter)
+    page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).click # uncheck (with visible:true filter)
     check "order_cycle_incoming_exchange_2_variants_#{v1.id}"
     check "order_cycle_incoming_exchange_2_variants_#{v2.id}"
 
@@ -343,7 +346,7 @@ feature %q{
     fill_in 'order_cycle_outgoing_exchange_1_pickup_time', with: 'New time 1'
     fill_in 'order_cycle_outgoing_exchange_1_pickup_instructions', with: 'New instructions 1'
 
-    page.all("table.exchanges tr.distributor td.products input").each { |e| e.trigger('click') }
+    page.all("table.exchanges tr.distributor td.products input").each { |e| e.click }
 
     uncheck "order_cycle_outgoing_exchange_2_variants_#{v1.id}"
     check "order_cycle_outgoing_exchange_2_variants_#{v2.id}"
@@ -360,7 +363,8 @@ feature %q{
 
     # And I click Update
     expect(page).to have_selector "#save-bar"
-    find_button('Update and Close').trigger('click')
+    save_screenshot('abc.png')
+    click_button 'Update and Close'
 
     # Then my order cycle should have been updated
     page.should have_content 'Your order cycle has been updated.'
@@ -620,10 +624,11 @@ feature %q{
         visit edit_admin_order_cycle_path(oc)
 
         # When I remove all the exchanges and save
-        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").trigger('click')
-        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").trigger('click')
-        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").trigger('click')
-        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").trigger('click')
+        page.find("tr.supplier-#{supplier_managed.id} a.remove-exchange").click
+        page.find("tr.supplier-#{supplier_permitted.id} a.remove-exchange").click
+        page.find("tr.distributor-#{distributor_managed.id} a.remove-exchange").click
+        page.find("tr.distributor-#{distributor_permitted.id} a.remove-exchange").click
+
         click_button 'Update'
 
         # Then the exchanges should be removed
@@ -857,6 +862,9 @@ feature %q{
     end
 
     scenario "updating an order cycle" do
+      # Make the page long enough to avoid the save bar overlaying the form
+      page.driver.resize(1280, 3600)
+
       # Given an order cycle with pickup time and instructions
       fee1 = create(:enterprise_fee, name: 'my fee', enterprise: enterprise)
       fee2 = create(:enterprise_fee, name: 'that fee', enterprise: enterprise)
@@ -877,22 +885,22 @@ feature %q{
       fill_in 'order_cycle_outgoing_exchange_0_pickup_instructions', with: 'zzy'
 
       # And I make some product selections
-      find("#order_cycle_incoming_exchange_0_variants_#{v1.id}").trigger('click')
-      find("#order_cycle_incoming_exchange_0_variants_#{v2.id}").trigger('click')
-      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
-      find("#order_cycle_incoming_exchange_0_variants_#{v3.id}").trigger('click')
+      uncheck "order_cycle_incoming_exchange_0_variants_#{v1.id}"
+      check   "order_cycle_incoming_exchange_0_variants_#{v2.id}"
+      check   "order_cycle_incoming_exchange_0_variants_#{v3.id}"
+      uncheck "order_cycle_incoming_exchange_0_variants_#{v3.id}"
 
       # And I select some fees and update
       click_link 'order_cycle_coordinator_fee_0_remove'
       page.should_not have_select 'order_cycle_coordinator_fee_0_id'
-      find_button('Add coordinator fee').trigger('click')
+      click_button 'Add coordinator fee'
       select 'that fee', from: 'order_cycle_coordinator_fee_0_id'
 
       # When I update, or update and close, both work
-      find_button('Update').trigger('click')
+      click_button 'Update'
       page.should have_content 'Your order cycle has been updated.'
 
-      find_button('Update and Close').trigger('click')
+      click_button 'Update and Close'
 
       # Then my order cycle should have been updated
       page.should have_content 'Your order cycle has been updated.'

From 7040e4baae444804b1f9b8b1d4e534ae4bf39e0a Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 6 May 2016 14:55:16 +1000
Subject: [PATCH 37/45] Resize window to fix failed test

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

diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 701780622f..cd5ef0a07e 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -619,6 +619,9 @@ feature %q{
       end
 
       scenario "editing an order cycle" do
+        # Make the page long enough to avoid the save bar overlaying the form
+        page.driver.resize(1280, 3600)
+
         oc = create(:simple_order_cycle, { suppliers: [supplier_managed, supplier_permitted, supplier_unmanaged], coordinator: distributor_managed, distributors: [distributor_managed, distributor_permitted, distributor_unmanaged], name: 'Order Cycle 1' } )
 
         visit edit_admin_order_cycle_path(oc)

From f8ec0d316a943d019b8194ff7b43edb1d61710f4 Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Thu, 12 May 2016 10:52:48 +1000
Subject: [PATCH 38/45] Save bar can support cancel button

---
 .../admin/order_cycles/controllers/edit.js.coffee           | 5 ++++-
 app/assets/javascripts/templates/admin/save_bar.html.haml   | 6 +++---
 app/assets/stylesheets/admin/components/save_bar.sass       | 2 ++
 app/assets/stylesheets/admin/openfoodnetwork.css.scss       | 1 -
 app/views/admin/order_cycles/edit.html.haml                 | 2 +-
 app/views/admin/variant_overrides/_products.html.haml       | 2 +-
 app/views/spree/admin/orders/bulk_management.html.haml      | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
index db63a8cbaa..227c6a3045 100644
--- a/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
+++ b/app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
@@ -1,5 +1,5 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
     order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
     $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
     $scope.supplier_enterprises = Enterprise.producer_enterprises
@@ -88,3 +88,6 @@ angular.module('admin.orderCycles')
       StatusMessage.display 'progress', "Saving..."
       OrderCycle.update(destination)
       $scope.order_cycle_form.$setPristine()
+
+    $scope.cancel = (destination) ->
+      $window.location = destination
diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index 0a4a055c87..0d4919dcde 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,8 +1,8 @@
 #save-bar.animate-show{ ng: { show: 'form.$dirty || StatusMessage.active()' } }
   .container
-    .twelve.columns.alpha
+    .eight.columns.alpha
       %h5#status-message{ ng: { style: 'StatusMessage.statusMessage.style' } }
         {{ StatusMessage.statusMessage.text || "&nbsp;" }}
-    .four.columns.omega.text-right
-      %input.red{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { disabled: '!form.$dirty', click: "button.action(button.param)" } }
+    .eight.columns.omega.text-right
+      %input{"ng-repeat" => "button in buttons", type: "button", value: "{{button.text}}", ng: { class: "button.class", click: "button.action(button.param)" } }
 
diff --git a/app/assets/stylesheets/admin/components/save_bar.sass b/app/assets/stylesheets/admin/components/save_bar.sass
index 23585d05f5..87dcce82f9 100644
--- a/app/assets/stylesheets/admin/components/save_bar.sass
+++ b/app/assets/stylesheets/admin/components/save_bar.sass
@@ -9,3 +9,5 @@
   color: #5498da
   h5
     color: #5498da
+  input
+    margin-right: 5px
diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
index 1fc95face8..17d43ff3a5 100644
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -37,7 +37,6 @@ text-angular .ta-editor {
 
 input.red {
 	background-color: #DA5354;
-  margin-right: 5px;
 }
 
 input.search {
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 4f3e5d8516..9f85261224 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -29,7 +29,7 @@
 - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl'
 = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
 
-  %save-bar{ buttons: "[{ text: 'Update', action: submit, param: null }, { text: 'Update and Close', action: submit, param: '#{main_app.admin_order_cycles_path}' }]", form: "order_cycle_form" }
+  %save-bar{ buttons: "[{ text: 'Update', action: submit, param: null, class: 'red' }, { text: 'Update and Close', action: submit, param: '#{main_app.admin_order_cycles_path}', class: 'red' }, { text: 'Cancel', action: cancel, param: '#{main_app.admin_order_cycles_path}', class: '' }]", form: "order_cycle_form" }
 
   - if order_cycles_simple_form
     = render 'simple_form', f: f
diff --git a/app/views/admin/variant_overrides/_products.html.haml b/app/views/admin/variant_overrides/_products.html.haml
index 34c8d02bb2..f255d86e0b 100644
--- a/app/views/admin/variant_overrides/_products.html.haml
+++ b/app/views/admin/variant_overrides/_products.html.haml
@@ -1,5 +1,5 @@
 %form{ name: 'variant_overrides_form', ng: { show: "views.inventory.visible" } }
-  %save-bar{ form: "variant_overrides_form", buttons: "[{ text: 'Save Changes', action: update }]" }
+  %save-bar{ form: "variant_overrides_form", buttons: "[{ text: 'Save Changes', action: update, class: 'red'  }]" }
   %table.index.bulk#variant-overrides
     %col.producer{ width: "20%", ng: { show: 'columns.producer.visible' } }
     %col.product{ width: "20%", ng: { show: 'columns.product.visible' } }
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index 2bd58a4cc5..d8228b5c83 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -10,7 +10,7 @@
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
 %div{ ng: { controller: 'LineItemsCtrl' } }
-  %save-bar{ form: "bulk_order_form", buttons: "[{ text: 'Save Changes', action: submit }]" }
+  %save-bar{ form: "bulk_order_form", buttons: "[{ text: 'Save Changes', action: submit, class: 'red' }]" }
   .filters{ :class => "sixteen columns alpha" }
     .date_filter{ :class => "two columns alpha" }
       %label{ :for => 'start_date_filter' }

From c80255e9ab99141fbe24b422e28ffb843ea9eb00 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Sun, 1 May 2016 12:59:55 +0100
Subject: [PATCH 39/45] Add total to producer emails

---
 app/mailers/producer_mailer.rb                         | 5 +++++
 app/views/producer_mailer/order_cycle_report.text.haml | 3 +++
 spec/mailers/producer_mailer_spec.rb                   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/mailers/producer_mailer.rb b/app/mailers/producer_mailer.rb
index b9fb52fb41..d65d722894 100644
--- a/app/mailers/producer_mailer.rb
+++ b/app/mailers/producer_mailer.rb
@@ -6,6 +6,7 @@ class ProducerMailer < Spree::BaseMailer
     @order_cycle = order_cycle
     @line_items = aggregated_line_items_from(@order_cycle, @producer)
     @receival_instructions = @order_cycle.receival_instructions_for @producer
+    @total = total_from_line_items(@line_items)
 
     subject = "[#{Spree::Config.site_name}] Order cycle report for #{producer.name}"
 
@@ -49,4 +50,8 @@ class ProducerMailer < Spree::BaseMailer
       lis
     end
   end
+
+  def total_from_line_items(aggregated_line_items)
+    Spree::Money.new(aggregated_line_items.values.map(&:display_amount).reduce(:+)).to_s
+  end
 end
diff --git a/app/views/producer_mailer/order_cycle_report.text.haml b/app/views/producer_mailer/order_cycle_report.text.haml
index 93748395ce..ea035391b8 100644
--- a/app/views/producer_mailer/order_cycle_report.text.haml
+++ b/app/views/producer_mailer/order_cycle_report.text.haml
@@ -15,6 +15,9 @@ Here is a summary of the orders for your products:
 - @line_items.each_pair do |variant, line_item|
   #{variant.sku} - #{raw(variant.product.supplier.name)} - #{raw(variant.product_and_full_name)} (QTY: #{line_item.quantity}) @ #{line_item.single_money} = #{line_item.display_amount}
 \
+\
+Total: #{@total}
+\
 Thanks and best wishes,
 #{@coordinator.name}
 #{@coordinator.address.address1}, #{@coordinator.address.city}, #{@coordinator.address.zipcode}
diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb
index 0c7e82b89d..4e3fd912d2 100644
--- a/spec/mailers/producer_mailer_spec.rb
+++ b/spec/mailers/producer_mailer_spec.rb
@@ -62,6 +62,10 @@ describe ProducerMailer do
     mail.body.should_not include p3.name
   end
 
+  it "includes the total" do
+    mail.body.should include 'Total: $20.00'
+  end
+
   it "sends no mail when the producer has no orders" do
     expect do
       ProducerMailer.order_cycle_report(s3, order_cycle).deliver

From ef418c7f506dd38bfa371f188f1816c92907cd15 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Wed, 4 May 2016 07:58:23 +0100
Subject: [PATCH 40/45] Change to use total rather than display_total (which
 returns a Spree::Money object)

---
 app/mailers/producer_mailer.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/mailers/producer_mailer.rb b/app/mailers/producer_mailer.rb
index d65d722894..52decf5d8a 100644
--- a/app/mailers/producer_mailer.rb
+++ b/app/mailers/producer_mailer.rb
@@ -46,12 +46,11 @@ class ProducerMailer < Spree::BaseMailer
       else
         lis[li.variant] = li
       end
-
       lis
     end
   end
 
   def total_from_line_items(aggregated_line_items)
-    Spree::Money.new(aggregated_line_items.values.map(&:display_amount).reduce(:+)).to_s
+    Spree::Money.new(aggregated_line_items.values.map(&:total).reduce(:+)).to_s
   end
 end

From 559f7afc6047d74c915960d2b50885500093ad46 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Tue, 10 May 2016 23:04:06 +0100
Subject: [PATCH 41/45] HTML order cycle report email, text customisable in
 translations

---
 app/assets/stylesheets/mail/email.css.sass    |  3 +
 app/mailers/producer_mailer.rb                |  5 ++
 .../order_cycle_report.html.haml              | 62 +++++++++++++++++++
 .../order_cycle_report.text.haml              |  4 +-
 config/locales/en.yml                         |  3 +
 spec/mailers/producer_mailer_spec.rb          |  1 +
 6 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 app/views/producer_mailer/order_cycle_report.html.haml

diff --git a/app/assets/stylesheets/mail/email.css.sass b/app/assets/stylesheets/mail/email.css.sass
index 4256357923..e9eabd4edb 100644
--- a/app/assets/stylesheets/mail/email.css.sass
+++ b/app/assets/stylesheets/mail/email.css.sass
@@ -74,6 +74,9 @@ table.order-summary
       padding-left: 5px
       padding-right: 5px
 
+.text-right
+  text-align: right
+
 .social .soc-btn
   padding: 3px 7px
   font-size: 12px
diff --git a/app/mailers/producer_mailer.rb b/app/mailers/producer_mailer.rb
index 52decf5d8a..9f776abc81 100644
--- a/app/mailers/producer_mailer.rb
+++ b/app/mailers/producer_mailer.rb
@@ -7,6 +7,7 @@ class ProducerMailer < Spree::BaseMailer
     @line_items = aggregated_line_items_from(@order_cycle, @producer)
     @receival_instructions = @order_cycle.receival_instructions_for @producer
     @total = total_from_line_items(@line_items)
+    @tax_total = tax_total_from_line_items(@line_items)
 
     subject = "[#{Spree::Config.site_name}] Order cycle report for #{producer.name}"
 
@@ -53,4 +54,8 @@ class ProducerMailer < Spree::BaseMailer
   def total_from_line_items(aggregated_line_items)
     Spree::Money.new(aggregated_line_items.values.map(&:total).reduce(:+)).to_s
   end
+
+  def tax_total_from_line_items(aggregated_line_items)
+    Spree::Money.new(aggregated_line_items.values.map(&:included_tax).reduce(:+)).to_s
+  end
 end
diff --git a/app/views/producer_mailer/order_cycle_report.html.haml b/app/views/producer_mailer/order_cycle_report.html.haml
new file mode 100644
index 0000000000..66276745b5
--- /dev/null
+++ b/app/views/producer_mailer/order_cycle_report.html.haml
@@ -0,0 +1,62 @@
+%p Dear #{@producer.name},
+%p
+  = t :producer_mail_text_before
+  - if @receival_instructions
+    %p
+      Stock pickup/delivery instructions:
+      = @receival_instructions
+%p
+  Here is a summary of the orders for your products:
+  %table.order-summary
+    %thead
+      %tr
+        %th
+          = t :sku
+        %th
+          = t :supplier
+        %th
+          = t :product
+        %th.text-right
+          = t :quantity
+        %th.text-right
+          = t :price
+        %th.text-right
+          = t :subtotal
+        %th.text-right
+          = t :included_tax
+    %tbody
+      - @line_items.each_pair do |variant, line_item|
+        %tr
+          %td
+            #{variant.sku}
+          %td
+            #{raw(variant.product.supplier.name)}
+          %td
+            #{raw(variant.product_and_full_name)}
+          %td.text-right
+            #{line_item.quantity}
+          %td.text-right
+            #{line_item.single_money}
+          %td.text-right
+            #{line_item.display_total}
+          %td.text-right
+            #{line_item.display_included_tax}
+      %tr.total_row
+        %td
+        %td
+        %td
+        %td
+        %td
+        %td.text-right
+          #{@total}
+        %td.text-right
+          #{@tax_total}
+%p
+  = t :producer_mail_text_after
+    %em
+      %p
+        #{@coordinator.name}
+      %p
+        #{@coordinator.address.address1}, #{@coordinator.address.city}, #{@coordinator.address.zipcode}
+        #{@coordinator.phone}
+        #{@coordinator.email}
diff --git a/app/views/producer_mailer/order_cycle_report.text.haml b/app/views/producer_mailer/order_cycle_report.text.haml
index ea035391b8..5c94107bd4 100644
--- a/app/views/producer_mailer/order_cycle_report.text.haml
+++ b/app/views/producer_mailer/order_cycle_report.text.haml
@@ -1,6 +1,6 @@
 Dear #{@producer.name},
 \
-We now have all the consumer orders for the next food drop.
+= t :producer_mail_text_before
 \
 - if @receival_instructions
   Stock pickup/delivery instructions:
@@ -18,7 +18,7 @@ Here is a summary of the orders for your products:
 \
 Total: #{@total}
 \
-Thanks and best wishes,
+= t :producer_mail_text_after
 #{@coordinator.name}
 #{@coordinator.address.address1}, #{@coordinator.address.city}, #{@coordinator.address.zipcode}
 #{@coordinator.phone}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ac8d07bd7e..2186b01304 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -410,6 +410,9 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   If you are a producer or food enterprise, we are excited to have you as a part of the network."
   email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at"
 
+  producer_mail_text_before: "We now have all the consumer orders for the next food drop."
+  producer_mail_text_after: "Thanks and best wishes,"
+
   shopping_oc_closed: Orders are closed
   shopping_oc_closed_description: "Please wait until the next cycle opens (or contact us directly to see if we can accept any late orders)"
   shopping_oc_last_closed: "The last cycle closed %{distance_of_time} ago"
diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb
index 4e3fd912d2..e1c91af699 100644
--- a/spec/mailers/producer_mailer_spec.rb
+++ b/spec/mailers/producer_mailer_spec.rb
@@ -63,6 +63,7 @@ describe ProducerMailer do
   end
 
   it "includes the total" do
+    puts mail.body.encoded
     mail.body.should include 'Total: $20.00'
   end
 

From ab37cd25773cdbb42c741744a099aa3afd2795e3 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Tue, 10 May 2016 23:11:14 +0100
Subject: [PATCH 42/45] Fix specs, need to add new for HTML

---
 .../producer_mailer/order_cycle_report.html.haml   | 14 +++++++-------
 spec/mailers/producer_mailer_spec.rb               |  7 +++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/views/producer_mailer/order_cycle_report.html.haml b/app/views/producer_mailer/order_cycle_report.html.haml
index 66276745b5..31cef99465 100644
--- a/app/views/producer_mailer/order_cycle_report.html.haml
+++ b/app/views/producer_mailer/order_cycle_report.html.haml
@@ -53,10 +53,10 @@
           #{@tax_total}
 %p
   = t :producer_mail_text_after
-    %em
-      %p
-        #{@coordinator.name}
-      %p
-        #{@coordinator.address.address1}, #{@coordinator.address.city}, #{@coordinator.address.zipcode}
-        #{@coordinator.phone}
-        #{@coordinator.email}
+  %em
+    %p
+      #{@coordinator.name}
+    %p
+      #{@coordinator.address.address1}, #{@coordinator.address.city}, #{@coordinator.address.zipcode}
+      #{@coordinator.phone}
+      #{@coordinator.email}
diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb
index e1c91af699..2ced290fed 100644
--- a/spec/mailers/producer_mailer_spec.rb
+++ b/spec/mailers/producer_mailer_spec.rb
@@ -44,7 +44,7 @@ describe ProducerMailer do
   end
 
   it "includes receival instructions" do
-    mail.body.should include 'Outside shed.'
+    mail.body.encoded.should include 'Outside shed.'
   end
 
   it "cc's the enterprise" do
@@ -59,12 +59,11 @@ describe ProducerMailer do
   end
 
   it "does not include incomplete orders" do
-    mail.body.should_not include p3.name
+    mail.body.encoded.should_not include p3.name
   end
 
   it "includes the total" do
-    puts mail.body.encoded
-    mail.body.should include 'Total: $20.00'
+    mail.body.encoded.should include 'Total: $20.00'
   end
 
   it "sends no mail when the producer has no orders" do

From 9f56494c4c076a7f102b347a3074686aa3bfe507 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 13 May 2016 10:36:23 +1000
Subject: [PATCH 43/45] Simplify

---
 app/mailers/producer_mailer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mailers/producer_mailer.rb b/app/mailers/producer_mailer.rb
index 9f776abc81..590193c4a5 100644
--- a/app/mailers/producer_mailer.rb
+++ b/app/mailers/producer_mailer.rb
@@ -52,10 +52,10 @@ class ProducerMailer < Spree::BaseMailer
   end
 
   def total_from_line_items(aggregated_line_items)
-    Spree::Money.new(aggregated_line_items.values.map(&:total).reduce(:+)).to_s
+    Spree::Money.new aggregated_line_items.values.map(&:total).sum
   end
 
   def tax_total_from_line_items(aggregated_line_items)
-    Spree::Money.new(aggregated_line_items.values.map(&:included_tax).reduce(:+)).to_s
+    Spree::Money.new aggregated_line_items.values.map(&:included_tax).sum
   end
 end

From 027976626c2b5a6eaa6804e7c3e2900470a67ee5 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 13 May 2016 11:19:44 +1000
Subject: [PATCH 44/45] Add spec for error summing Spree::Money

---
 spec/mailers/producer_mailer_spec.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/spec/mailers/producer_mailer_spec.rb b/spec/mailers/producer_mailer_spec.rb
index 2ced290fed..1f7d5a6501 100644
--- a/spec/mailers/producer_mailer_spec.rb
+++ b/spec/mailers/producer_mailer_spec.rb
@@ -10,21 +10,23 @@ describe ProducerMailer do
   let(:p1) { create(:product, price: 12.34, supplier: s1) }
   let(:p2) { create(:product, price: 23.45, supplier: s2) }
   let(:p3) { create(:product, price: 34.56, supplier: s1) }
+  let(:p4) { create(:product, price: 45.67, supplier: s1) }
   let(:order_cycle) { create(:simple_order_cycle) }
   let!(:incoming_exchange) { order_cycle.exchanges.create! sender: s1, receiver: d1, incoming: true, receival_instructions: 'Outside shed.' }
 
   let!(:order) do
     order = create(:order, distributor: d1, order_cycle: order_cycle, state: 'complete')
-    order.line_items << create(:line_item, variant: p1.master)
-    order.line_items << create(:line_item, variant: p1.master)
-    order.line_items << create(:line_item, variant: p2.master)
+    order.line_items << create(:line_item, variant: p1.variants.first)
+    order.line_items << create(:line_item, variant: p1.variants.first)
+    order.line_items << create(:line_item, variant: p2.variants.first)
+    order.line_items << create(:line_item, variant: p4.variants.first)
     order.finalize!
     order.save
     order
   end
   let!(:order_incomplete) do
     order = create(:order, distributor: d1, order_cycle: order_cycle, state: 'payment')
-    order.line_items << create(:line_item, variant: p3.master)
+    order.line_items << create(:line_item, variant: p3.variants.first)
     order.save
     order
   end
@@ -63,7 +65,7 @@ describe ProducerMailer do
   end
 
   it "includes the total" do
-    mail.body.encoded.should include 'Total: $20.00'
+    mail.body.encoded.should include 'Total: $30.00'
   end
 
   it "sends no mail when the producer has no orders" do

From ba2d5548ff85d366276fca434c0b509a8fee76dd Mon Sep 17 00:00:00 2001
From: Bing Xie <bing708@gmail.com>
Date: Fri, 13 May 2016 15:44:34 +1000
Subject: [PATCH 45/45] Fix groups map view

---
 app/views/groups/show.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 74588176b9..b5222e5f86 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -40,6 +40,7 @@
               .map-container
                 %map{"ng-if" => "(active(\'\') && (mapShowed = true)) || mapShowed"}
                   %google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
+                    %map-search
                     %markers{models: "mapMarkers", fit: "true",
                     coords: "'self'", icon: "'icon'", click: "'reveal'"}