From 192d4993a11c6ace3fdff25d53810160fcda2d3e Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 Nov 2012 13:42:55 +1100
Subject: [PATCH 01/29] Add EnterpriseFee model

---
 app/models/enterprise_fee.rb                  |   8 +
 .../20121115010717_create_enterprise_fees.rb  |  11 ++
 db/schema.rb                                  | 158 +++++++++---------
 spec/factories.rb                             |   3 +
 spec/models/enterprise_fee_spec.rb            |  11 ++
 5 files changed, 116 insertions(+), 75 deletions(-)
 create mode 100644 app/models/enterprise_fee.rb
 create mode 100644 db/migrate/20121115010717_create_enterprise_fees.rb
 create mode 100644 spec/models/enterprise_fee_spec.rb

diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
new file mode 100644
index 0000000000..04223ea586
--- /dev/null
+++ b/app/models/enterprise_fee.rb
@@ -0,0 +1,8 @@
+class EnterpriseFee < ActiveRecord::Base
+  belongs_to :enterprise
+
+  FEE_TYPES = %w(Packing Transport Admin Sales)
+
+  validates_inclusion_of :fee_type, :in => FEE_TYPES
+  validates_presence_of :name
+end
diff --git a/db/migrate/20121115010717_create_enterprise_fees.rb b/db/migrate/20121115010717_create_enterprise_fees.rb
new file mode 100644
index 0000000000..00c3057bfb
--- /dev/null
+++ b/db/migrate/20121115010717_create_enterprise_fees.rb
@@ -0,0 +1,11 @@
+class CreateEnterpriseFees < ActiveRecord::Migration
+  def change
+    create_table :enterprise_fees do |t|
+      t.references :enterprise
+      t.string :fee_type
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4bbccb5c05..f0e2589174 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121031222403) do
+ActiveRecord::Schema.define(:version => 20121115010717) do
 
   create_table "cms_blocks", :force => true do |t|
     t.integer  "page_id",    :null => false
@@ -130,6 +130,14 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
   add_index "cms_snippets", ["site_id", "identifier"], :name => "index_cms_snippets_on_site_id_and_identifier", :unique => true
   add_index "cms_snippets", ["site_id", "position"], :name => "index_cms_snippets_on_site_id_and_position"
 
+  create_table "enterprise_fees", :force => true do |t|
+    t.integer  "enterprise_id"
+    t.string   "fee_type"
+    t.string   "name"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
   create_table "enterprises", :force => true do |t|
     t.string   "name"
     t.string   "description"
@@ -186,8 +194,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "alternative_phone"
     t.integer  "state_id"
     t.integer  "country_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
     t.string   "company"
   end
 
@@ -196,12 +204,12 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
 
   create_table "spree_adjustments", :force => true do |t|
     t.integer  "source_id"
-    t.decimal  "amount",          :precision => 8, :scale => 2, :default => 0.0
+    t.decimal  "amount",          :precision => 8, :scale => 2
     t.string   "label"
     t.string   "source_type"
     t.integer  "adjustable_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                      :null => false
+    t.datetime "updated_at",                                                      :null => false
     t.boolean  "mandatory"
     t.boolean  "locked"
     t.integer  "originator_id"
@@ -233,15 +241,15 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "type"
     t.integer  "calculable_id",   :null => false
     t.string   "calculable_type", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
   end
 
   create_table "spree_configurations", :force => true do |t|
     t.string   "name"
     t.string   "type",       :limit => 50
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
   end
 
   add_index "spree_configurations", ["name", "type"], :name => "index_configurations_on_name_and_type"
@@ -279,8 +287,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "environment", :default => "development"
     t.string   "server",      :default => "test"
     t.boolean  "test_mode",   :default => true
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
   end
 
   create_table "spree_inventory_units", :force => true do |t|
@@ -288,8 +296,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "state"
     t.integer  "variant_id"
     t.integer  "order_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.integer  "shipment_id"
     t.integer  "return_authorization_id"
   end
@@ -303,8 +311,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "variant_id"
     t.integer  "quantity",                                         :null => false
     t.decimal  "price",              :precision => 8, :scale => 2, :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                       :null => false
+    t.datetime "updated_at",                                       :null => false
     t.integer  "max_quantity"
     t.integer  "shipping_method_id"
   end
@@ -316,22 +324,22 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "source_id"
     t.string   "source_type"
     t.text     "details"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   create_table "spree_mail_methods", :force => true do |t|
     t.string   "environment"
     t.boolean  "active",      :default => true
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
   end
 
   create_table "spree_option_types", :force => true do |t|
     t.string   "name",         :limit => 100
     t.string   "presentation", :limit => 100
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
     t.integer  "position",                    :default => 0, :null => false
   end
 
@@ -345,8 +353,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "name"
     t.string   "presentation"
     t.integer  "option_type_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
   create_table "spree_option_values_variants", :id => false, :force => true do |t|
@@ -365,8 +373,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.decimal  "adjustment_total",                   :precision => 8, :scale => 2, :default => 0.0, :null => false
     t.decimal  "credit_total",                       :precision => 8, :scale => 2, :default => 0.0, :null => false
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                                        :null => false
+    t.datetime "updated_at",                                                                        :null => false
     t.datetime "completed_at"
     t.integer  "bill_address_id"
     t.integer  "ship_address_id"
@@ -387,8 +395,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.text     "description"
     t.boolean  "active",      :default => true
     t.string   "environment", :default => "development"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
     t.datetime "deleted_at"
     t.string   "display_on"
   end
@@ -396,8 +404,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
   create_table "spree_payments", :force => true do |t|
     t.decimal  "amount",            :precision => 8, :scale => 2, :default => 0.0, :null => false
     t.integer  "order_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                       :null => false
+    t.datetime "updated_at",                                                       :null => false
     t.integer  "source_id"
     t.string   "source_type"
     t.integer  "payment_method_id"
@@ -426,8 +434,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "owner_id"
     t.string   "owner_type"
     t.text     "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.string   "key"
     t.string   "value_type"
   end
@@ -452,16 +460,16 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "position"
     t.integer  "product_id"
     t.integer  "option_type_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
   create_table "spree_product_properties", :force => true do |t|
     t.string   "value"
     t.integer  "product_id"
     t.integer  "property_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   add_index "spree_product_properties", ["product_id"], :name => "index_product_properties_on_product_id"
@@ -485,8 +493,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "meta_keywords"
     t.integer  "tax_category_id"
     t.integer  "shipping_category_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                           :null => false
+    t.datetime "updated_at",                           :null => false
     t.integer  "count_on_hand",        :default => 0,  :null => false
     t.integer  "supplier_id"
     t.boolean  "group_buy"
@@ -531,8 +539,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "user_id"
     t.integer  "product_group_id"
     t.string   "type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   add_index "spree_promotion_rules", ["product_group_id"], :name => "index_promotion_rules_on_product_group_id"
@@ -549,8 +557,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
   create_table "spree_properties", :force => true do |t|
     t.string   "name"
     t.string   "presentation", :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
   end
 
   create_table "spree_properties_prototypes", :id => false, :force => true do |t|
@@ -560,8 +568,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
 
   create_table "spree_prototypes", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "spree_return_authorizations", :force => true do |t|
@@ -570,8 +578,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.decimal  "amount",     :precision => 8, :scale => 2, :default => 0.0, :null => false
     t.integer  "order_id"
     t.text     "reason"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
   end
 
   create_table "spree_roles", :force => true do |t|
@@ -594,8 +602,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "order_id"
     t.integer  "shipping_method_id"
     t.integer  "address_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                       :null => false
+    t.datetime "updated_at",                                       :null => false
     t.string   "state"
   end
 
@@ -603,15 +611,15 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
 
   create_table "spree_shipping_categories", :force => true do |t|
     t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "spree_shipping_methods", :force => true do |t|
     t.string   "name"
     t.integer  "zone_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",           :null => false
+    t.datetime "updated_at",           :null => false
     t.string   "display_on"
     t.integer  "shipping_category_id"
     t.boolean  "match_none"
@@ -627,8 +635,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "transaction_id"
     t.integer  "customer_id"
     t.string   "payment_type"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
   create_table "spree_state_changes", :force => true do |t|
@@ -636,8 +644,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "previous_state"
     t.integer  "stateful_id"
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
     t.string   "stateful_type"
     t.string   "next_state"
   end
@@ -651,8 +659,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
   create_table "spree_tax_categories", :force => true do |t|
     t.string   "name"
     t.string   "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
     t.boolean  "is_default",  :default => false
     t.datetime "deleted_at"
   end
@@ -661,15 +669,15 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.decimal  "amount",            :precision => 8, :scale => 5
     t.integer  "zone_id"
     t.integer  "tax_category_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                                         :null => false
+    t.datetime "updated_at",                                                         :null => false
     t.boolean  "included_in_price",                               :default => false
   end
 
   create_table "spree_taxonomies", :force => true do |t|
     t.string   "name",       :null => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "spree_taxons", :force => true do |t|
@@ -678,8 +686,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "name",                             :null => false
     t.string   "permalink"
     t.integer  "taxonomy_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                       :null => false
+    t.datetime "updated_at",                       :null => false
     t.integer  "lft"
     t.integer  "rgt"
     t.string   "icon_file_name"
@@ -697,8 +705,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "permissable_id"
     t.string   "permissable_type"
     t.string   "token"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   add_index "spree_tokenized_permissions", ["permissable_id", "permissable_type"], :name => "index_tokenized_name_and_type"
@@ -707,8 +715,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "environment"
     t.string   "analytics_id"
     t.boolean  "active",       :default => true
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
   end
 
   create_table "spree_users", :force => true do |t|
@@ -729,8 +737,8 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.string   "login"
     t.integer  "ship_address_id"
     t.integer  "bill_address_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                                          :null => false
+    t.datetime "updated_at",                                          :null => false
     t.string   "authentication_token"
     t.string   "unlock_token"
     t.datetime "locked_at"
@@ -753,7 +761,7 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.boolean  "is_master",                                   :default => false
     t.integer  "product_id"
     t.integer  "count_on_hand",                               :default => 0,     :null => false
-    t.decimal  "cost_price",    :precision => 8, :scale => 2, :default => 0.0
+    t.decimal  "cost_price",    :precision => 8, :scale => 2
     t.integer  "position"
   end
 
@@ -763,15 +771,15 @@ ActiveRecord::Schema.define(:version => 20121031222403) do
     t.integer  "zoneable_id"
     t.string   "zoneable_type"
     t.integer  "zone_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
   end
 
   create_table "spree_zones", :force => true do |t|
     t.string   "name"
     t.string   "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
     t.boolean  "default_tax",        :default => false
     t.integer  "zone_members_count", :default => 0
   end
diff --git a/spec/factories.rb b/spec/factories.rb
index 8348f98afd..d4b6504514 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -20,6 +20,9 @@ FactoryGirl.define do
     is_distributor true
   end
 
+  factory :enterprise_fee, :class => EnterpriseFee do
+  end
+
   factory :product_distribution, :class => ProductDistribution do
     product         { |pd| Spree::Product.first || FactoryGirl.create(:product) }
     distributor     { |pd| Enterprise.is_distributor.first || FactoryGirl.create(:distributor_enterprise) }
diff --git a/spec/models/enterprise_fee_spec.rb b/spec/models/enterprise_fee_spec.rb
new file mode 100644
index 0000000000..1616b0decd
--- /dev/null
+++ b/spec/models/enterprise_fee_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe EnterpriseFee do
+  describe "associations" do
+    it { should belong_to(:enterprise) }
+  end
+
+  describe "validations" do
+    it { should validate_presence_of(:name) }
+  end
+end

From ec743966593f8468a83b98a373e75dd24ca91825 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 Nov 2012 13:58:51 +1100
Subject: [PATCH 02/29] Add enterprise fees to admin configurations menu

---
 .../add_enterprise_fees_to_admin_configurations_menu.rb       | 4 ++++
 .../enterprise_fees/_admin_configurations_menu.html.haml      | 3 +++
 config/routes.rb                                              | 1 +
 3 files changed, 8 insertions(+)
 create mode 100644 app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
 create mode 100644 app/views/enterprise_fees/_admin_configurations_menu.html.haml

diff --git a/app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb b/app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
new file mode 100644
index 0000000000..a363758646
--- /dev/null
+++ b/app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "spree/admin/configurations/index",
+                     :name => "add_enterprise_fees_to_admin_configurations_menu",
+                     :insert_bottom => "[data-hook='admin_configurations_menu']",
+                     :partial => 'enterprise_fees/admin_configurations_menu')
diff --git a/app/views/enterprise_fees/_admin_configurations_menu.html.haml b/app/views/enterprise_fees/_admin_configurations_menu.html.haml
new file mode 100644
index 0000000000..13045a0fb2
--- /dev/null
+++ b/app/views/enterprise_fees/_admin_configurations_menu.html.haml
@@ -0,0 +1,3 @@
+%tr
+  %td= link_to "Enterprise Fees", main_app.admin_enterprise_fees_path
+  %td Create and manage fees charged by enterprises on order cycles
diff --git a/config/routes.rb b/config/routes.rb
index 60454a3ae1..31871a0ecc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,6 +12,7 @@ Openfoodweb::Application.routes.draw do
     resources :enterprises do
       post :bulk_update, :on => :collection, :as => :bulk_update
     end
+    resources :enterprise_fees
   end
 
   # Mount Spree's routes

From 03764881c8e4d3bd62aa7952df482c90fe149188 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 Nov 2012 14:29:38 +1100
Subject: [PATCH 03/29] Generalise EnterpriseSet to ModelSet

---
 .../admin/enterprises_controller.rb           |  4 +--
 app/models/enterprise_set.rb                  | 34 -------------------
 app/models/model_set.rb                       | 34 +++++++++++++++++++
 app/views/admin/enterprises/index.html.erb    |  2 +-
 spec/requests/admin/enterprises_spec.rb       |  8 ++---
 5 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 app/models/enterprise_set.rb
 create mode 100644 app/models/model_set.rb

diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb
index 08f6e2133f..d0ad4bfac6 100644
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -6,7 +6,7 @@ module Admin
     helper 'spree/products'
 
     def bulk_update
-      @enterprise_set = EnterpriseSet.new(params[:enterprise_set])
+      @enterprise_set = ModelSet.new(Enterprise.all, params[:model_set])
       if @enterprise_set.save
         redirect_to main_app.admin_enterprises_path, :notice => 'Distributor collection times updated.'
       else
@@ -16,7 +16,7 @@ module Admin
 
     private
     def load_enterprise_set
-      @enterprise_set = EnterpriseSet.new :enterprises => collection
+      @enterprise_set = ModelSet.new Enterprise.all, :collection => collection
     end
 
     def load_countries
diff --git a/app/models/enterprise_set.rb b/app/models/enterprise_set.rb
deleted file mode 100644
index b741167dfe..0000000000
--- a/app/models/enterprise_set.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# Tableless model to handle updating multiple enterprises at once from a
-# single form. Used to update next_collection_at field for all distributors in
-# admin backend.
-class EnterpriseSet
-  include ActiveModel::Conversion
-  extend ActiveModel::Naming
-
-  attr_accessor :enterprises
-
-  def initialize(attributes={})
-    @enterprises = Enterprise.all
-
-    attributes.each do |name, value|
-      send("#{name}=", value)
-    end
-  end
-
-  def enterprises_attributes=(attributes)
-    attributes.each do |k, attributes|
-      # attributes == {:id => 123, :next_collection_at => '...'}
-      e = @enterprises.detect { |e| e.id.to_s == attributes[:id].to_s }
-      e.assign_attributes(attributes.except(:id))
-    end
-  end
-
-  def save
-    enterprises.all?(&:save)
-  end
-
-  def persisted?
-    false
-  end
-
-end
diff --git a/app/models/model_set.rb b/app/models/model_set.rb
new file mode 100644
index 0000000000..e806e44014
--- /dev/null
+++ b/app/models/model_set.rb
@@ -0,0 +1,34 @@
+# Tableless model to handle updating multiple models at once from a
+# single form. For example, it is used to update the enterprise next_collection_at
+# field for all distributors in the admin backend.
+class ModelSet
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :collection
+
+  def initialize(collection, attributes={})
+    @collection = collection
+
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def collection_attributes=(attributes)
+    attributes.each do |k, attributes|
+      # attributes == {:id => 123, :next_collection_at => '...'}
+      e = @collection.detect { |e| e.id.to_s == attributes[:id].to_s }
+      e.assign_attributes(attributes.except(:id))
+    end
+  end
+
+  def save
+    collection.all?(&:save)
+  end
+
+  def persisted?
+    false
+  end
+
+end
diff --git a/app/views/admin/enterprises/index.html.erb b/app/views/admin/enterprises/index.html.erb
index 75dad0f85f..c1e0869b86 100644
--- a/app/views/admin/enterprises/index.html.erb
+++ b/app/views/admin/enterprises/index.html.erb
@@ -19,7 +19,7 @@
       </tr>
     </thead>
     <tbody>
-      <%= f.fields_for :enterprises do |enterprise_form| %>
+      <%= f.fields_for :collection do |enterprise_form| %>
         <% enterprise = enterprise_form.object %>
         <tr>
           <td><%= link_to enterprise.name, main_app.admin_enterprise_path(enterprise) %></td>
diff --git a/spec/requests/admin/enterprises_spec.rb b/spec/requests/admin/enterprises_spec.rb
index dae560df69..535970cf55 100644
--- a/spec/requests/admin/enterprises_spec.rb
+++ b/spec/requests/admin/enterprises_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 feature %q{
     As an administrator
-    I want manage enterprises
+    I want to manage enterprises
 } do
   include AuthenticationWorkflow
   include WebHelper
@@ -109,9 +109,9 @@ feature %q{
     click_link 'Enterprises'
 
     # And I fill in some new collection times and save them
-    fill_in 'enterprise_set_enterprises_attributes_0_next_collection_at', :with => 'One'
-    fill_in 'enterprise_set_enterprises_attributes_1_next_collection_at', :with => 'Two'
-    fill_in 'enterprise_set_enterprises_attributes_2_next_collection_at', :with => 'Three'
+    fill_in 'model_set_collection_attributes_0_next_collection_at', :with => 'One'
+    fill_in 'model_set_collection_attributes_1_next_collection_at', :with => 'Two'
+    fill_in 'model_set_collection_attributes_2_next_collection_at', :with => 'Three'
     click_button 'Update'
 
     # Then my times should have been saved

From 6247bd2541bb10f1edf4f6d4f503cce3f7ae3d75 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 Nov 2012 15:03:12 +1100
Subject: [PATCH 04/29] Display admin table of enterprise fees with enterprise,
 fee type and name columns

---
 .../admin/enterprise_fees_controller.rb       | 10 ++++++++++
 app/helpers/enterprise_fees_helper.rb         |  5 +++++
 app/models/enterprise_fee.rb                  |  2 +-
 .../admin/enterprise_fees/index.html.haml     | 20 +++++++++++++++++++
 config/routes.rb                              |  4 +++-
 spec/factories.rb                             |  3 +++
 6 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/admin/enterprise_fees_controller.rb
 create mode 100644 app/helpers/enterprise_fees_helper.rb
 create mode 100644 app/views/admin/enterprise_fees/index.html.haml

diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
new file mode 100644
index 0000000000..bdb74d59dd
--- /dev/null
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -0,0 +1,10 @@
+module Admin
+  class EnterpriseFeesController < ResourceController
+    before_filter :load_enterprise_fees_set, :only => :index
+
+    private
+    def load_enterprise_fees_set
+      @enterprise_fees_set = ModelSet.new EnterpriseFee.all, :collection => collection
+    end
+  end
+end
diff --git a/app/helpers/enterprise_fees_helper.rb b/app/helpers/enterprise_fees_helper.rb
new file mode 100644
index 0000000000..2399a1737e
--- /dev/null
+++ b/app/helpers/enterprise_fees_helper.rb
@@ -0,0 +1,5 @@
+module EnterpriseFeesHelper
+  def enterprise_fee_options
+    EnterpriseFee::FEE_TYPES.map { |f| [f.capitalize, f] }
+  end
+end
diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
index 04223ea586..ea5ba91446 100644
--- a/app/models/enterprise_fee.rb
+++ b/app/models/enterprise_fee.rb
@@ -1,7 +1,7 @@
 class EnterpriseFee < ActiveRecord::Base
   belongs_to :enterprise
 
-  FEE_TYPES = %w(Packing Transport Admin Sales)
+  FEE_TYPES = %w(packing transport admin sales)
 
   validates_inclusion_of :fee_type, :in => FEE_TYPES
   validates_presence_of :name
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
new file mode 100644
index 0000000000..bdac2f5ce5
--- /dev/null
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -0,0 +1,20 @@
+= form_for @enterprise_fees_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fees_set_form|
+  %table.index#listing_enterprise_fees
+    %thead
+      %tr
+        %th Enterprise
+        %th Fee Type
+        %th Name
+        %th Calculator
+        %th Calculator values
+        %th
+    %tbody
+      = enterprise_fees_set_form.fields_for :collection do |f|
+        - enterprise_fee = f.object
+        %tr
+          %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name
+          %td= f.select :fee_type, enterprise_fee_options
+          %td= f.text_field :name
+          %td TODO
+          %td TODO
+          %td TODO
diff --git a/config/routes.rb b/config/routes.rb
index 31871a0ecc..0ad57b0304 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,7 +12,9 @@ Openfoodweb::Application.routes.draw do
     resources :enterprises do
       post :bulk_update, :on => :collection, :as => :bulk_update
     end
-    resources :enterprise_fees
+    resources :enterprise_fees do
+      post :bulk_update, :on => :collection, :as => :bulk_update
+    end
   end
 
   # Mount Spree's routes
diff --git a/spec/factories.rb b/spec/factories.rb
index d4b6504514..6b76ab47c7 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -21,6 +21,9 @@ FactoryGirl.define do
   end
 
   factory :enterprise_fee, :class => EnterpriseFee do
+    enterprise { Enterprise.first || FactoryGirl.create(:supplier_enterprise) }
+    fee_type 'packing'
+    name '$0.50 / kg'
   end
 
   factory :product_distribution, :class => ProductDistribution do

From 98143ffe5b19c3758a1c8cfbc5f450bf792acfe3 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 Nov 2012 16:07:40 +1100
Subject: [PATCH 05/29] Add calculator to EnterpriseFee, test passes for
 listing enterprise fees

---
 .../admin/enterprise_fees_controller.rb       |  6 +++++
 app/models/enterprise_fee.rb                  |  3 +++
 .../admin/enterprise_fees/index.html.haml     |  7 ++++--
 config/application.rb                         |  7 ++++++
 config/initializers/spree.rb                  | 14 +++++++++++
 spec/factories.rb                             |  9 ++++++++
 spec/requests/admin/enterprise_fees_spec.rb   | 23 +++++++++++++++++++
 7 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 spec/requests/admin/enterprise_fees_spec.rb

diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index bdb74d59dd..2799aa68be 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -1,10 +1,16 @@
 module Admin
   class EnterpriseFeesController < ResourceController
     before_filter :load_enterprise_fees_set, :only => :index
+    before_filter :load_data
 
     private
     def load_enterprise_fees_set
       @enterprise_fees_set = ModelSet.new EnterpriseFee.all, :collection => collection
     end
+
+    def load_data
+      @calculators = EnterpriseFee.calculators.sort_by(&:name)
+    end
+
   end
 end
diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
index ea5ba91446..25b2622e78 100644
--- a/app/models/enterprise_fee.rb
+++ b/app/models/enterprise_fee.rb
@@ -1,6 +1,9 @@
 class EnterpriseFee < ActiveRecord::Base
   belongs_to :enterprise
 
+  calculated_adjustments
+  has_one   :calculator, :as => :calculable, :dependent => :destroy, :class_name => 'Spree::Calculator'
+
   FEE_TYPES = %w(packing transport admin sales)
 
   validates_inclusion_of :fee_type, :in => FEE_TYPES
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index bdac2f5ce5..23b2ddddb5 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -15,6 +15,9 @@
           %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name
           %td= f.select :fee_type, enterprise_fee_options
           %td= f.text_field :name
-          %td TODO
-          %td TODO
+          %td= f.collection_select :calculator_type, @calculators, :name, :description
+          %td
+            - if !enterprise_fee.new_record?
+              = f.fields_for :calculator do |calculator_form|
+                = preference_fields(enterprise_fee.calculator, calculator_form)
           %td TODO
diff --git a/config/application.rb b/config/application.rb
index 0e77035c39..24d5009745 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,6 +28,13 @@ module Openfoodweb
     initializer "spree.register.calculators" do |app|
       app.config.spree.calculators.shipping_methods << OpenFoodWeb::Calculator::Itemwise
       app.config.spree.calculators.shipping_methods << OpenFoodWeb::Calculator::Weight
+
+      app.config.spree.calculators.enterprise_fees = [Spree::Calculator::FlatPercentItemTotal,
+                                                      Spree::Calculator::FlatRate,
+                                                      Spree::Calculator::FlexiRate,
+                                                      Spree::Calculator::PerItem,
+                                                      Spree::Calculator::PriceSack,
+                                                      OpenFoodWeb::Calculator::Weight]
     end
 
 
diff --git a/config/initializers/spree.rb b/config/initializers/spree.rb
index 0a5d763b52..59982c1a9e 100644
--- a/config/initializers/spree.rb
+++ b/config/initializers/spree.rb
@@ -26,3 +26,17 @@ Spree.config do |config|
   # Auto-capture payments. Without this option, payments must be manually captured in the paypal interface.
   config.auto_capture = true
 end
+
+
+# Add calculators category for enterprise fees
+module Spree
+  module Core
+    class Environment
+      class Calculators
+        include EnvironmentExtension
+
+        attr_accessor :enterprise_fees
+      end
+    end
+  end
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 6b76ab47c7..b643b92f1d 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -24,6 +24,9 @@ FactoryGirl.define do
     enterprise { Enterprise.first || FactoryGirl.create(:supplier_enterprise) }
     fee_type 'packing'
     name '$0.50 / kg'
+    calculator { FactoryGirl.build(:weight_calculator) }
+
+    after_create { |ef| ef.calculator.save! }
   end
 
   factory :product_distribution, :class => ProductDistribution do
@@ -39,6 +42,12 @@ FactoryGirl.define do
 
   factory :itemwise_calculator, :class => OpenFoodWeb::Calculator::Itemwise do
   end
+
+  factory :weight_calculator, :class => OpenFoodWeb::Calculator::Weight do
+    after_build  { |c| c.set_preference(:per_kg, 0.5) }
+    after_create { |c| c.set_preference(:per_kg, 0.5); c.save! }
+  end
+
 end
 
 
diff --git a/spec/requests/admin/enterprise_fees_spec.rb b/spec/requests/admin/enterprise_fees_spec.rb
new file mode 100644
index 0000000000..08fc134ceb
--- /dev/null
+++ b/spec/requests/admin/enterprise_fees_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+feature %q{
+    As an administrator
+    I want to manage enterprise fees
+} do
+  include AuthenticationWorkflow
+  include WebHelper
+
+  scenario "listing enterprise fees" do
+    fee = create(:enterprise_fee)
+
+    login_to_admin_section
+    click_link 'Configuration'
+    click_link 'Enterprise Fees'
+
+    page.should have_selector 'option', :text => fee.enterprise.name
+    page.should have_selector 'option', :text => 'Packing'
+    page.should have_selector "input[value='$0.50 / kg']"
+    page.should have_selector 'option', :text => 'Weight (per kg)'
+    page.should have_selector "input[value='0.5']"
+  end
+end

From ff0d2bc9835317590cdfe0276b5fdd898b74de42 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 09:08:41 +1100
Subject: [PATCH 06/29] Create EnterpriseSet as subclass of ModelSet

---
 app/controllers/admin/enterprises_controller.rb | 4 ++--
 app/models/enterprise_set.rb                    | 5 +++++
 app/models/model_set.rb                         | 4 +---
 spec/requests/admin/enterprises_spec.rb         | 6 +++---
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 app/models/enterprise_set.rb

diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb
index d0ad4bfac6..a297eadc9c 100644
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -6,7 +6,7 @@ module Admin
     helper 'spree/products'
 
     def bulk_update
-      @enterprise_set = ModelSet.new(Enterprise.all, params[:model_set])
+      @enterprise_set = EnterpriseSet.new(params[:enterprise_set])
       if @enterprise_set.save
         redirect_to main_app.admin_enterprises_path, :notice => 'Distributor collection times updated.'
       else
@@ -16,7 +16,7 @@ module Admin
 
     private
     def load_enterprise_set
-      @enterprise_set = ModelSet.new Enterprise.all, :collection => collection
+      @enterprise_set = EnterpriseSet.new :collection => collection
     end
 
     def load_countries
diff --git a/app/models/enterprise_set.rb b/app/models/enterprise_set.rb
new file mode 100644
index 0000000000..f267810c62
--- /dev/null
+++ b/app/models/enterprise_set.rb
@@ -0,0 +1,5 @@
+class EnterpriseSet < ModelSet
+  def initialize(attributes={})
+    super(Enterprise.all, attributes)
+  end
+end
diff --git a/app/models/model_set.rb b/app/models/model_set.rb
index e806e44014..737fb9d625 100644
--- a/app/models/model_set.rb
+++ b/app/models/model_set.rb
@@ -1,6 +1,4 @@
-# Tableless model to handle updating multiple models at once from a
-# single form. For example, it is used to update the enterprise next_collection_at
-# field for all distributors in the admin backend.
+# Tableless model to handle updating multiple models at once from a single form
 class ModelSet
   include ActiveModel::Conversion
   extend ActiveModel::Naming
diff --git a/spec/requests/admin/enterprises_spec.rb b/spec/requests/admin/enterprises_spec.rb
index 535970cf55..5c4b433852 100644
--- a/spec/requests/admin/enterprises_spec.rb
+++ b/spec/requests/admin/enterprises_spec.rb
@@ -109,9 +109,9 @@ feature %q{
     click_link 'Enterprises'
 
     # And I fill in some new collection times and save them
-    fill_in 'model_set_collection_attributes_0_next_collection_at', :with => 'One'
-    fill_in 'model_set_collection_attributes_1_next_collection_at', :with => 'Two'
-    fill_in 'model_set_collection_attributes_2_next_collection_at', :with => 'Three'
+    fill_in 'enterprise_set_collection_attributes_0_next_collection_at', :with => 'One'
+    fill_in 'enterprise_set_collection_attributes_1_next_collection_at', :with => 'Two'
+    fill_in 'enterprise_set_collection_attributes_2_next_collection_at', :with => 'Three'
     click_button 'Update'
 
     # Then my times should have been saved

From a4d10ab4e08956ecbf1734f04199148c66639522 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 09:47:51 +1100
Subject: [PATCH 07/29] Create new enterprise fee, display errors when present

---
 .../admin/enterprise_fees_controller.rb       | 20 +++++++++--
 app/models/enterprise_fee.rb                  |  2 ++
 app/models/enterprise_fee_set.rb              |  7 ++++
 app/models/enterprise_set.rb                  |  2 +-
 app/models/model_set.rb                       | 17 ++++++---
 .../admin/enterprise_fees/index.html.haml     | 12 +++++--
 spec/requests/admin/enterprise_fees_spec.rb   | 35 +++++++++++++++++--
 7 files changed, 81 insertions(+), 14 deletions(-)
 create mode 100644 app/models/enterprise_fee_set.rb

diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index 2799aa68be..9b6966c40e 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -1,16 +1,30 @@
 module Admin
   class EnterpriseFeesController < ResourceController
-    before_filter :load_enterprise_fees_set, :only => :index
+    before_filter :load_enterprise_fee_set, :only => :index
     before_filter :load_data
 
+    def bulk_update
+      @enterprise_fee_set = EnterpriseFeeSet.new(params[:enterprise_fee_set])
+      if @enterprise_fee_set.save
+        redirect_to main_app.admin_enterprise_fees_path, :notice => 'Your enterprise fees have been updated.'
+      else
+        render :index
+      end
+    end
+
+
     private
-    def load_enterprise_fees_set
-      @enterprise_fees_set = ModelSet.new EnterpriseFee.all, :collection => collection
+    def load_enterprise_fee_set
+      @enterprise_fee_set = EnterpriseFeeSet.new :collection => collection
     end
 
     def load_data
       @calculators = EnterpriseFee.calculators.sort_by(&:name)
     end
 
+    def collection
+      super + (1..3).map { EnterpriseFee.new }
+    end
+
   end
 end
diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
index 25b2622e78..8107f1fdf7 100644
--- a/app/models/enterprise_fee.rb
+++ b/app/models/enterprise_fee.rb
@@ -4,6 +4,8 @@ class EnterpriseFee < ActiveRecord::Base
   calculated_adjustments
   has_one   :calculator, :as => :calculable, :dependent => :destroy, :class_name => 'Spree::Calculator'
 
+  attr_accessible :enterprise_id, :fee_type, :name, :calculator_type
+
   FEE_TYPES = %w(packing transport admin sales)
 
   validates_inclusion_of :fee_type, :in => FEE_TYPES
diff --git a/app/models/enterprise_fee_set.rb b/app/models/enterprise_fee_set.rb
new file mode 100644
index 0000000000..4ae02f51d8
--- /dev/null
+++ b/app/models/enterprise_fee_set.rb
@@ -0,0 +1,7 @@
+class EnterpriseFeeSet < ModelSet
+  def initialize(attributes={})
+    super(EnterpriseFee, EnterpriseFee.all,
+          proc { |attrs| attrs[:enterprise_id].blank? },
+          attributes)
+  end
+end
diff --git a/app/models/enterprise_set.rb b/app/models/enterprise_set.rb
index f267810c62..81591b6dad 100644
--- a/app/models/enterprise_set.rb
+++ b/app/models/enterprise_set.rb
@@ -1,5 +1,5 @@
 class EnterpriseSet < ModelSet
   def initialize(attributes={})
-    super(Enterprise.all, attributes)
+    super(Enterprise, Enterprise.all, nil, attributes)
   end
 end
diff --git a/app/models/model_set.rb b/app/models/model_set.rb
index 737fb9d625..778a148b82 100644
--- a/app/models/model_set.rb
+++ b/app/models/model_set.rb
@@ -5,8 +5,9 @@ class ModelSet
 
   attr_accessor :collection
 
-  def initialize(collection, attributes={})
-    @collection = collection
+
+  def initialize(klass, collection, reject_if, attributes={})
+    @klass, @collection, @reject_if = klass, collection, reject_if
 
     attributes.each do |name, value|
       send("#{name}=", value)
@@ -16,11 +17,19 @@ class ModelSet
   def collection_attributes=(attributes)
     attributes.each do |k, attributes|
       # attributes == {:id => 123, :next_collection_at => '...'}
-      e = @collection.detect { |e| e.id.to_s == attributes[:id].to_s }
-      e.assign_attributes(attributes.except(:id))
+      e = @collection.detect { |e| e.id.to_s == attributes[:id].to_s && !e.id.nil? }
+      if e.nil?
+        @collection << @klass.new(attributes) unless @reject_if.andand.call(attributes)
+      else
+        e.assign_attributes(attributes.except(:id))
+      end
     end
   end
 
+  def errors
+    @collection.map { |ef| ef.errors.full_messages }.flatten
+  end
+
   def save
     collection.all?(&:save)
   end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 23b2ddddb5..4f2fb2ae85 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -1,4 +1,9 @@
-= form_for @enterprise_fees_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fees_set_form|
+= form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fee_set_form|
+  - if @enterprise_fee_set.errors.present?
+    %h2 Errors
+    %ul
+      - @enterprise_fee_set.errors.each do |error|
+        %li= error
   %table.index#listing_enterprise_fees
     %thead
       %tr
@@ -9,10 +14,10 @@
         %th Calculator values
         %th
     %tbody
-      = enterprise_fees_set_form.fields_for :collection do |f|
+      = enterprise_fee_set_form.fields_for :collection do |f|
         - enterprise_fee = f.object
         %tr
-          %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name
+          %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
           %td= f.select :fee_type, enterprise_fee_options
           %td= f.text_field :name
           %td= f.collection_select :calculator_type, @calculators, :name, :description
@@ -21,3 +26,4 @@
               = f.fields_for :calculator do |calculator_form|
                 = preference_fields(enterprise_fee.calculator, calculator_form)
           %td TODO
+  = enterprise_fee_set_form.submit 'Update'
diff --git a/spec/requests/admin/enterprise_fees_spec.rb b/spec/requests/admin/enterprise_fees_spec.rb
index 08fc134ceb..d4d583860b 100644
--- a/spec/requests/admin/enterprise_fees_spec.rb
+++ b/spec/requests/admin/enterprise_fees_spec.rb
@@ -14,10 +14,39 @@ feature %q{
     click_link 'Configuration'
     click_link 'Enterprise Fees'
 
-    page.should have_selector 'option', :text => fee.enterprise.name
-    page.should have_selector 'option', :text => 'Packing'
+    page.should have_selector 'option', text: fee.enterprise.name
+    page.should have_selector 'option', text: 'Packing'
     page.should have_selector "input[value='$0.50 / kg']"
-    page.should have_selector 'option', :text => 'Weight (per kg)'
+    page.should have_selector 'option', text: 'Weight (per kg)'
     page.should have_selector "input[value='0.5']"
   end
+
+  scenario "creating an enterprise fee" do
+    # Given an enterprise
+    e = create(:supplier_enterprise, name: 'Feedme')
+
+    # When I go to the enterprise fees page
+    login_to_admin_section
+    click_link 'Configuration'
+    click_link 'Enterprise Fees'
+
+    # And I fill in the fields for a new enterprise fee and click update
+    select 'Feedme', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
+    select 'Admin', from: 'enterprise_fee_set_collection_attributes_0_fee_type'
+    fill_in 'enterprise_fee_set_collection_attributes_0_name', with: 'Hello!'
+    select 'Flat Percent', from: 'enterprise_fee_set_collection_attributes_0_calculator_type'
+    click_button 'Update'
+
+    # Then I should see my fee and fields for the calculator
+    page.should have_content "Your enterprise fees have been updated."
+    page.should have_selector "input[value='Hello!']"
+
+    # When I fill in the calculator fields and click update
+    fill_in 'enterprise_fee_set_collection_attributes_0_calculator_attributes_preferred_flat_percent', with: '12.34'
+    click_button 'Update'
+
+    # Then I should see the correct values in my calculator fields
+    page.should have_selector "#enterprise_fee_set_collection_attributes_0_calculator_attributes_preferred_flat_percent[value='12.34']"
+  end
+
 end

From bcc2ef99fd58998cacbdf51da67a19d3bd150529 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 11:49:59 +1100
Subject: [PATCH 08/29] Ensure that AUTH_TOKEN var is set in tests, since
 spree's admin JS errors without it

---
 app/overrides/set_auth_token_in_test.rb        | 9 +++++++++
 app/views/layouts/_auth_token_script.html.haml | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 app/overrides/set_auth_token_in_test.rb
 create mode 100644 app/views/layouts/_auth_token_script.html.haml

diff --git a/app/overrides/set_auth_token_in_test.rb b/app/overrides/set_auth_token_in_test.rb
new file mode 100644
index 0000000000..eb1b7128b3
--- /dev/null
+++ b/app/overrides/set_auth_token_in_test.rb
@@ -0,0 +1,9 @@
+Deface::Override.new(:virtual_path  => "spree/layouts/spree_application",
+                     :insert_bottom => "[data-hook='inside_head']",
+                     :partial       => "layouts/auth_token_script",
+                     :name          => "auth_token_script")
+
+Deface::Override.new(:virtual_path  => "spree/layouts/admin",
+                     :insert_bottom => "[data-hook='admin_inside_head']",
+                     :partial       => "layouts/auth_token_script",
+                     :name          => "auth_token_script")
diff --git a/app/views/layouts/_auth_token_script.html.haml b/app/views/layouts/_auth_token_script.html.haml
new file mode 100644
index 0000000000..bc0f6c8dc4
--- /dev/null
+++ b/app/views/layouts/_auth_token_script.html.haml
@@ -0,0 +1,4 @@
+:javascript
+  if(typeof AUTH_TOKEN === 'undefined') {
+    var AUTH_TOKEN = '';
+  }

From 77b78f5bbb0f91e9b551fa069c8207ed8f2206b6 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 11:50:37 +1100
Subject: [PATCH 09/29] Edit enterprise fee

---
 .../javascripts/admin/enterprise_fees.js      | 26 +++++++++++++++
 .../admin/enterprise_fees/index.html.haml     |  7 ++--
 spec/requests/admin/enterprise_fees_spec.rb   | 33 +++++++++++++++++--
 3 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/admin/enterprise_fees.js

diff --git a/app/assets/javascripts/admin/enterprise_fees.js b/app/assets/javascripts/admin/enterprise_fees.js
new file mode 100644
index 0000000000..e07b0d86ce
--- /dev/null
+++ b/app/assets/javascripts/admin/enterprise_fees.js
@@ -0,0 +1,26 @@
+// Hide calculator preference fields when calculator type changed
+// Fixes 'Enterprise fee is not found' error when changing calculator type
+// See spree/core/app/assets/javascripts/admin/calculator.js
+
+$(document).ready(function() {
+  // Store original value
+  $("select.calculator_type").each(function(i, ct) {
+    ct = $(ct);
+    ct.data('original-value', ct.attr('value'));
+  });
+
+  // Hide and disable calculator fields when calculator type is changed
+  $("select.calculator_type").change(function() {
+    var ct = $(this);
+    var cs = ct.parent().parent().find("div.calculator-settings");
+
+    if(ct.attr('value') == ct.data('original-value')) {
+      cs.show();
+      cs.find("input").prop("disabled", false);
+
+    } else {
+      cs.hide();
+      cs.find("input").prop("disabled", true);
+    }
+  });
+});
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 4f2fb2ae85..213923160f 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -20,10 +20,11 @@
           %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
           %td= f.select :fee_type, enterprise_fee_options
           %td= f.text_field :name
-          %td= f.collection_select :calculator_type, @calculators, :name, :description
+          %td= f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
           %td
             - if !enterprise_fee.new_record?
-              = f.fields_for :calculator do |calculator_form|
-                = preference_fields(enterprise_fee.calculator, calculator_form)
+              .calculator-settings
+                = f.fields_for :calculator do |calculator_form|
+                  = preference_fields(enterprise_fee.calculator, calculator_form)
           %td TODO
   = enterprise_fee_set_form.submit 'Update'
diff --git a/spec/requests/admin/enterprise_fees_spec.rb b/spec/requests/admin/enterprise_fees_spec.rb
index d4d583860b..da4fdb6547 100644
--- a/spec/requests/admin/enterprise_fees_spec.rb
+++ b/spec/requests/admin/enterprise_fees_spec.rb
@@ -14,10 +14,10 @@ feature %q{
     click_link 'Configuration'
     click_link 'Enterprise Fees'
 
-    page.should have_selector 'option', text: fee.enterprise.name
-    page.should have_selector 'option', text: 'Packing'
+    page.should have_selector "option[selected]", text: fee.enterprise.name
+    page.should have_selector "option[selected]", text: 'Packing'
     page.should have_selector "input[value='$0.50 / kg']"
-    page.should have_selector 'option', text: 'Weight (per kg)'
+    page.should have_selector "option[selected]", text: 'Weight (per kg)'
     page.should have_selector "input[value='0.5']"
   end
 
@@ -49,4 +49,31 @@ feature %q{
     page.should have_selector "#enterprise_fee_set_collection_attributes_0_calculator_attributes_preferred_flat_percent[value='12.34']"
   end
 
+  scenario "editing an enterprise fee", js: true do
+    # Given an enterprise fee
+    fee = create(:enterprise_fee)
+    create(:enterprise, name: 'Foo')
+
+    # When I go to the enterprise fees page
+    login_to_admin_section
+    click_link 'Configuration'
+    click_link 'Enterprise Fees'
+    binding.pry
+
+    # And I update the fields for the enterprise fee and click update
+    select 'Foo', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
+    select 'Admin', from: 'enterprise_fee_set_collection_attributes_0_fee_type'
+    fill_in 'enterprise_fee_set_collection_attributes_0_name', with: 'Greetings!'
+    select 'Flat Percent', from: 'enterprise_fee_set_collection_attributes_0_calculator_type'
+    binding.pry
+    click_button 'Update'
+
+    # Then I should see the updated fields for my fee
+    page.should have_selector "option[selected]", text: 'Foo'
+    page.should have_selector "option[selected]", text: 'Admin'
+    page.should have_selector "input[value='Greetings!']"
+    page.should have_selector "option[selected]", text: 'Flat Percent'
+  end
+
+
 end

From fa2addd0255c5ae0df6b0dbb4e443ca9a61f3327 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 12:17:19 +1100
Subject: [PATCH 10/29] Delete enterprise fee

---
 .../admin/enterprise_fees/index.html.haml     |  2 +-
 spec/requests/admin/enterprise_fees_spec.rb   | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 213923160f..79bd95d755 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -26,5 +26,5 @@
               .calculator-settings
                 = f.fields_for :calculator do |calculator_form|
                   = preference_fields(enterprise_fee.calculator, calculator_form)
-          %td TODO
+          %td= link_to_delete enterprise_fee unless enterprise_fee.new_record?
   = enterprise_fee_set_form.submit 'Update'
diff --git a/spec/requests/admin/enterprise_fees_spec.rb b/spec/requests/admin/enterprise_fees_spec.rb
index da4fdb6547..90f7f065d3 100644
--- a/spec/requests/admin/enterprise_fees_spec.rb
+++ b/spec/requests/admin/enterprise_fees_spec.rb
@@ -58,14 +58,12 @@ feature %q{
     login_to_admin_section
     click_link 'Configuration'
     click_link 'Enterprise Fees'
-    binding.pry
 
     # And I update the fields for the enterprise fee and click update
     select 'Foo', from: 'enterprise_fee_set_collection_attributes_0_enterprise_id'
     select 'Admin', from: 'enterprise_fee_set_collection_attributes_0_fee_type'
     fill_in 'enterprise_fee_set_collection_attributes_0_name', with: 'Greetings!'
     select 'Flat Percent', from: 'enterprise_fee_set_collection_attributes_0_calculator_type'
-    binding.pry
     click_button 'Update'
 
     # Then I should see the updated fields for my fee
@@ -75,5 +73,22 @@ feature %q{
     page.should have_selector "option[selected]", text: 'Flat Percent'
   end
 
+  scenario "deleting an enterprise fee", js: true do
+    # Given an enterprise fee
+    fee = create(:enterprise_fee)
+
+    # When I go to the enterprise fees page
+    login_to_admin_section
+    click_link 'Configuration'
+    click_link 'Enterprise Fees'
+
+    # And I click delete
+    click_link 'Delete'
+    page.driver.wait_until(page.driver.browser.switch_to.alert.accept)
+
+    # Then my enterprise fee should have been deleted
+    visit admin_enterprise_fees_path
+    page.should_not have_selector "input[value='#{fee.name}']"
+  end
 
 end

From 63ba5d13a303ba91a1e1ac41649fa4ad7125416b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 14:58:29 +1100
Subject: [PATCH 11/29] Add representative, output enterprise fees as JSON

---
 Gemfile                                             | 1 +
 Gemfile.lock                                        | 9 +++++++++
 app/controllers/admin/enterprise_fees_controller.rb | 7 +++++++
 app/views/admin/enterprise_fees/index.rep           | 6 ++++++
 4 files changed, 23 insertions(+)
 create mode 100644 app/views/admin/enterprise_fees/index.rep

diff --git a/Gemfile b/Gemfile
index 4041b11ff3..475085b938 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ gem 'haml'
 gem 'aws-sdk'
 gem 'andand'
 gem 'truncate_html'
+gem 'representative_view'
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e5e808e92..fdd805ffb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -282,6 +282,14 @@ GEM
       polyamorous (~> 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
+    representative (1.0.5)
+      activesupport (>= 2.2.2)
+      builder (>= 2.1.2)
+      i18n (>= 0.4.1)
+      nokogiri (>= 1.4.2)
+    representative_view (1.2.2)
+      actionpack (> 2.3.0, < 4.0.0)
+      representative (~> 1.0.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -359,6 +367,7 @@ DEPENDENCIES
   pg
   pry-debugger
   rails (= 3.2.8)
+  representative_view
   rspec-rails
   sass-rails (~> 3.2.3)
   shoulda-matchers
diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index 9b6966c40e..690fd69a05 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -3,6 +3,13 @@ module Admin
     before_filter :load_enterprise_fee_set, :only => :index
     before_filter :load_data
 
+    def index
+      respond_to do |format|
+        format.html
+        format.json
+      end
+    end
+
     def bulk_update
       @enterprise_fee_set = EnterpriseFeeSet.new(params[:enterprise_fee_set])
       if @enterprise_fee_set.save
diff --git a/app/views/admin/enterprise_fees/index.rep b/app/views/admin/enterprise_fees/index.rep
new file mode 100644
index 0000000000..d1b7bb46dc
--- /dev/null
+++ b/app/views/admin/enterprise_fees/index.rep
@@ -0,0 +1,6 @@
+r.list_of :enterprise_fees, @collection do
+  r.element :id
+  r.element :enterprise_id
+  r.element :fee_type
+  r.element :name
+end

From dd155532f8bc77bc9c0396dca729ad7bd96af31f Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 Nov 2012 14:59:02 +1100
Subject: [PATCH 12/29] Add angular include, basic controller for listing
 enterprise fees, display fee ids using angular

---
 app/assets/javascripts/admin/enterprise_fees.js | 16 ++++++++++++++++
 app/views/admin/enterprise_fees/index.html.haml |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/enterprise_fees.js b/app/assets/javascripts/admin/enterprise_fees.js
index e07b0d86ce..e2cbb28bbc 100644
--- a/app/assets/javascripts/admin/enterprise_fees.js
+++ b/app/assets/javascripts/admin/enterprise_fees.js
@@ -1,3 +1,18 @@
+function AdminEnterpriseFeesCtrl($scope, $http) {
+  $http.get('/admin/enterprise_fees.json').success(function(data) {
+    $scope.enterprise_fees = data;
+  });
+}
+
+
+
+
+
+
+
+
+
+/*
 // Hide calculator preference fields when calculator type changed
 // Fixes 'Enterprise fee is not found' error when changing calculator type
 // See spree/core/app/assets/javascripts/admin/calculator.js
@@ -24,3 +39,4 @@ $(document).ready(function() {
     }
   });
 });
+*/
\ No newline at end of file
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 79bd95d755..4e7bdd6187 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -1,10 +1,13 @@
+- content_for :head do
+  = javascript_include_tag "http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"
+
 = form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fee_set_form|
   - if @enterprise_fee_set.errors.present?
     %h2 Errors
     %ul
       - @enterprise_fee_set.errors.each do |error|
         %li= error
-  %table.index#listing_enterprise_fees
+  %table.index#listing_enterprise_fees{'ng-app' => '', 'ng-controller' => 'AdminEnterpriseFeesCtrl'}
     %thead
       %tr
         %th Enterprise
@@ -14,6 +17,8 @@
         %th Calculator values
         %th
     %tbody
+      %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
+        %td {{ enterprise_fee.id }}
       = enterprise_fee_set_form.fields_for :collection do |f|
         - enterprise_fee = f.object
         %tr

From 58917fe378a37446cfa559c8271e2108c774e51b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 08:58:08 +1100
Subject: [PATCH 13/29] Convert enterprise select and name entry into form
 fields

---
 app/views/admin/enterprise_fees/index.html.haml | 11 ++++++++++-
 app/views/admin/enterprise_fees/index.rep       |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 4e7bdd6187..484be94643 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -18,7 +18,16 @@
         %th
     %tbody
       %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
-        %td {{ enterprise_fee.id }}
+        %td
+          %select{:id => 'enterprise_fee_set_collection_attributes_{{ $index }}_enterprise_id', :name => "enterprise_fee_set[collection_attributes][{{ $index }}][enterprise_id]", 'ng-model' => 'enterprise_fee'}
+            %option{:value => ""}
+            - Enterprise.all.each do |enterprise|
+              %option{:value => enterprise.id, 'ng-selected' => "enterprise_fee.enterprise_id == #{enterprise.id}"}= enterprise.name
+        %td {{ enterprise_fee.fee_type }}
+        %td= text_field_tag 'enterprise_fee_set[collection_attributes][{{ $index }}][name]', '{{ enterprise_fee.name }}', :id => 'enterprise_fee_set_collection_attributes_{{ $index }}_name'
+        %td {{ enterprise_fee.calculator_type }}
+
+
       = enterprise_fee_set_form.fields_for :collection do |f|
         - enterprise_fee = f.object
         %tr
diff --git a/app/views/admin/enterprise_fees/index.rep b/app/views/admin/enterprise_fees/index.rep
index d1b7bb46dc..fe0db9eb97 100644
--- a/app/views/admin/enterprise_fees/index.rep
+++ b/app/views/admin/enterprise_fees/index.rep
@@ -3,4 +3,5 @@ r.list_of :enterprise_fees, @collection do
   r.element :enterprise_id
   r.element :fee_type
   r.element :name
+  r.element :calculator_type
 end

From d6802d9ae5664050f3bffb8d8dab233629dad758 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 09:53:26 +1100
Subject: [PATCH 14/29] Generate text field with custom form builder -
 AngularFormBuilder

---
 app/helpers/angular_form_builder.rb           | 20 +++++++++++++++++++
 app/helpers/application_helper.rb             |  7 +++++++
 .../admin/enterprise_fees/index.html.haml     | 10 +++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 app/helpers/angular_form_builder.rb

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
new file mode 100644
index 0000000000..8d33c938f8
--- /dev/null
+++ b/app/helpers/angular_form_builder.rb
@@ -0,0 +1,20 @@
+class AngularFormBuilder < ActionView::Helpers::FormBuilder
+  def angular_fields_for(record_name, *args, &block)
+    # TODO: Handle nested angular_fields_for
+    @fields_for_record_name = record_name
+    block.call self
+    @fields_for_record_name = nil
+  end
+
+  def angular_text_field(method, options = {})
+    # @object_name --> "enterprise_fee_set"
+    # @fields_for_record_name --> :collection
+    # @object.send(@fields_for_record_name).first.class.to_s.underscore --> enterprise_fee
+
+    name = "#{@object_name}[#{@fields_for_record_name}_attributes][{{ $index }}][#{method}]"
+    id = "#{@object_name}_#{@fields_for_record_name}_attributes_{{ $index }}_#{method}"
+
+    @template.text_field_tag name, :id => id
+  end
+
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4f41a1a0ed..5035bf8809 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -6,6 +6,13 @@ module ApplicationHelper
   end
 
 
+  def angular_form_for(name, *args, &block)
+    options = args.extract_options!
+
+    form_for(name, *(args << options.merge(:builder => AngularFormBuilder)), &block)
+  end
+
+
   # Pass URL helper calls on to spree where applicable so that we don't need to use
   # spree.foo_path in any view rendered from non-spree-namespaced controllers.
   def method_missing(method, *args, &block)
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 484be94643..b278bf6399 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -1,7 +1,7 @@
 - content_for :head do
   = javascript_include_tag "http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"
 
-= form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fee_set_form|
+= angular_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fee_set_form|
   - if @enterprise_fee_set.errors.present?
     %h2 Errors
     %ul
@@ -17,6 +17,14 @@
         %th Calculator values
         %th
     %tbody
+      = enterprise_fee_set_form.angular_fields_for :collection do |f|
+        %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
+          %td=# f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
+          %td=# f.select :fee_type, enterprise_fee_options
+          %td= f.angular_text_field :name
+          %td=# f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
+
+
       %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
         %td
           %select{:id => 'enterprise_fee_set_collection_attributes_{{ $index }}_enterprise_id', :name => "enterprise_fee_set[collection_attributes][{{ $index }}][enterprise_id]", 'ng-model' => 'enterprise_fee'}

From 216125c7a16c4f258f576d0a6e7c309dbaa771df Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 11:03:28 +1100
Subject: [PATCH 15/29] Start building some selects

---
 app/helpers/angular_form_builder.rb           | 26 ++++++++++++++++++-
 .../admin/enterprise_fees/index.html.haml     | 12 +++++----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 8d33c938f8..007462dccc 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -1,4 +1,6 @@
 class AngularFormBuilder < ActionView::Helpers::FormBuilder
+  # TODO: Use ng_ prefix, like ng_fields_for
+
   def angular_fields_for(record_name, *args, &block)
     # TODO: Handle nested angular_fields_for
     @fields_for_record_name = record_name
@@ -13,8 +15,30 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
 
     name = "#{@object_name}[#{@fields_for_record_name}_attributes][{{ $index }}][#{method}]"
     id = "#{@object_name}_#{@fields_for_record_name}_attributes_{{ $index }}_#{method}"
+    value = "{{ #{@object.send(@fields_for_record_name).first.class.to_s.underscore}.#{method} }}"
 
-    @template.text_field_tag name, :id => id
+    @template.text_field_tag name, value, :id => id
   end
 
+  def angular_select(method, choices, options = {}, html_options = {})
+    # ...
+  end
+
+  def angular_options_for_select(container, selected = nil)
+    return container if String === container
+
+    selected, disabled = extract_selected_and_disabled(selected).map do | r |
+      Array.wrap(r).map { |item| item.to_s }
+    end
+
+    container.map do |element|
+      html_attributes = option_html_attributes(element)
+      text, value = option_text_and_value(element).map { |item| item.to_s }
+      selected_attribute = %Q( ng-selected="#{selected}") if selected
+      disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled)
+      %(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{disabled_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
+    end.join("\n").html_safe
+
+
+  end
 end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index b278bf6399..fa6a3d4af4 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -17,25 +17,27 @@
         %th Calculator values
         %th
     %tbody
-      = enterprise_fee_set_form.angular_fields_for :collection do |f|
+      -# -- Finished product
+      = enterprise_fee_set_form.angular_fields_for :collection do |f|  # regular fields_for collection.first ??
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
           %td=# f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
-          %td=# f.select :fee_type, enterprise_fee_options
+          %td=# f.angular_select :fee_type, enterprise_fee_options
           %td= f.angular_text_field :name
           %td=# f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
 
-
+      -# -- Manual HTML / form_tag
       %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
         %td
           %select{:id => 'enterprise_fee_set_collection_attributes_{{ $index }}_enterprise_id', :name => "enterprise_fee_set[collection_attributes][{{ $index }}][enterprise_id]", 'ng-model' => 'enterprise_fee'}
             %option{:value => ""}
             - Enterprise.all.each do |enterprise|
               %option{:value => enterprise.id, 'ng-selected' => "enterprise_fee.enterprise_id == #{enterprise.id}"}= enterprise.name
-        %td {{ enterprise_fee.fee_type }}
+        %td
+          {{ enterprise_fee.fee_type }}
         %td= text_field_tag 'enterprise_fee_set[collection_attributes][{{ $index }}][name]', '{{ enterprise_fee.name }}', :id => 'enterprise_fee_set_collection_attributes_{{ $index }}_name'
         %td {{ enterprise_fee.calculator_type }}
 
-
+      -# -- Plain old Rails
       = enterprise_fee_set_form.fields_for :collection do |f|
         - enterprise_fee = f.object
         %tr

From ad76e669446f0e601bdb498d83236ca03385bef4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 11:24:05 +1100
Subject: [PATCH 16/29] angular_options_for_select

---
 app/helpers/angular_form_builder.rb            | 18 ------------------
 app/helpers/angular_form_helper.rb             | 16 ++++++++++++++++
 app/helpers/enterprise_fees_helper.rb          |  2 +-
 .../admin/enterprise_fees/index.html.haml      | 13 ++++++-------
 4 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 app/helpers/angular_form_helper.rb

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 007462dccc..63785b0d31 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -23,22 +23,4 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
   def angular_select(method, choices, options = {}, html_options = {})
     # ...
   end
-
-  def angular_options_for_select(container, selected = nil)
-    return container if String === container
-
-    selected, disabled = extract_selected_and_disabled(selected).map do | r |
-      Array.wrap(r).map { |item| item.to_s }
-    end
-
-    container.map do |element|
-      html_attributes = option_html_attributes(element)
-      text, value = option_text_and_value(element).map { |item| item.to_s }
-      selected_attribute = %Q( ng-selected="#{selected}") if selected
-      disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled)
-      %(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{disabled_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
-    end.join("\n").html_safe
-
-
-  end
 end
diff --git a/app/helpers/angular_form_helper.rb b/app/helpers/angular_form_helper.rb
new file mode 100644
index 0000000000..02c086f8eb
--- /dev/null
+++ b/app/helpers/angular_form_helper.rb
@@ -0,0 +1,16 @@
+module AngularFormHelper
+  def angular_options_for_select(container, angular_field=nil)
+    return container if String === container
+
+    container.map do |element|
+      html_attributes = option_html_attributes(element)
+      text, value = option_text_and_value(element).map { |item| item.to_s }
+      selected_attribute = %Q( ng-selected="#{angular_field} == '#{value}'") if angular_field
+      %(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
+    end.join("\n").html_safe
+  end
+end
+
+class ActionView::Helpers::InstanceTag
+  include AngularFormHelper
+end
diff --git a/app/helpers/enterprise_fees_helper.rb b/app/helpers/enterprise_fees_helper.rb
index 2399a1737e..b7ec2b9018 100644
--- a/app/helpers/enterprise_fees_helper.rb
+++ b/app/helpers/enterprise_fees_helper.rb
@@ -1,5 +1,5 @@
 module EnterpriseFeesHelper
-  def enterprise_fee_options
+  def enterprise_fee_type_options
     EnterpriseFee::FEE_TYPES.map { |f| [f.capitalize, f] }
   end
 end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index fa6a3d4af4..69175778f6 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -17,32 +17,31 @@
         %th Calculator values
         %th
     %tbody
-      -# -- Finished product
-      = enterprise_fee_set_form.angular_fields_for :collection do |f|  # regular fields_for collection.first ??
+      / -- Finished product
+      = enterprise_fee_set_form.angular_fields_for :collection do |f|
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
           %td=# f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
           %td=# f.angular_select :fee_type, enterprise_fee_options
           %td= f.angular_text_field :name
           %td=# f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
 
-      -# -- Manual HTML / form_tag
+      / -- Manual HTML / form_tag
       %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
         %td
           %select{:id => 'enterprise_fee_set_collection_attributes_{{ $index }}_enterprise_id', :name => "enterprise_fee_set[collection_attributes][{{ $index }}][enterprise_id]", 'ng-model' => 'enterprise_fee'}
             %option{:value => ""}
             - Enterprise.all.each do |enterprise|
               %option{:value => enterprise.id, 'ng-selected' => "enterprise_fee.enterprise_id == #{enterprise.id}"}= enterprise.name
-        %td
-          {{ enterprise_fee.fee_type }}
+        %td= select_tag :fee_type, angular_options_for_select(enterprise_fee_type_options, 'enterprise_fee.fee_type')
         %td= text_field_tag 'enterprise_fee_set[collection_attributes][{{ $index }}][name]', '{{ enterprise_fee.name }}', :id => 'enterprise_fee_set_collection_attributes_{{ $index }}_name'
         %td {{ enterprise_fee.calculator_type }}
 
-      -# -- Plain old Rails
+      / -- Plain old Rails
       = enterprise_fee_set_form.fields_for :collection do |f|
         - enterprise_fee = f.object
         %tr
           %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
-          %td= f.select :fee_type, enterprise_fee_options
+          %td= f.select :fee_type, enterprise_fee_type_options
           %td= f.text_field :name
           %td= f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
           %td

From e64a86f5be9692369066d9f3d9524b25804f4fde Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 11:27:51 +1100
Subject: [PATCH 17/29] angular_select

---
 app/helpers/angular_form_builder.rb             | 4 ++--
 app/views/admin/enterprise_fees/index.html.haml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 63785b0d31..1ace68b0f1 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -20,7 +20,7 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
     @template.text_field_tag name, value, :id => id
   end
 
-  def angular_select(method, choices, options = {}, html_options = {})
-    # ...
+  def angular_select(method, choices, angular_field, options = {}, html_options = {})
+    @template.select_tag method, @template.angular_options_for_select(choices, angular_field)
   end
 end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 69175778f6..9817c039c5 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -21,7 +21,7 @@
       = enterprise_fee_set_form.angular_fields_for :collection do |f|
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
           %td=# f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
-          %td=# f.angular_select :fee_type, enterprise_fee_options
+          %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
           %td=# f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
 

From 873937db47397f64d4e730a64b4e167c3e18b4fc Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 11:44:32 +1100
Subject: [PATCH 18/29] angular_collection_select

---
 app/helpers/angular_form_builder.rb             | 9 +++++++--
 app/helpers/angular_form_helper.rb              | 9 +++++++++
 app/views/admin/enterprise_fees/index.html.haml | 4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 1ace68b0f1..ef783f9b17 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -20,7 +20,12 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
     @template.text_field_tag name, value, :id => id
   end
 
-  def angular_select(method, choices, angular_field, options = {}, html_options = {})
-    @template.select_tag method, @template.angular_options_for_select(choices, angular_field)
+  def angular_select(method, choices, angular_field, options = {})
+    @template.select_tag method, @template.angular_options_for_select(choices, angular_field), options
   end
+
+  def angular_collection_select(method, collection, value_method, text_method, angular_field, options = {})
+    @template.select_tag method, @template.angular_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
+  end
+
 end
diff --git a/app/helpers/angular_form_helper.rb b/app/helpers/angular_form_helper.rb
index 02c086f8eb..9116d403fa 100644
--- a/app/helpers/angular_form_helper.rb
+++ b/app/helpers/angular_form_helper.rb
@@ -9,8 +9,17 @@ module AngularFormHelper
       %(<option value="#{ERB::Util.html_escape(value)}"#{selected_attribute}#{html_attributes}>#{ERB::Util.html_escape(text)}</option>)
     end.join("\n").html_safe
   end
+
+  def angular_options_from_collection_for_select(collection, value_method, text_method, angular_field)
+    options = collection.map do |element|
+      [element.send(text_method), element.send(value_method)]
+    end
+
+    angular_options_for_select(options, angular_field)
+  end
 end
 
+
 class ActionView::Helpers::InstanceTag
   include AngularFormHelper
 end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 9817c039c5..b5cfe12668 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -20,10 +20,10 @@
       / -- Finished product
       = enterprise_fee_set_form.angular_fields_for :collection do |f|
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
-          %td=# f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
+          %td= f.angular_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
           %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
-          %td=# f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
+          %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
 
       / -- Manual HTML / form_tag
       %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}

From b7bd21e49883074793c241c56498b0489abd33c1 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 12:15:39 +1100
Subject: [PATCH 19/29] Full-text search of form

---
 app/assets/stylesheets/admin/openfoodweb.css.scss |  6 ++++++
 app/helpers/angular_form_builder.rb               |  4 ++--
 app/models/enterprise_fee.rb                      | 10 ++++++++++
 app/views/admin/enterprise_fees/index.html.haml   | 14 +++++++++++---
 app/views/admin/enterprise_fees/index.rep         |  2 ++
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/admin/openfoodweb.css.scss b/app/assets/stylesheets/admin/openfoodweb.css.scss
index 0f535b3f58..633b768371 100644
--- a/app/assets/stylesheets/admin/openfoodweb.css.scss
+++ b/app/assets/stylesheets/admin/openfoodweb.css.scss
@@ -12,3 +12,9 @@
   float: none;
   margin-bottom: 0;
 }
+
+
+#new_enterprise_fee_set input.search {
+  float: right;
+  margin-bottom: 1em;
+}
diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index ef783f9b17..3d51291cbc 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -21,11 +21,11 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
   end
 
   def angular_select(method, choices, angular_field, options = {})
-    @template.select_tag method, @template.angular_options_for_select(choices, angular_field), options
+    @template.select_tag method, @template.angular_options_for_select(choices, angular_field), options.reverse_merge!({'ng-model' => angular_field})
   end
 
   def angular_collection_select(method, collection, value_method, text_method, angular_field, options = {})
-    @template.select_tag method, @template.angular_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
+    @template.select_tag method, @template.angular_options_from_collection_for_select(collection, value_method, text_method, angular_field), options.reverse_merge!({'ng-model' => angular_field})
   end
 
 end
diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
index 8107f1fdf7..6ed6683575 100644
--- a/app/models/enterprise_fee.rb
+++ b/app/models/enterprise_fee.rb
@@ -10,4 +10,14 @@ class EnterpriseFee < ActiveRecord::Base
 
   validates_inclusion_of :fee_type, :in => FEE_TYPES
   validates_presence_of :name
+
+
+  def enterprise_name
+    enterprise.andand.name
+  end
+
+  def calculator_description
+    calculator.andand.description
+  end
+
 end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index b5cfe12668..42a3a27ec8 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -1,13 +1,16 @@
 - content_for :head do
   = javascript_include_tag "http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"
 
-= angular_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path do |enterprise_fee_set_form|
+= angular_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path, :html => {'ng-app' => '', 'ng-controller' => 'AdminEnterpriseFeesCtrl'} do |enterprise_fee_set_form|
   - if @enterprise_fee_set.errors.present?
     %h2 Errors
     %ul
       - @enterprise_fee_set.errors.each do |error|
         %li= error
-  %table.index#listing_enterprise_fees{'ng-app' => '', 'ng-controller' => 'AdminEnterpriseFeesCtrl'}
+
+  %input.search{'ng-model' => 'query', 'placeholder' => 'Search'}
+
+  %table.index#listing_enterprise_fees
     %thead
       %tr
         %th Enterprise
@@ -19,11 +22,16 @@
     %tbody
       / -- Finished product
       = enterprise_fee_set_form.angular_fields_for :collection do |f|
-        %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
+        %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees | filter:query'}
           %td= f.angular_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
           %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
           %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
+          %td {{ enterprise_fee.calculator_settings }}
+          %td Delete
+
+      %tr
+        %td ---
 
       / -- Manual HTML / form_tag
       %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
diff --git a/app/views/admin/enterprise_fees/index.rep b/app/views/admin/enterprise_fees/index.rep
index fe0db9eb97..f2ba072dee 100644
--- a/app/views/admin/enterprise_fees/index.rep
+++ b/app/views/admin/enterprise_fees/index.rep
@@ -1,7 +1,9 @@
 r.list_of :enterprise_fees, @collection do
   r.element :id
   r.element :enterprise_id
+  r.element :enterprise_name
   r.element :fee_type
   r.element :name
   r.element :calculator_type
+  r.element :calculator_description
 end

From 2a645d04ae5f51a57940b0605733ec1c144f6e9d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 14:37:38 +1100
Subject: [PATCH 20/29] Move presentation to presenter, display calculator
 fields

---
 .../admin/enterprise_fees_controller.rb       |  2 +-
 app/controllers/application_controller.rb     | 12 +++++++
 app/models/enterprise_fee.rb                  | 10 ------
 app/presenters/enterprise_fee_presenter.rb    | 32 +++++++++++++++++++
 .../_calculator_settings.html.haml            |  9 ++++++
 .../admin/enterprise_fees/index.html.haml     |  2 +-
 app/views/admin/enterprise_fees/index.rep     |  3 +-
 config/application.rb                         |  2 +-
 8 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 app/presenters/enterprise_fee_presenter.rb
 create mode 100644 app/views/admin/enterprise_fees/_calculator_settings.html.haml

diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index 690fd69a05..2958ab6c73 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -6,7 +6,7 @@ module Admin
     def index
       respond_to do |format|
         format.html
-        format.json
+        format.json { @presented_collection = @collection.map { |ef| EnterpriseFeePresenter.new(self, ef) } }
       end
     end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b5bcef894e..b3ef2dff28 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -14,4 +14,16 @@ class ApplicationController < ActionController::Base
     @distributors = Enterprise.is_distributor.with_distributed_active_products_on_hand.by_name
   end
 
+  # All render calls within the block will be performed with the specified format
+  # Useful for rendering html within a JSON response, particularly if the specified
+  # template or partial then goes on to render further partials without specifying
+  # their format.
+  def with_format(format, &block)
+    old_formats = formats
+    self.formats = [format]
+    block.call
+    self.formats = old_formats
+    nil
+  end
+
 end
diff --git a/app/models/enterprise_fee.rb b/app/models/enterprise_fee.rb
index 6ed6683575..8107f1fdf7 100644
--- a/app/models/enterprise_fee.rb
+++ b/app/models/enterprise_fee.rb
@@ -10,14 +10,4 @@ class EnterpriseFee < ActiveRecord::Base
 
   validates_inclusion_of :fee_type, :in => FEE_TYPES
   validates_presence_of :name
-
-
-  def enterprise_name
-    enterprise.andand.name
-  end
-
-  def calculator_description
-    calculator.andand.description
-  end
-
 end
diff --git a/app/presenters/enterprise_fee_presenter.rb b/app/presenters/enterprise_fee_presenter.rb
new file mode 100644
index 0000000000..bbecfc0f4f
--- /dev/null
+++ b/app/presenters/enterprise_fee_presenter.rb
@@ -0,0 +1,32 @@
+class EnterpriseFeePresenter
+  def initialize(controller, enterprise_fee)
+    @controller = controller
+    @enterprise_fee = enterprise_fee
+  end
+
+  delegate :id, :enterprise_id, :fee_type, :name, :calculator_type, :to => :enterprise_fee
+
+  def enterprise_fee
+    @enterprise_fee
+  end
+
+
+  def enterprise_name
+    @enterprise_fee.enterprise.andand.name
+  end
+
+  def calculator_description
+    @enterprise_fee.calculator.andand.description
+  end
+
+  def calculator_settings
+    result = nil
+
+    @controller.send(:with_format, :html) do
+      result = @controller.render_to_string :partial => 'admin/enterprise_fees/calculator_settings', :locals => {:enterprise_fee => @enterprise_fee}
+    end
+
+    result
+  end
+
+end
diff --git a/app/views/admin/enterprise_fees/_calculator_settings.html.haml b/app/views/admin/enterprise_fees/_calculator_settings.html.haml
new file mode 100644
index 0000000000..8a81602b71
--- /dev/null
+++ b/app/views/admin/enterprise_fees/_calculator_settings.html.haml
@@ -0,0 +1,9 @@
+-# Render only the calculator settings and not the surrounding form
+- form = nil
+- form_for enterprise_fee, :url => '' do |f|
+  - form = capture do
+    - if !enterprise_fee.new_record?
+      .calculator-settings
+        = f.fields_for :calculator do |calculator_form|
+          = preference_fields(enterprise_fee.calculator, calculator_form)
+= form
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 42a3a27ec8..c5af08e0a3 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -27,7 +27,7 @@
           %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
           %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
-          %td {{ enterprise_fee.calculator_settings }}
+          %td{'ng-bind-html-unsafe' => 'enterprise_fee.calculator_settings'}
           %td Delete
 
       %tr
diff --git a/app/views/admin/enterprise_fees/index.rep b/app/views/admin/enterprise_fees/index.rep
index f2ba072dee..c6bccc5a4e 100644
--- a/app/views/admin/enterprise_fees/index.rep
+++ b/app/views/admin/enterprise_fees/index.rep
@@ -1,4 +1,4 @@
-r.list_of :enterprise_fees, @collection do
+r.list_of :enterprise_fees, @presented_collection do
   r.element :id
   r.element :enterprise_id
   r.element :enterprise_name
@@ -6,4 +6,5 @@ r.list_of :enterprise_fees, @collection do
   r.element :name
   r.element :calculator_type
   r.element :calculator_description
+  r.element :calculator_settings
 end
diff --git a/config/application.rb b/config/application.rb
index 24d5009745..fa5411b9a6 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,7 +43,7 @@ module Openfoodweb
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
+    config.autoload_paths += %W(#{config.root}/app/presenters)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

From fd0cc93e68fd60412f05c13fdfbb948036a0516e Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 16:19:10 +1100
Subject: [PATCH 21/29] Add delete link

---
 app/assets/javascripts/admin/all.js           |   1 +
 .../javascripts/admin/enterprise_fees.js      |  13 +-
 app/assets/javascripts/angular.js             | 158 ++++++++++++++++++
 .../admin/enterprise_fees/index.html.haml     |  18 +-
 4 files changed, 171 insertions(+), 19 deletions(-)
 create mode 100644 app/assets/javascripts/angular.js

diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 226359330f..e51c920bb8 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -7,6 +7,7 @@
 
 //= require jquery
 //= require jquery_ujs
+//= require angular
 //= require admin/spree_core
 //= require admin/spree_auth
 //= require admin/spree_promo
diff --git a/app/assets/javascripts/admin/enterprise_fees.js b/app/assets/javascripts/admin/enterprise_fees.js
index e2cbb28bbc..5e586ccdc3 100644
--- a/app/assets/javascripts/admin/enterprise_fees.js
+++ b/app/assets/javascripts/admin/enterprise_fees.js
@@ -5,9 +5,16 @@ function AdminEnterpriseFeesCtrl($scope, $http) {
 }
 
 
-
-
-
+angular.module('enterprise_fees', [])
+  .directive('spreeDeleteResource', function() {
+    return function(scope, element, attrs) {
+      if(scope.enterprise_fee.id) {
+	var url = "/admin/enterprise_fees/" + scope.enterprise_fee.id
+	var html = '<a href="'+url+'" class="delete-resource" data-confirm="Are you sure?"><img alt="Delete" src="/assets/admin/icons/delete.png" /> Delete</a>';
+	element.append(html);
+      }
+    }
+  });
 
 
 
diff --git a/app/assets/javascripts/angular.js b/app/assets/javascripts/angular.js
new file mode 100644
index 0000000000..accc48e2f2
--- /dev/null
+++ b/app/assets/javascripts/angular.js
@@ -0,0 +1,158 @@
+/*
+ AngularJS v1.0.2
+ (c) 2010-2012 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(T,ba,p){'use strict';function m(b,a,c){var d;if(b)if(M(b))for(d in b)d!="prototype"&&d!="length"&&d!="name"&&b.hasOwnProperty(d)&&a.call(c,b[d],d);else if(b.forEach&&b.forEach!==m)b.forEach(a,c);else if(I(b)&&wa(b.length))for(d=0;d<b.length;d++)a.call(c,b[d],d);else for(d in b)b.hasOwnProperty(d)&&a.call(c,b[d],d);return b}function mb(b){var a=[],c;for(c in b)b.hasOwnProperty(c)&&a.push(c);return a.sort()}function fc(b,a,c){for(var d=mb(b),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}
+function nb(b){return function(a,c){b(c,a)}}function xa(){for(var b=Z.length,a;b;){b--;a=Z[b].charCodeAt(0);if(a==57)return Z[b]="A",Z.join("");if(a==90)Z[b]="0";else return Z[b]=String.fromCharCode(a+1),Z.join("")}Z.unshift("0");return Z.join("")}function x(b){m(arguments,function(a){a!==b&&m(a,function(a,d){b[d]=a})});return b}function G(b){return parseInt(b,10)}function ya(b,a){return x(new (x(function(){},{prototype:b})),a)}function D(){}function ma(b){return b}function J(b){return function(){return b}}
+function t(b){return typeof b=="undefined"}function u(b){return typeof b!="undefined"}function I(b){return b!=null&&typeof b=="object"}function F(b){return typeof b=="string"}function wa(b){return typeof b=="number"}function na(b){return Ta.apply(b)=="[object Date]"}function K(b){return Ta.apply(b)=="[object Array]"}function M(b){return typeof b=="function"}function oa(b){return b&&b.document&&b.location&&b.alert&&b.setInterval}function Q(b){return F(b)?b.replace(/^\s*/,"").replace(/\s*$/,""):b}function gc(b){return b&&
+(b.nodeName||b.bind&&b.find)}function Ua(b,a,c){var d=[];m(b,function(b,g,i){d.push(a.call(c,b,g,i))});return d}function hc(b,a){var c=0,d;if(K(b)||F(b))return b.length;else if(I(b))for(d in b)(!a||b.hasOwnProperty(d))&&c++;return c}function Va(b,a){if(b.indexOf)return b.indexOf(a);for(var c=0;c<b.length;c++)if(a===b[c])return c;return-1}function za(b,a){var c=Va(b,a);c>=0&&b.splice(c,1);return a}function U(b,a){if(oa(b)||b&&b.$evalAsync&&b.$watch)throw A("Can't copy Window or Scope");if(a){if(b===
+a)throw A("Can't copy equivalent objects or arrays");if(K(b)){for(;a.length;)a.pop();for(var c=0;c<b.length;c++)a.push(U(b[c]))}else for(c in m(a,function(b,c){delete a[c]}),b)a[c]=U(b[c])}else(a=b)&&(K(b)?a=U(b,[]):na(b)?a=new Date(b.getTime()):I(b)&&(a=U(b,{})));return a}function ic(b,a){var a=a||{},c;for(c in b)b.hasOwnProperty(c)&&c.substr(0,2)!=="$$"&&(a[c]=b[c]);return a}function ga(b,a){if(b===a)return!0;if(b===null||a===null)return!1;if(b!==b&&a!==a)return!0;var c=typeof b,d;if(c==typeof a&&
+c=="object")if(K(b)){if((c=b.length)==a.length){for(d=0;d<c;d++)if(!ga(b[d],a[d]))return!1;return!0}}else if(na(b))return na(a)&&b.getTime()==a.getTime();else{if(b&&b.$evalAsync&&b.$watch||a&&a.$evalAsync&&a.$watch||oa(b)||oa(a))return!1;c={};for(d in b){if(d.charAt(0)!=="$"&&!M(b[d])&&!ga(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!c[d]&&d.charAt(0)!=="$"&&!M(a[d]))return!1;return!0}return!1}function Wa(b,a){var c=arguments.length>2?ha.call(arguments,2):[];return M(a)&&!(a instanceof RegExp)?c.length?
+function(){return arguments.length?a.apply(b,c.concat(ha.call(arguments,0))):a.apply(b,c)}:function(){return arguments.length?a.apply(b,arguments):a.call(b)}:a}function jc(b,a){var c=a;/^\$+/.test(b)?c=p:oa(a)?c="$WINDOW":a&&ba===a?c="$DOCUMENT":a&&a.$evalAsync&&a.$watch&&(c="$SCOPE");return c}function ca(b,a){return JSON.stringify(b,jc,a?"  ":null)}function ob(b){return F(b)?JSON.parse(b):b}function Xa(b){b&&b.length!==0?(b=E(""+b),b=!(b=="f"||b=="0"||b=="false"||b=="no"||b=="n"||b=="[]")):b=!1;
+return b}function pa(b){b=y(b).clone();try{b.html("")}catch(a){}return y("<div>").append(b).html().match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+E(b)})}function Ya(b){var a={},c,d;m((b||"").split("&"),function(b){b&&(c=b.split("="),d=decodeURIComponent(c[0]),a[d]=u(c[1])?decodeURIComponent(c[1]):!0)});return a}function pb(b){var a=[];m(b,function(b,d){a.push(Za(d,!0)+(b===!0?"":"="+Za(b,!0)))});return a.length?a.join("&"):""}function $a(b){return Za(b,!0).replace(/%26/gi,"&").replace(/%3D/gi,
+"=").replace(/%2B/gi,"+")}function Za(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(a?null:/%20/g,"+")}function kc(b,a){function c(a){a&&d.push(a)}var d=[b],e,g,i=["ng:app","ng-app","x-ng-app","data-ng-app"],f=/\sng[:\-]app(:\s*([\w\d_]+);?)?\s/;m(i,function(a){i[a]=!0;c(ba.getElementById(a));a=a.replace(":","\\:");b.querySelectorAll&&(m(b.querySelectorAll("."+a),c),m(b.querySelectorAll("."+a+"\\:"),c),m(b.querySelectorAll("["+
+a+"]"),c))});m(d,function(a){if(!e){var b=f.exec(" "+a.className+" ");b?(e=a,g=(b[2]||"").replace(/\s+/g,",")):m(a.attributes,function(b){if(!e&&i[b.name])e=a,g=b.value})}});e&&a(e,g?[g]:[])}function qb(b,a){b=y(b);a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);a.unshift("ng");var c=rb(a);c.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,i){a.$apply(function(){b.data("$injector",i);c(b)(a)})}]);return c}function ab(b,a){a=a||"_";return b.replace(lc,
+function(b,d){return(d?a:"")+b.toLowerCase()})}function qa(b,a,c){if(!b)throw new A("Argument '"+(a||"?")+"' is "+(c||"required"));return b}function ra(b,a,c){c&&K(b)&&(b=b[b.length-1]);qa(M(b),a,"not a function, got "+(b&&typeof b=="object"?b.constructor.name||"Object":typeof b));return b}function mc(b){function a(a,b,e){return a[b]||(a[b]=e())}return a(a(b,"angular",Object),"module",function(){var b={};return function(d,e,g){e&&b.hasOwnProperty(d)&&(b[d]=null);return a(b,d,function(){function a(c,
+d,e){return function(){b[e||"push"]([c,d,arguments]);return j}}if(!e)throw A("No module: "+d);var b=[],c=[],k=a("$injector","invoke"),j={_invokeQueue:b,_runBlocks:c,requires:e,name:d,provider:a("$provide","provider"),factory:a("$provide","factory"),service:a("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),filter:a("$filterProvider","register"),controller:a("$controllerProvider","register"),directive:a("$compileProvider","directive"),config:k,run:function(a){c.push(a);
+return this}};g&&k(g);return j})}})}function sb(b){return b.replace(nc,function(a,b,d,e){return e?d.toUpperCase():d}).replace(oc,"Moz$1")}function bb(b,a){function c(){var e;for(var b=[this],c=a,i,f,h,k,j,l,n;b.length;){i=b.shift();f=0;for(h=i.length;f<h;f++){k=y(i[f]);c?(n=(j=k.data("events"))&&j.$destroy)&&m(n,function(a){a.handler()}):c=!c;j=0;for(e=(l=k.children()).length,k=e;j<k;j++)b.push(ia(l[j]))}}return d.apply(this,arguments)}var d=ia.fn[b],d=d.$original||d;c.$original=d;ia.fn[b]=c}function P(b){if(b instanceof
+P)return b;if(!(this instanceof P)){if(F(b)&&b.charAt(0)!="<")throw A("selectors not implemented");return new P(b)}if(F(b)){var a=ba.createElement("div");a.innerHTML="<div>&#160;</div>"+b;a.removeChild(a.firstChild);cb(this,a.childNodes);this.remove()}else cb(this,b)}function db(b){return b.cloneNode(!0)}function sa(b){tb(b);for(var a=0,b=b.childNodes||[];a<b.length;a++)sa(b[a])}function ub(b,a,c){var d=da(b,"events");da(b,"handle")&&(t(a)?m(d,function(a,c){eb(b,c,a);delete d[c]}):t(c)?(eb(b,a,d[a]),
+delete d[a]):za(d[a],c))}function tb(b){var a=b[Aa],c=Ba[a];c&&(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),ub(b)),delete Ba[a],b[Aa]=p)}function da(b,a,c){var d=b[Aa],d=Ba[d||-1];if(u(c))d||(b[Aa]=d=++pc,d=Ba[d]={}),d[a]=c;else return d&&d[a]}function vb(b,a,c){var d=da(b,"data"),e=u(c),g=!e&&u(a),i=g&&!I(a);!d&&!i&&da(b,"data",d={});if(e)d[a]=c;else if(g)if(i)return d&&d[a];else x(d,a);else return d}function Ca(b,a){return(" "+b.className+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" ")>
+-1}function wb(b,a){a&&m(a.split(" "),function(a){b.className=Q((" "+b.className+" ").replace(/[\n\t]/g," ").replace(" "+Q(a)+" "," "))})}function xb(b,a){a&&m(a.split(" "),function(a){if(!Ca(b,a))b.className=Q(b.className+" "+Q(a))})}function cb(b,a){if(a)for(var a=!a.nodeName&&u(a.length)&&!oa(a)?a:[a],c=0;c<a.length;c++)b.push(a[c])}function yb(b,a){return Da(b,"$"+(a||"ngController")+"Controller")}function Da(b,a,c){b=y(b);for(b[0].nodeType==9&&(b=b.find("html"));b.length;){if(c=b.data(a))return c;
+b=b.parent()}}function zb(b,a){var c=Ea[a.toLowerCase()];return c&&Ab[b.nodeName]&&c}function qc(b,a){var c=function(c,e){if(!c.preventDefault)c.preventDefault=function(){c.returnValue=!1};if(!c.stopPropagation)c.stopPropagation=function(){c.cancelBubble=!0};if(!c.target)c.target=c.srcElement||ba;if(t(c.defaultPrevented)){var g=c.preventDefault;c.preventDefault=function(){c.defaultPrevented=!0;g.call(c)};c.defaultPrevented=!1}c.isDefaultPrevented=function(){return c.defaultPrevented};m(a[e||c.type],
+function(a){a.call(b,c)});$<=8?(c.preventDefault=null,c.stopPropagation=null,c.isDefaultPrevented=null):(delete c.preventDefault,delete c.stopPropagation,delete c.isDefaultPrevented)};c.elem=b;return c}function ja(b){var a=typeof b,c;if(a=="object"&&b!==null)if(typeof(c=b.$$hashKey)=="function")c=b.$$hashKey();else{if(c===p)c=b.$$hashKey=xa()}else c=b;return a+":"+c}function Fa(b){m(b,this.put,this)}function fb(){}function Bb(b){var a,c;if(typeof b=="function"){if(!(a=b.$inject))a=[],c=b.toString().replace(rc,
+""),c=c.match(sc),m(c[1].split(tc),function(b){b.replace(uc,function(b,c,d){a.push(d)})}),b.$inject=a}else K(b)?(c=b.length-1,ra(b[c],"fn"),a=b.slice(0,c)):ra(b,"fn",!0);return a}function rb(b){function a(a){return function(b,c){if(I(b))m(b,nb(a));else return a(b,c)}}function c(a,b){M(b)&&(b=l.instantiate(b));if(!b.$get)throw A("Provider "+a+" must define $get factory method.");return j[a+f]=b}function d(a,b){return c(a,{$get:b})}function e(a){var b=[];m(a,function(a){if(!k.get(a))if(k.put(a,!0),
+F(a)){var c=ta(a);b=b.concat(e(c.requires)).concat(c._runBlocks);try{for(var d=c._invokeQueue,c=0,f=d.length;c<f;c++){var g=d[c],h=g[0]=="$injector"?l:l.get(g[0]);h[g[1]].apply(h,g[2])}}catch(i){throw i.message&&(i.message+=" from "+a),i;}}else if(M(a))try{b.push(l.invoke(a))}catch(o){throw o.message&&(o.message+=" from "+a),o;}else if(K(a))try{b.push(l.invoke(a))}catch(n){throw n.message&&(n.message+=" from "+String(a[a.length-1])),n;}else ra(a,"module")});return b}function g(a,b){function c(d){if(typeof d!==
+"string")throw A("Service name expected");if(a.hasOwnProperty(d)){if(a[d]===i)throw A("Circular dependency: "+h.join(" <- "));return a[d]}else try{return h.unshift(d),a[d]=i,a[d]=b(d)}finally{h.shift()}}function d(a,b,e){var f=[],g=Bb(a),k,i,o;i=0;for(k=g.length;i<k;i++)o=g[i],f.push(e&&e.hasOwnProperty(o)?e[o]:c(o,h));a.$inject||(a=a[k]);switch(b?-1:f.length){case 0:return a();case 1:return a(f[0]);case 2:return a(f[0],f[1]);case 3:return a(f[0],f[1],f[2]);case 4:return a(f[0],f[1],f[2],f[3]);case 5:return a(f[0],
+f[1],f[2],f[3],f[4]);case 6:return a(f[0],f[1],f[2],f[3],f[4],f[5]);case 7:return a(f[0],f[1],f[2],f[3],f[4],f[5],f[6]);case 8:return a(f[0],f[1],f[2],f[3],f[4],f[5],f[6],f[7]);case 9:return a(f[0],f[1],f[2],f[3],f[4],f[5],f[6],f[7],f[8]);case 10:return a(f[0],f[1],f[2],f[3],f[4],f[5],f[6],f[7],f[8],f[9]);default:return a.apply(b,f)}}return{invoke:d,instantiate:function(a,b){var c=function(){},e;c.prototype=(K(a)?a[a.length-1]:a).prototype;c=new c;e=d(a,c,b);return I(e)?e:c},get:c,annotate:Bb}}var i=
+{},f="Provider",h=[],k=new Fa,j={$provide:{provider:a(c),factory:a(d),service:a(function(a,b){return d(a,["$injector",function(a){return a.instantiate(b)}])}),value:a(function(a,b){return d(a,J(b))}),constant:a(function(a,b){j[a]=b;n[a]=b}),decorator:function(a,b){var c=l.get(a+f),d=c.$get;c.$get=function(){var a=r.invoke(d,c);return r.invoke(b,null,{$delegate:a})}}}},l=g(j,function(){throw A("Unknown provider: "+h.join(" <- "));}),n={},r=n.$injector=g(n,function(a){a=l.get(a+f);return r.invoke(a.$get,
+a)});m(e(b),function(a){r.invoke(a||D)});return r}function vc(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=null;m(a,function(a){!b&&E(a.nodeName)==="a"&&(b=a)});return b}function g(){var b=c.hash(),d;b?(d=i.getElementById(b))?d.scrollIntoView():(d=e(i.getElementsByName(b)))?d.scrollIntoView():b==="top"&&a.scrollTo(0,0):a.scrollTo(0,0)}var i=a.document;b&&d.$watch(function(){return c.hash()},function(){d.$evalAsync(g)});
+return g}]}function wc(b,a,c,d){function e(a){try{a.apply(null,ha.call(arguments,1))}finally{if(o--,o===0)for(;w.length;)try{w.pop()()}catch(b){c.error(b)}}}function g(a,b){(function ea(){m(q,function(a){a()});v=b(ea,a)})()}function i(){Y!=f.url()&&(Y=f.url(),m(z,function(a){a(f.url())}))}var f=this,h=a[0],k=b.location,j=b.history,l=b.setTimeout,n=b.clearTimeout,r={};f.isMock=!1;var o=0,w=[];f.$$completeOutstandingRequest=e;f.$$incOutstandingRequestCount=function(){o++};f.notifyWhenNoOutstandingRequests=
+function(a){m(q,function(a){a()});o===0?a():w.push(a)};var q=[],v;f.addPollFn=function(a){t(v)&&g(100,l);q.push(a);return a};var Y=k.href,B=a.find("base");f.url=function(a,b){if(a){if(Y!=a)return Y=a,d.history?b?j.replaceState(null,"",a):(j.pushState(null,"",a),B.attr("href",B.attr("href"))):b?k.replace(a):k.href=a,f}else return k.href.replace(/%27/g,"'")};var z=[],L=!1;f.onUrlChange=function(a){L||(d.history&&y(b).bind("popstate",i),d.hashchange?y(b).bind("hashchange",i):f.addPollFn(i),L=!0);z.push(a);
+return a};f.baseHref=function(){var a=B.attr("href");return a?a.replace(/^https?\:\/\/[^\/]*/,""):a};var V={},s="",N=f.baseHref();f.cookies=function(a,b){var d,e,f,g;if(a)if(b===p)h.cookie=escape(a)+"=;path="+N+";expires=Thu, 01 Jan 1970 00:00:00 GMT";else{if(F(b))d=(h.cookie=escape(a)+"="+escape(b)+";path="+N).length+1,d>4096&&c.warn("Cookie '"+a+"' possibly not set or overflowed because it was too large ("+d+" > 4096 bytes)!"),V.length>20&&c.warn("Cookie '"+a+"' possibly not set or overflowed because too many cookies were already set ("+
+V.length+" > 20 )")}else{if(h.cookie!==s){s=h.cookie;d=s.split("; ");V={};for(f=0;f<d.length;f++)e=d[f],g=e.indexOf("="),g>0&&(V[unescape(e.substring(0,g))]=unescape(e.substring(g+1)))}return V}};f.defer=function(a,b){var c;o++;c=l(function(){delete r[c];e(a)},b||0);r[c]=!0;return c};f.defer.cancel=function(a){return r[a]?(delete r[a],n(a),e(D),!0):!1}}function xc(){this.$get=["$window","$log","$sniffer","$document",function(b,a,c,d){return new wc(b,d,a,c)}]}function yc(){this.$get=function(){function b(b,
+d){function e(a){if(a!=l){if(n){if(n==a)n=a.n}else n=a;g(a.n,a.p);g(a,l);l=a;l.n=null}}function g(a,b){if(a!=b){if(a)a.p=b;if(b)b.n=a}}if(b in a)throw A("cacheId "+b+" taken");var i=0,f=x({},d,{id:b}),h={},k=d&&d.capacity||Number.MAX_VALUE,j={},l=null,n=null;return a[b]={put:function(a,b){var c=j[a]||(j[a]={key:a});e(c);t(b)||(a in h||i++,h[a]=b,i>k&&this.remove(n.key))},get:function(a){var b=j[a];if(b)return e(b),h[a]},remove:function(a){var b=j[a];if(b==l)l=b.p;if(b==n)n=b.n;g(b.n,b.p);delete j[a];
+delete h[a];i--},removeAll:function(){h={};i=0;j={};l=n=null},destroy:function(){j=f=h=null;delete a[b]},info:function(){return x({},f,{size:i})}}}var a={};b.info=function(){var b={};m(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};return b}}function zc(){this.$get=["$cacheFactory",function(b){return b("templates")}]}function Cb(b){var a={},c="Directive",d=/^\s*directive\:\s*([\d\w\-_]+)\s+(.*)$/,e=/(([\d\w\-_]+)(?:\:([^;]+))?;?)/,g="Template must have exactly one root element. was: ";
+this.directive=function f(d,e){F(d)?(qa(e,"directive"),a.hasOwnProperty(d)||(a[d]=[],b.factory(d+c,["$injector","$exceptionHandler",function(b,c){var e=[];m(a[d],function(a){try{var f=b.invoke(a);if(M(f))f={compile:J(f)};else if(!f.compile&&f.link)f.compile=J(f.link);f.priority=f.priority||0;f.name=f.name||d;f.require=f.require||f.controller&&f.name;f.restrict=f.restrict||"A";e.push(f)}catch(g){c(g)}});return e}])),a[d].push(e)):m(d,nb(f));return this};this.$get=["$injector","$interpolate","$exceptionHandler",
+"$http","$templateCache","$parse","$controller","$rootScope",function(b,h,k,j,l,n,r,o){function w(a,b,c){a instanceof y||(a=y(a));m(a,function(b,c){b.nodeType==3&&(a[c]=y(b).wrap("<span></span>").parent()[0])});var d=v(a,b,a,c);return function(b,c){qa(b,"scope");var e=c?ua.clone.call(a):a;e.data("$scope",b);q(e,"ng-scope");c&&c(e,b);d&&d(b,e,e);return e}}function q(a,b){try{a.addClass(b)}catch(c){}}function v(a,b,c,d){function e(a,c,d,g){for(var k,h,n,j,o,l=0,r=0,q=f.length;l<q;r++)n=c[r],k=f[l++],
+h=f[l++],k?(k.scope?(j=a.$new(I(k.scope)),y(n).data("$scope",j)):j=a,(o=k.transclude)||!g&&b?k(h,j,n,d,function(b){return function(c){var d=a.$new();return b(d,c).bind("$destroy",Wa(d,d.$destroy))}}(o||b)):k(h,j,n,p,g)):h&&h(a,n.childNodes,p,g)}for(var f=[],g,k,h,n=0;n<a.length;n++)k=new ea,g=Y(a[n],[],k,d),k=(g=g.length?B(g,a[n],k,b,c):null)&&g.terminal?null:v(a[n].childNodes,g?g.transclude:b),f.push(g),f.push(k),h=h||g||k;return h?e:null}function Y(a,b,c,f){var g=c.$attr,k;switch(a.nodeType){case 1:z(b,
+fa(Db(a).toLowerCase()),"E",f);var h,n,j;k=a.attributes;for(var o=0,l=k&&k.length;o<l;o++)if(h=k[o],h.specified)n=h.name,j=fa(n.toLowerCase()),g[j]=n,c[j]=h=Q($&&n=="href"?decodeURIComponent(a.getAttribute(n,2)):h.value),zb(a,j)&&(c[j]=!0),W(a,b,h,j),z(b,j,"A",f);a=a.className;if(F(a))for(;k=e.exec(a);)j=fa(k[2]),z(b,j,"C",f)&&(c[j]=Q(k[3])),a=a.substr(k.index+k[0].length);break;case 3:H(b,a.nodeValue);break;case 8:try{if(k=d.exec(a.nodeValue))j=fa(k[1]),z(b,j,"M",f)&&(c[j]=Q(k[2]))}catch(r){}}b.sort(s);
+return b}function B(a,b,c,d,e){function f(a,b){if(a)a.require=C.require,l.push(a);if(b)b.require=C.require,aa.push(b)}function h(a,b){var c,d="data",e=!1;if(F(a)){for(;(c=a.charAt(0))=="^"||c=="?";)a=a.substr(1),c=="^"&&(d="inheritedData"),e=e||c=="?";c=b[d]("$"+a+"Controller");if(!c&&!e)throw A("No controller: "+a);}else K(a)&&(c=[],m(a,function(a){c.push(h(a,b))}));return c}function j(a,d,e,f,g){var o,q,w,L,Ha;o=b===e?c:ic(c,new ea(y(e),c.$attr));q=o.$$element;if(v&&I(v.scope)){var Y=/^\s*([@=&])\s*(\w*)\s*$/,
+s=d.$parent||d;m(v.scope,function(a,b){var c=a.match(Y)||[],e=c[2]||b,f,g,k;switch(c[1]){case "@":o.$observe(e,function(a){d[b]=a});o.$$observers[e].$$scope=s;break;case "=":g=n(o[e]);k=g.assign||function(){f=d[b]=g(s);throw A(Eb+o[e]+" (directive: "+v.name+")");};f=d[b]=g(s);d.$watch(function(){var a=g(s);a!==d[b]&&(a!==f?f=d[b]=a:k(s,f=d[b]));return a});break;case "&":g=n(o[e]);d[b]=function(a){return g(s,a)};break;default:throw A("Invalid isolate scope definition for directive "+v.name+": "+a);
+}})}u&&m(u,function(a){var b={$scope:d,$element:q,$attrs:o,$transclude:g};Ha=a.controller;Ha=="@"&&(Ha=o[a.name]);q.data("$"+a.name+"Controller",r(Ha,b))});f=0;for(w=l.length;f<w;f++)try{L=l[f],L(d,q,o,L.require&&h(L.require,q))}catch(Ia){k(Ia,pa(q))}a&&a(d,e.childNodes,p,g);f=0;for(w=aa.length;f<w;f++)try{L=aa[f],L(d,q,o,L.require&&h(L.require,q))}catch(B){k(B,pa(q))}}for(var o=-Number.MAX_VALUE,l=[],aa=[],v=null,B=null,z=null,s=c.$$element=y(b),C,H,W,D,t=d,u,x,X,E=0,G=a.length;E<G;E++){C=a[E];W=
+p;if(o>C.priority)break;if(X=C.scope)N("isolated scope",B,C,s),I(X)&&(q(s,"ng-isolate-scope"),B=C),q(s,"ng-scope"),v=v||C;H=C.name;if(X=C.controller)u=u||{},N("'"+H+"' controller",u[H],C,s),u[H]=C;if(X=C.transclude)N("transclusion",D,C,s),D=C,o=C.priority,X=="element"?(W=y(b),s=c.$$element=y("<\!-- "+H+": "+c[H]+" --\>"),b=s[0],Ga(e,y(W[0]),b),t=w(W,d,o)):(W=y(db(b)).contents(),s.html(""),t=w(W,d));if(X=C.template)if(N("template",z,C,s),z=C,X=Ia(X),C.replace){W=y("<div>"+Q(X)+"</div>").contents();
+b=W[0];if(W.length!=1||b.nodeType!==1)throw new A(g+X);Ga(e,s,b);H={$attr:{}};a=a.concat(Y(b,a.splice(E+1,a.length-(E+1)),H));L(c,H);G=a.length}else s.html(X);if(C.templateUrl)N("template",z,C,s),z=C,j=V(a.splice(E,a.length-E),j,s,c,e,C.replace,t),G=a.length;else if(C.compile)try{x=C.compile(s,c,t),M(x)?f(null,x):x&&f(x.pre,x.post)}catch(J){k(J,pa(s))}if(C.terminal)j.terminal=!0,o=Math.max(o,C.priority)}j.scope=v&&v.scope;j.transclude=D&&t;return j}function z(d,e,g,h){var j=!1;if(a.hasOwnProperty(e))for(var n,
+e=b.get(e+c),o=0,l=e.length;o<l;o++)try{if(n=e[o],(h===p||h>n.priority)&&n.restrict.indexOf(g)!=-1)d.push(n),j=!0}catch(r){k(r)}return j}function L(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;m(a,function(d,e){e.charAt(0)!="$"&&(b[e]&&(d+=(e==="style"?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});m(b,function(b,f){f=="class"?(q(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):f=="style"?e.attr("style",e.attr("style")+";"+b):f.charAt(0)!="$"&&!a.hasOwnProperty(f)&&(a[f]=b,d[f]=c[f])})}function V(a,b,c,d,e,
+f,k){var h=[],n,o,r=c[0],q=a.shift(),w=x({},q,{controller:null,templateUrl:null,transclude:null});c.html("");j.get(q.templateUrl,{cache:l}).success(function(j){var l,q,j=Ia(j);if(f){q=y("<div>"+Q(j)+"</div>").contents();l=q[0];if(q.length!=1||l.nodeType!==1)throw new A(g+j);j={$attr:{}};Ga(e,c,l);Y(l,a,j);L(d,j)}else l=r,c.html(j);a.unshift(w);n=B(a,c,d,k);for(o=v(c.contents(),k);h.length;){var aa=h.pop(),j=h.pop();q=h.pop();var s=h.pop(),m=l;q!==r&&(m=db(l),Ga(j,y(q),m));n(function(){b(o,s,m,e,aa)},
+s,m,e,aa)}h=null}).error(function(a,b,c,d){throw A("Failed to load template: "+d.url);});return function(a,c,d,e,f){h?(h.push(c),h.push(d),h.push(e),h.push(f)):n(function(){b(o,c,d,e,f)},c,d,e,f)}}function s(a,b){return b.priority-a.priority}function N(a,b,c,d){if(b)throw A("Multiple directives ["+b.name+", "+c.name+"] asking for "+a+" on: "+pa(d));}function H(a,b){var c=h(b,!0);c&&a.push({priority:0,compile:J(function(a,b){var d=b.parent(),e=d.data("$binding")||[];e.push(c);q(d.data("$binding",e),
+"ng-binding");a.$watch(c,function(a){b[0].nodeValue=a})})})}function W(a,b,c,d){var e=h(c,!0);e&&b.push({priority:100,compile:J(function(a,b,c){b=c.$$observers||(c.$$observers={});d==="class"&&(e=h(c[d],!0));c[d]=p;(b[d]||(b[d]=[])).$$inter=!0;(c.$$observers&&c.$$observers[d].$$scope||a).$watch(e,function(a){c.$set(d,a)})})})}function Ga(a,b,c){var d=b[0],e=d.parentNode,f,g;if(a){f=0;for(g=a.length;f<g;f++)if(a[f]==d){a[f]=c;break}}e&&e.replaceChild(c,d);c[y.expando]=d[y.expando];b[0]=c}var ea=function(a,
+b){this.$$element=a;this.$attr=b||{}};ea.prototype={$normalize:fa,$set:function(a,b,c,d){var e=zb(this.$$element[0],a),f=this.$$observers;e&&(this.$$element.prop(a,b),d=e);this[a]=b;d?this.$attr[a]=d:(d=this.$attr[a])||(this.$attr[a]=d=ab(a,"-"));c!==!1&&(b===null||b===p?this.$$element.removeAttr(d):this.$$element.attr(d,b));f&&m(f[a],function(a){try{a(b)}catch(c){k(c)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers={}),e=d[a]||(d[a]=[]);e.push(b);o.$evalAsync(function(){e.$$inter||
+b(c[a])});return b}};var D=h.startSymbol(),aa=h.endSymbol(),Ia=D=="{{"||aa=="}}"?ma:function(a){return a.replace(/\{\{/g,D).replace(/}}/g,aa)};return w}]}function fa(b){return sb(b.replace(Ac,""))}function Bc(){var b={};this.register=function(a,c){I(a)?x(b,a):b[a]=c};this.$get=["$injector","$window",function(a,c){return function(d,e){if(F(d)){var g=d,d=b.hasOwnProperty(g)?b[g]:gb(e.$scope,g,!0)||gb(c,g,!0);ra(d,g,!0)}return a.instantiate(d,e)}}]}function Cc(){this.$get=["$window",function(b){return y(b.document)}]}
+function Dc(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,arguments)}}]}function Ec(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=function(b){return b?(a=b,this):a};this.$get=["$parse",function(c){function d(d,f){for(var h,k,j=0,l=[],n=d.length,r=!1,o=[];j<n;)(h=d.indexOf(b,j))!=-1&&(k=d.indexOf(a,h+e))!=-1?(j!=h&&l.push(d.substring(j,h)),l.push(j=c(r=d.substring(h+e,k))),j.exp=r,j=k+g,r=!0):(j!=n&&l.push(d.substring(j)),j=n);if(!(n=
+l.length))l.push(""),n=1;if(!f||r)return o.length=n,j=function(a){for(var b=0,c=n,d;b<c;b++){if(typeof(d=l[b])=="function")d=d(a),d==null||d==p?d="":typeof d!="string"&&(d=ca(d));o[b]=d}return o.join("")},j.exp=d,j.parts=l,j}var e=b.length,g=a.length;d.startSymbol=function(){return b};d.endSymbol=function(){return a};return d}]}function Fb(b){for(var b=b.split("/"),a=b.length;a--;)b[a]=$a(b[a]);return b.join("/")}function va(b,a){var c=Gb.exec(b),c={protocol:c[1],host:c[3],port:G(c[5])||Hb[c[1]]||
+null,path:c[6]||"/",search:c[8],hash:c[10]};if(a)a.$$protocol=c.protocol,a.$$host=c.host,a.$$port=c.port;return c}function ka(b,a,c){return b+"://"+a+(c==Hb[b]?"":":"+c)}function Fc(b,a,c){var d=va(b);return decodeURIComponent(d.path)!=a||t(d.hash)||d.hash.indexOf(c)!==0?b:ka(d.protocol,d.host,d.port)+a.substr(0,a.lastIndexOf("/"))+d.hash.substr(c.length)}function Gc(b,a,c){var d=va(b);if(decodeURIComponent(d.path)==a)return b;else{var e=d.search&&"?"+d.search||"",g=d.hash&&"#"+d.hash||"",i=a.substr(0,
+a.lastIndexOf("/")),f=d.path.substr(i.length);if(d.path.indexOf(i)!==0)throw A('Invalid url "'+b+'", missing path prefix "'+i+'" !');return ka(d.protocol,d.host,d.port)+a+"#"+c+f+e+g}}function hb(b,a,c){a=a||"";this.$$parse=function(b){var c=va(b,this);if(c.path.indexOf(a)!==0)throw A('Invalid url "'+b+'", missing path prefix "'+a+'" !');this.$$path=decodeURIComponent(c.path.substr(a.length));this.$$search=Ya(c.search);this.$$hash=c.hash&&decodeURIComponent(c.hash)||"";this.$$compose()};this.$$compose=
+function(){var b=pb(this.$$search),c=this.$$hash?"#"+$a(this.$$hash):"";this.$$url=Fb(this.$$path)+(b?"?"+b:"")+c;this.$$absUrl=ka(this.$$protocol,this.$$host,this.$$port)+a+this.$$url};this.$$rewriteAppUrl=function(a){if(a.indexOf(c)==0)return a};this.$$parse(b)}function Ja(b,a,c){var d;this.$$parse=function(b){var c=va(b,this);if(c.hash&&c.hash.indexOf(a)!==0)throw A('Invalid url "'+b+'", missing hash prefix "'+a+'" !');d=c.path+(c.search?"?"+c.search:"");c=Hc.exec((c.hash||"").substr(a.length));
+this.$$path=c[1]?(c[1].charAt(0)=="/"?"":"/")+decodeURIComponent(c[1]):"";this.$$search=Ya(c[3]);this.$$hash=c[5]&&decodeURIComponent(c[5])||"";this.$$compose()};this.$$compose=function(){var b=pb(this.$$search),c=this.$$hash?"#"+$a(this.$$hash):"";this.$$url=Fb(this.$$path)+(b?"?"+b:"")+c;this.$$absUrl=ka(this.$$protocol,this.$$host,this.$$port)+d+(this.$$url?"#"+a+this.$$url:"")};this.$$rewriteAppUrl=function(a){if(a.indexOf(c)==0)return a};this.$$parse(b)}function Ib(b,a,c,d){Ja.apply(this,arguments);
+this.$$rewriteAppUrl=function(b){if(b.indexOf(c)==0)return c+d+"#"+a+b.substr(c.length)}}function Ka(b){return function(){return this[b]}}function Jb(b,a){return function(c){if(t(c))return this[b];this[b]=a(c);this.$$compose();return this}}function Ic(){var b="",a=!1;this.hashPrefix=function(a){return u(a)?(b=a,this):b};this.html5Mode=function(b){return u(b)?(a=b,this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement",function(c,d,e,g){function i(a){c.$broadcast("$locationChangeSuccess",
+f.absUrl(),a)}var f,h,k,j=d.url(),l=va(j);a?(h=d.baseHref()||"/",k=h.substr(0,h.lastIndexOf("/")),l=ka(l.protocol,l.host,l.port)+k+"/",f=e.history?new hb(Fc(j,h,b),k,l):new Ib(Gc(j,h,b),b,l,h.substr(k.length+1))):(l=ka(l.protocol,l.host,l.port)+(l.path||"")+(l.search?"?"+l.search:"")+"#"+b+"/",f=new Ja(j,b,l));g.bind("click",function(a){if(!a.ctrlKey&&!(a.metaKey||a.which==2)){for(var b=y(a.target);E(b[0].nodeName)!=="a";)if(b[0]===g[0]||!(b=b.parent())[0])return;var d=b.prop("href"),e=f.$$rewriteAppUrl(d);
+d&&!b.attr("target")&&e&&(f.$$parse(e),c.$apply(),a.preventDefault(),T.angular["ff-684208-preventDefault"]=!0)}});f.absUrl()!=j&&d.url(f.absUrl(),!0);d.onUrlChange(function(a){f.absUrl()!=a&&(c.$evalAsync(function(){var b=f.absUrl();f.$$parse(a);i(b)}),c.$$phase||c.$digest())});var n=0;c.$watch(function(){var a=d.url();if(!n||a!=f.absUrl())n++,c.$evalAsync(function(){c.$broadcast("$locationChangeStart",f.absUrl(),a).defaultPrevented?f.$$parse(a):(d.url(f.absUrl(),f.$$replace),f.$$replace=!1,i(a))});
+return n});return f}]}function Jc(){this.$get=["$window",function(b){function a(a){a instanceof A&&(a.stack?a=a.message&&a.stack.indexOf(a.message)===-1?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function c(c){var e=b.console||{},g=e[c]||e.log||D;return g.apply?function(){var b=[];m(arguments,function(c){b.push(a(c))});return g.apply(e,b)}:function(a,b){g(a,b)}}return{log:c("log"),warn:c("warn"),info:c("info"),error:c("error")}}]}function Kc(b,
+a){function c(a){return a.indexOf(q)!=-1}function d(){return o+1<b.length?b.charAt(o+1):!1}function e(a){return"0"<=a&&a<="9"}function g(a){return a==" "||a=="\r"||a=="\t"||a=="\n"||a=="\u000b"||a=="\u00a0"}function i(a){return"a"<=a&&a<="z"||"A"<=a&&a<="Z"||"_"==a||a=="$"}function f(a){return a=="-"||a=="+"||e(a)}function h(a,c,d){d=d||o;throw A("Lexer Error: "+a+" at column"+(u(c)?"s "+c+"-"+o+" ["+b.substring(c,d)+"]":" "+d)+" in expression ["+b+"].");}function k(){for(var a="",c=o;o<b.length;){var g=
+E(b.charAt(o));if(g=="."||e(g))a+=g;else{var k=d();if(g=="e"&&f(k))a+=g;else if(f(g)&&k&&e(k)&&a.charAt(a.length-1)=="e")a+=g;else if(f(g)&&(!k||!e(k))&&a.charAt(a.length-1)=="e")h("Invalid exponent");else break}o++}a*=1;n.push({index:c,text:a,json:!0,fn:function(){return a}})}function j(){for(var c="",d=o,f,k,h;o<b.length;){var j=b.charAt(o);if(j=="."||i(j)||e(j))j=="."&&(f=o),c+=j;else break;o++}if(f)for(k=o;k<b.length;){j=b.charAt(k);if(j=="("){h=c.substr(f-d+1);c=c.substr(0,f-d);o=k;break}if(g(j))k++;
+else break}d={index:d,text:c};if(La.hasOwnProperty(c))d.fn=d.json=La[c];else{var l=Kb(c,a);d.fn=x(function(a,b){return l(a,b)},{assign:function(a,b){return Lb(a,c,b)}})}n.push(d);h&&(n.push({index:f,text:".",json:!1}),n.push({index:f+1,text:h,json:!1}))}function l(a){var c=o;o++;for(var d="",e=a,f=!1;o<b.length;){var g=b.charAt(o);e+=g;if(f)g=="u"?(g=b.substring(o+1,o+5),g.match(/[\da-f]{4}/i)||h("Invalid unicode escape [\\u"+g+"]"),o+=4,d+=String.fromCharCode(parseInt(g,16))):(f=Lc[g],d+=f?f:g),
+f=!1;else if(g=="\\")f=!0;else if(g==a){o++;n.push({index:c,text:e,string:d,json:!0,fn:function(){return d}});return}else d+=g;o++}h("Unterminated quote",c)}for(var n=[],r,o=0,w=[],q,v=":";o<b.length;){q=b.charAt(o);if(c("\"'"))l(q);else if(e(q)||c(".")&&e(d()))k();else if(i(q)){if(j(),"{,".indexOf(v)!=-1&&w[0]=="{"&&(r=n[n.length-1]))r.json=r.text.indexOf(".")==-1}else if(c("(){}[].,;:"))n.push({index:o,text:q,json:":[,".indexOf(v)!=-1&&c("{[")||c("}]:,")}),c("{[")&&w.unshift(q),c("}]")&&w.shift(),
+o++;else if(g(q)){o++;continue}else{var m=q+d(),B=La[q],z=La[m];z?(n.push({index:o,text:m,fn:z}),o+=2):B?(n.push({index:o,text:q,fn:B,json:"[,:".indexOf(v)!=-1&&c("+-")}),o+=1):h("Unexpected next character ",o,o+1)}v=q}return n}function Mc(b,a,c,d){function e(a,c){throw A("Syntax Error: Token '"+c.text+"' "+a+" at column "+(c.index+1)+" of the expression ["+b+"] starting at ["+b.substring(c.index)+"].");}function g(){if(N.length===0)throw A("Unexpected end of expression: "+b);return N[0]}function i(a,
+b,c,d){if(N.length>0){var f=N[0],e=f.text;if(e==a||e==b||e==c||e==d||!a&&!b&&!c&&!d)return f}return!1}function f(b,c,d,f){return(b=i(b,c,d,f))?(a&&!b.json&&e("is not valid json",b),N.shift(),b):!1}function h(a){f(a)||e("is unexpected, expecting ["+a+"]",i())}function k(a,b){return function(c,d){return a(c,d,b)}}function j(a,b,c){return function(d,f){return b(d,f,a,c)}}function l(){for(var a=[];;)if(N.length>0&&!i("}",")",";","]")&&a.push(t()),!f(";"))return a.length==1?a[0]:function(b,c){for(var d,
+f=0;f<a.length;f++){var e=a[f];e&&(d=e(b,c))}return d}}function n(){for(var a=f(),b=c(a.text),d=[];;)if(a=f(":"))d.push(H());else{var e=function(a,c,f){for(var f=[f],e=0;e<d.length;e++)f.push(d[e](a,c));return b.apply(a,f)};return function(){return e}}}function r(){for(var a=o(),b;;)if(b=f("||"))a=j(a,b.fn,o());else return a}function o(){var a=w(),b;if(b=f("&&"))a=j(a,b.fn,o());return a}function w(){var a=q(),b;if(b=f("==","!="))a=j(a,b.fn,w());return a}function q(){var a;a=v();for(var b;b=f("+",
+"-");)a=j(a,b.fn,v());if(b=f("<",">","<=",">="))a=j(a,b.fn,q());return a}function v(){for(var a=m(),b;b=f("*","/","%");)a=j(a,b.fn,m());return a}function m(){var a;return f("+")?B():(a=f("-"))?j(V,a.fn,m()):(a=f("!"))?k(a.fn,m()):B()}function B(){var a;if(f("("))a=t(),h(")");else if(f("["))a=z();else if(f("{"))a=L();else{var b=f();(a=b.fn)||e("not a primary expression",b)}for(var c;b=f("(","[",".");)b.text==="("?(a=y(a,c),c=null):b.text==="["?(c=a,a=ea(a)):b.text==="."?(c=a,a=u(a)):e("IMPOSSIBLE");
+return a}function z(){var a=[];if(g().text!="]"){do a.push(H());while(f(","))}h("]");return function(b,c){for(var d=[],f=0;f<a.length;f++)d.push(a[f](b,c));return d}}function L(){var a=[];if(g().text!="}"){do{var b=f(),b=b.string||b.text;h(":");var c=H();a.push({key:b,value:c})}while(f(","))}h("}");return function(b,c){for(var d={},f=0;f<a.length;f++){var e=a[f],g=e.value(b,c);d[e.key]=g}return d}}var V=J(0),s,N=Kc(b,d),H=function(){var a=r(),c,d;return(d=f("="))?(a.assign||e("implies assignment but ["+
+b.substring(0,d.index)+"] can not be assigned to",d),c=r(),function(b,d){return a.assign(b,c(b,d),d)}):a},y=function(a,b){var c=[];if(g().text!=")"){do c.push(H());while(f(","))}h(")");return function(d,f){for(var e=[],g=b?b(d,f):d,k=0;k<c.length;k++)e.push(c[k](d,f));k=a(d,f)||D;return k.apply?k.apply(g,e):k(e[0],e[1],e[2],e[3],e[4])}},u=function(a){var b=f().text,c=Kb(b,d);return x(function(b,d){return c(a(b,d),d)},{assign:function(c,d,f){return Lb(a(c,f),b,d)}})},ea=function(a){var b=H();h("]");
+return x(function(c,d){var f=a(c,d),e=b(c,d),g;if(!f)return p;if((f=f[e])&&f.then){g=f;if(!("$$v"in f))g.$$v=p,g.then(function(a){g.$$v=a});f=f.$$v}return f},{assign:function(c,d,f){return a(c,f)[b(c,f)]=d}})},t=function(){for(var a=H(),b;;)if(b=f("|"))a=j(a,b.fn,n());else return a};a?(H=r,y=u=ea=t=function(){e("is not valid json",{text:b,index:0})},s=B()):s=l();N.length!==0&&e("is an unexpected token",N[0]);return s}function Lb(b,a,c){for(var a=a.split("."),d=0;a.length>1;d++){var e=a.shift(),g=
+b[e];g||(g={},b[e]=g);b=g}return b[a.shift()]=c}function gb(b,a,c){if(!a)return b;for(var a=a.split("."),d,e=b,g=a.length,i=0;i<g;i++)d=a[i],b&&(b=(e=b)[d]);return!c&&M(b)?Wa(e,b):b}function Mb(b,a,c,d,e){return function(g,i){var f=i&&i.hasOwnProperty(b)?i:g,h;if(f===null||f===p)return f;if((f=f[b])&&f.then){if(!("$$v"in f))h=f,h.$$v=p,h.then(function(a){h.$$v=a});f=f.$$v}if(!a||f===null||f===p)return f;if((f=f[a])&&f.then){if(!("$$v"in f))h=f,h.$$v=p,h.then(function(a){h.$$v=a});f=f.$$v}if(!c||f===
+null||f===p)return f;if((f=f[c])&&f.then){if(!("$$v"in f))h=f,h.$$v=p,h.then(function(a){h.$$v=a});f=f.$$v}if(!d||f===null||f===p)return f;if((f=f[d])&&f.then){if(!("$$v"in f))h=f,h.$$v=p,h.then(function(a){h.$$v=a});f=f.$$v}if(!e||f===null||f===p)return f;if((f=f[e])&&f.then){if(!("$$v"in f))h=f,h.$$v=p,h.then(function(a){h.$$v=a});f=f.$$v}return f}}function Kb(b,a){if(ib.hasOwnProperty(b))return ib[b];var c=b.split("."),d=c.length,e;if(a)e=d<6?Mb(c[0],c[1],c[2],c[3],c[4]):function(a,b){var e=0,
+g;do g=Mb(c[e++],c[e++],c[e++],c[e++],c[e++])(a,b),b=p,a=g;while(e<d);return g};else{var g="var l, fn, p;\n";m(c,function(a,b){g+="if(s === null || s === undefined) return s;\nl=s;\ns="+(b?"s":'((k&&k.hasOwnProperty("'+a+'"))?k:s)')+'["'+a+'"];\nif (s && s.then) {\n if (!("$$v" in s)) {\n p=s;\n p.$$v = undefined;\n p.then(function(v) {p.$$v=v;});\n}\n s=s.$$v\n}\n'});g+="return s;";e=Function("s","k",g);e.toString=function(){return g}}return ib[b]=e}function Nc(){var b={};this.$get=["$filter","$sniffer",
+function(a,c){return function(d){switch(typeof d){case "string":return b.hasOwnProperty(d)?b[d]:b[d]=Mc(d,!1,a,c.csp);case "function":return d;default:return D}}}]}function Oc(){this.$get=["$rootScope","$exceptionHandler",function(b,a){return Pc(function(a){b.$evalAsync(a)},a)}]}function Pc(b,a){function c(a){return a}function d(a){return i(a)}var e=function(){var f=[],h,k;return k={resolve:function(a){if(f){var c=f;f=p;h=g(a);c.length&&b(function(){for(var a,b=0,d=c.length;b<d;b++)a=c[b],h.then(a[0],
+a[1])})}},reject:function(a){k.resolve(i(a))},promise:{then:function(b,g){var k=e(),i=function(d){try{k.resolve((b||c)(d))}catch(f){a(f),k.reject(f)}},o=function(b){try{k.resolve((g||d)(b))}catch(c){a(c),k.reject(c)}};f?f.push([i,o]):h.then(i,o);return k.promise}}}},g=function(a){return a&&a.then?a:{then:function(c){var d=e();b(function(){d.resolve(c(a))});return d.promise}}},i=function(a){return{then:function(c,g){var j=e();b(function(){j.resolve((g||d)(a))});return j.promise}}};return{defer:e,reject:i,
+when:function(f,h,k){var j=e(),l,n=function(b){try{return(h||c)(b)}catch(d){return a(d),i(d)}},r=function(b){try{return(k||d)(b)}catch(c){return a(c),i(c)}};b(function(){g(f).then(function(a){l||(l=!0,j.resolve(g(a).then(n,r)))},function(a){l||(l=!0,j.resolve(r(a)))})});return j.promise},all:function(a){var b=e(),c=a.length,d=[];c?m(a,function(a,e){g(a).then(function(a){e in d||(d[e]=a,--c||b.resolve(d))},function(a){e in d||b.reject(a)})}):b.resolve(d);return b.promise}}}function Qc(){var b={};this.when=
+function(a,c){b[a]=x({reloadOnSearch:!0},c);if(a){var d=a[a.length-1]=="/"?a.substr(0,a.length-1):a+"/";b[d]={redirectTo:a}}return this};this.otherwise=function(a){this.when(null,a);return this};this.$get=["$rootScope","$location","$routeParams","$q","$injector","$http","$templateCache",function(a,c,d,e,g,i,f){function h(){var b=k(),h=r.current;if(b&&h&&b.$route===h.$route&&ga(b.pathParams,h.pathParams)&&!b.reloadOnSearch&&!n)h.params=b.params,U(h.params,d),a.$broadcast("$routeUpdate",h);else if(b||
+h)n=!1,a.$broadcast("$routeChangeStart",b,h),(r.current=b)&&b.redirectTo&&(F(b.redirectTo)?c.path(j(b.redirectTo,b.params)).search(b.params).replace():c.url(b.redirectTo(b.pathParams,c.path(),c.search())).replace()),e.when(b).then(function(){if(b){var a=[],c=[],d;m(b.resolve||{},function(b,d){a.push(d);c.push(M(b)?g.invoke(b):g.get(b))});if(!u(d=b.template))if(u(d=b.templateUrl))d=i.get(d,{cache:f}).then(function(a){return a.data});u(d)&&(a.push("$template"),c.push(d));return e.all(c).then(function(b){var c=
+{};m(b,function(b,d){c[a[d]]=b});return c})}}).then(function(c){if(b==r.current){if(b)b.locals=c,U(b.params,d);a.$broadcast("$routeChangeSuccess",b,h)}},function(c){b==r.current&&a.$broadcast("$routeChangeError",b,h,c)})}function k(){var a,d;m(b,function(b,e){if(!d&&(a=l(c.path(),e)))d=ya(b,{params:x({},c.search(),a),pathParams:a}),d.$route=b});return d||b[null]&&ya(b[null],{params:{},pathParams:{}})}function j(a,b){var c=[];m((a||"").split(":"),function(a,d){if(d==0)c.push(a);else{var e=a.match(/(\w+)(.*)/),
+f=e[1];c.push(b[f]);c.push(e[2]||"");delete b[f]}});return c.join("")}var l=function(a,b){var c="^"+b.replace(/([\.\\\(\)\^\$])/g,"\\$1")+"$",d=[],e={};m(b.split(/\W/),function(a){if(a){var b=RegExp(":"+a+"([\\W])");c.match(b)&&(c=c.replace(b,"([^\\/]*)$1"),d.push(a))}});var f=a.match(RegExp(c));f&&m(d,function(a,b){e[a]=f[b+1]});return f?e:null},n=!1,r={routes:b,reload:function(){n=!0;a.$evalAsync(h)}};a.$on("$locationChangeSuccess",h);return r}]}function Rc(){this.$get=J({})}function Sc(){var b=
+10;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse",function(a,c,d){function e(){this.$id=xa();this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this["this"]=this.$root=this;this.$$asyncQueue=[];this.$$listeners={}}function g(a){if(h.$$phase)throw A(h.$$phase+" already in progress");h.$$phase=a}function i(a,b){var c=d(a);ra(c,b);return c}function f(){}e.prototype={$new:function(a){if(M(a))throw A("API-CHANGE: Use $controller to instantiate controllers.");
+a?(a=new e,a.$root=this.$root):(a=function(){},a.prototype=this,a=new a,a.$id=xa());a["this"]=a;a.$$listeners={};a.$parent=this;a.$$asyncQueue=[];a.$$watchers=a.$$nextSibling=a.$$childHead=a.$$childTail=null;a.$$prevSibling=this.$$childTail;this.$$childHead?this.$$childTail=this.$$childTail.$$nextSibling=a:this.$$childHead=this.$$childTail=a;return a},$watch:function(a,b,c){var d=i(a,"watch"),e=this.$$watchers,g={fn:b,last:f,get:d,exp:a,eq:!!c};if(!M(b)){var h=i(b||D,"listener");g.fn=function(a,b,
+c){h(c)}}if(!e)e=this.$$watchers=[];e.unshift(g);return function(){za(e,g)}},$digest:function(){var a,d,e,i,r,o,m,q=b,v,p=[],B,z;g("$digest");do{m=!1;v=this;do{for(r=v.$$asyncQueue;r.length;)try{v.$eval(r.shift())}catch(L){c(L)}if(i=v.$$watchers)for(o=i.length;o--;)try{if(a=i[o],(d=a.get(v))!==(e=a.last)&&!(a.eq?ga(d,e):typeof d=="number"&&typeof e=="number"&&isNaN(d)&&isNaN(e)))m=!0,a.last=a.eq?U(d):d,a.fn(d,e===f?d:e,v),q<5&&(B=4-q,p[B]||(p[B]=[]),z=M(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):
+a.exp,z+="; newVal: "+ca(d)+"; oldVal: "+ca(e),p[B].push(z))}catch(V){c(V)}if(!(i=v.$$childHead||v!==this&&v.$$nextSibling))for(;v!==this&&!(i=v.$$nextSibling);)v=v.$parent}while(v=i);if(m&&!q--)throw h.$$phase=null,A(b+" $digest() iterations reached. Aborting!\nWatchers fired in the last 5 iterations: "+ca(p));}while(m||r.length);h.$$phase=null},$destroy:function(){if(h!=this){var a=this.$parent;this.$broadcast("$destroy");if(a.$$childHead==this)a.$$childHead=this.$$nextSibling;if(a.$$childTail==
+this)a.$$childTail=this.$$prevSibling;if(this.$$prevSibling)this.$$prevSibling.$$nextSibling=this.$$nextSibling;if(this.$$nextSibling)this.$$nextSibling.$$prevSibling=this.$$prevSibling}},$eval:function(a,b){return d(a)(this,b)},$evalAsync:function(a){this.$$asyncQueue.push(a)},$apply:function(a){try{return g("$apply"),this.$eval(a)}catch(b){c(b)}finally{h.$$phase=null;try{h.$digest()}catch(d){throw c(d),d;}}},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);return function(){za(c,
+b)}},$emit:function(a,b){var d=[],e,f=this,g=!1,h={name:a,targetScope:f,stopPropagation:function(){g=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},i=[h].concat(ha.call(arguments,1)),m,p;do{e=f.$$listeners[a]||d;h.currentScope=f;m=0;for(p=e.length;m<p;m++)try{if(e[m].apply(null,i),g)return h}catch(B){c(B)}f=f.$parent}while(f);return h},$broadcast:function(a,b){var d=this,e=this,f={name:a,targetScope:this,preventDefault:function(){f.defaultPrevented=!0},defaultPrevented:!1},
+g=[f].concat(ha.call(arguments,1));do if(d=e,f.currentScope=d,m(d.$$listeners[a],function(a){try{a.apply(null,g)}catch(b){c(b)}}),!(e=d.$$childHead||d!==this&&d.$$nextSibling))for(;d!==this&&!(e=d.$$nextSibling);)d=d.$parent;while(d=e);return f}};var h=new e;return h}]}function Tc(){this.$get=["$window",function(b){var a={},c=G((/android (\d+)/.exec(E(b.navigator.userAgent))||[])[1]);return{history:!(!b.history||!b.history.pushState||c<4),hashchange:"onhashchange"in b&&(!b.document.documentMode||
+b.document.documentMode>7),hasEvent:function(c){if(c=="input"&&$==9)return!1;if(t(a[c])){var e=b.document.createElement("div");a[c]="on"+c in e}return a[c]},csp:!1}}]}function Uc(){this.$get=J(T)}function Nb(b){var a={},c,d,e;if(!b)return a;m(b.split("\n"),function(b){e=b.indexOf(":");c=E(Q(b.substr(0,e)));d=Q(b.substr(e+1));c&&(a[c]?a[c]+=", "+d:a[c]=d)});return a}function Ob(b){var a=I(b)?b:p;return function(c){a||(a=Nb(b));return c?a[E(c)]||null:a}}function Pb(b,a,c){if(M(c))return c(b,a);m(c,
+function(c){b=c(b,a)});return b}function Vc(){var b=/^\s*(\[|\{[^\{])/,a=/[\}\]]\s*$/,c=/^\)\]\}',?\n/,d=this.defaults={transformResponse:[function(d){F(d)&&(d=d.replace(c,""),b.test(d)&&a.test(d)&&(d=ob(d,!0)));return d}],transformRequest:[function(a){return I(a)&&Ta.apply(a)!=="[object File]"?ca(a):a}],headers:{common:{Accept:"application/json, text/plain, */*","X-Requested-With":"XMLHttpRequest"},post:{"Content-Type":"application/json;charset=utf-8"},put:{"Content-Type":"application/json;charset=utf-8"}}},
+e=this.responseInterceptors=[];this.$get=["$httpBackend","$browser","$cacheFactory","$rootScope","$q","$injector",function(a,b,c,h,k,j){function l(a){function c(a){var b=x({},a,{data:Pb(a.data,a.headers,f)});return 200<=a.status&&a.status<300?b:k.reject(b)}a.method=la(a.method);var e=a.transformRequest||d.transformRequest,f=a.transformResponse||d.transformResponse,g=d.headers,g=x({"X-XSRF-TOKEN":b.cookies()["XSRF-TOKEN"]},g.common,g[E(a.method)],a.headers),e=Pb(a.data,Ob(g),e),h;t(a.data)&&delete g["Content-Type"];
+h=n(a,e,g);h=h.then(c,c);m(w,function(a){h=a(h)});h.success=function(b){h.then(function(c){b(c.data,c.status,c.headers,a)});return h};h.error=function(b){h.then(null,function(c){b(c.data,c.status,c.headers,a)});return h};return h}function n(b,c,d){function e(a,b,c){m&&(200<=a&&a<300?m.put(w,[a,b,Nb(c)]):m.remove(w));f(b,a,c);h.$apply()}function f(a,c,d){c=Math.max(c,0);(200<=c&&c<300?j.resolve:j.reject)({data:a,status:c,headers:Ob(d),config:b})}function i(){var a=Va(l.pendingRequests,b);a!==-1&&l.pendingRequests.splice(a,
+1)}var j=k.defer(),n=j.promise,m,p,w=r(b.url,b.params);l.pendingRequests.push(b);n.then(i,i);b.cache&&b.method=="GET"&&(m=I(b.cache)?b.cache:o);if(m)if(p=m.get(w))if(p.then)return p.then(i,i),p;else K(p)?f(p[1],p[0],U(p[2])):f(p,200,{});else m.put(w,n);p||a(b.method,w,c,e,d,b.timeout,b.withCredentials);return n}function r(a,b){if(!b)return a;var c=[];fc(b,function(a,b){a==null||a==p||(I(a)&&(a=ca(a)),c.push(encodeURIComponent(b)+"="+encodeURIComponent(a)))});return a+(a.indexOf("?")==-1?"?":"&")+
+c.join("&")}var o=c("$http"),w=[];m(e,function(a){w.push(F(a)?j.get(a):j.invoke(a))});l.pendingRequests=[];(function(a){m(arguments,function(a){l[a]=function(b,c){return l(x(c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){m(arguments,function(a){l[a]=function(b,c,d){return l(x(d||{},{method:a,url:b,data:c}))}})})("post","put");l.defaults=d;return l}]}function Wc(){this.$get=["$browser","$window","$document",function(b,a,c){return Xc(b,Yc,b.defer,a.angular.callbacks,c[0],
+a.location.protocol.replace(":",""))}]}function Xc(b,a,c,d,e,g){function i(a,b){var c=e.createElement("script"),d=function(){e.body.removeChild(c);b&&b()};c.type="text/javascript";c.src=a;$?c.onreadystatechange=function(){/loaded|complete/.test(c.readyState)&&d()}:c.onload=c.onerror=d;e.body.appendChild(c)}return function(e,h,k,j,l,n,r){function o(a,c,d,e){c=(h.match(Gb)||["",g])[1]=="file"?d?200:404:c;a(c==1223?204:c,d,e);b.$$completeOutstandingRequest(D)}b.$$incOutstandingRequestCount();h=h||b.url();
+if(E(e)=="jsonp"){var p="_"+(d.counter++).toString(36);d[p]=function(a){d[p].data=a};i(h.replace("JSON_CALLBACK","angular.callbacks."+p),function(){d[p].data?o(j,200,d[p].data):o(j,-2);delete d[p]})}else{var q=new a;q.open(e,h,!0);m(l,function(a,b){a&&q.setRequestHeader(b,a)});var v;q.onreadystatechange=function(){q.readyState==4&&o(j,v||q.status,q.responseText,q.getAllResponseHeaders())};if(r)q.withCredentials=!0;q.send(k||"");n>0&&c(function(){v=-1;q.abort()},n)}}}function Zc(){this.$get=function(){return{id:"en-us",
+NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),SHORTMONTH:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),DAY:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
+SHORTDAY:"Sun,Mon,Tue,Wed,Thu,Fri,Sat".split(","),AMPMS:["AM","PM"],medium:"MMM d, y h:mm:ss a","short":"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a"},pluralCat:function(b){return b===1?"one":"other"}}}}function $c(){this.$get=["$rootScope","$browser","$q","$exceptionHandler",function(b,a,c,d){function e(e,f,h){var k=c.defer(),j=k.promise,l=u(h)&&!h,f=a.defer(function(){try{k.resolve(e())}catch(a){k.reject(a),
+d(a)}l||b.$apply()},f),h=function(){delete g[j.$$timeoutId]};j.$$timeoutId=f;g[f]=k;j.then(h,h);return j}var g={};e.cancel=function(b){return b&&b.$$timeoutId in g?(g[b.$$timeoutId].reject("canceled"),a.defer.cancel(b.$$timeoutId)):!1};return e}]}function Qb(b){function a(a,e){return b.factory(a+c,e)}var c="Filter";this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+c)}}];a("currency",Rb);a("date",Sb);a("filter",ad);a("json",bd);a("limitTo",cd);a("lowercase",dd);a("number",
+Tb);a("orderBy",Ub);a("uppercase",ed)}function ad(){return function(b,a){if(!(b instanceof Array))return b;var c=[];c.check=function(a){for(var b=0;b<c.length;b++)if(!c[b](a))return!1;return!0};var d=function(a,b){if(b.charAt(0)==="!")return!d(a,b.substr(1));switch(typeof a){case "boolean":case "number":case "string":return(""+a).toLowerCase().indexOf(b)>-1;case "object":for(var c in a)if(c.charAt(0)!=="$"&&d(a[c],b))return!0;return!1;case "array":for(c=0;c<a.length;c++)if(d(a[c],b))return!0;return!1;
+default:return!1}};switch(typeof a){case "boolean":case "number":case "string":a={$:a};case "object":for(var e in a)e=="$"?function(){var b=(""+a[e]).toLowerCase();b&&c.push(function(a){return d(a,b)})}():function(){var b=e,f=(""+a[e]).toLowerCase();f&&c.push(function(a){return d(gb(a,b),f)})}();break;case "function":c.push(a);break;default:return b}for(var g=[],i=0;i<b.length;i++){var f=b[i];c.check(f)&&g.push(f)}return g}}function Rb(b){var a=b.NUMBER_FORMATS;return function(b,d){if(t(d))d=a.CURRENCY_SYM;
+return Vb(b,a.PATTERNS[1],a.GROUP_SEP,a.DECIMAL_SEP,2).replace(/\u00A4/g,d)}}function Tb(b){var a=b.NUMBER_FORMATS;return function(b,d){return Vb(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Vb(b,a,c,d,e){if(isNaN(b)||!isFinite(b))return"";var g=b<0,b=Math.abs(b),i=b+"",f="",h=[];if(i.indexOf("e")!==-1)f=i;else{i=(i.split(Wb)[1]||"").length;t(e)&&(e=Math.min(Math.max(a.minFrac,i),a.maxFrac));var i=Math.pow(10,e),b=Math.round(b*i)/i,b=(""+b).split(Wb),i=b[0],b=b[1]||"",k=0,j=a.lgSize,l=a.gSize;
+if(i.length>=j+l)for(var k=i.length-j,n=0;n<k;n++)(k-n)%l===0&&n!==0&&(f+=c),f+=i.charAt(n);for(n=k;n<i.length;n++)(i.length-n)%j===0&&n!==0&&(f+=c),f+=i.charAt(n);for(;b.length<e;)b+="0";e&&(f+=d+b.substr(0,e))}h.push(g?a.negPre:a.posPre);h.push(f);h.push(g?a.negSuf:a.posSuf);return h.join("")}function jb(b,a,c){var d="";b<0&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+b}function O(b,a,c,d){return function(e){e=e["get"+b]();if(c>0||e>-c)e+=c;e===0&&c==-12&&(e=
+12);return jb(e,a,d)}}function Ma(b,a){return function(c,d){var e=c["get"+b](),g=la(a?"SHORT"+b:b);return d[g][e]}}function Sb(b){function a(a){var b;if(b=a.match(c)){var a=new Date(0),g=0,i=0;b[9]&&(g=G(b[9]+b[10]),i=G(b[9]+b[11]));a.setUTCFullYear(G(b[1]),G(b[2])-1,G(b[3]));a.setUTCHours(G(b[4]||0)-g,G(b[5]||0)-i,G(b[6]||0),G(b[7]||0))}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/;return function(c,e){var g="",i=[],f,h,e=e||
+"mediumDate",e=b.DATETIME_FORMATS[e]||e;F(c)&&(c=fd.test(c)?G(c):a(c));wa(c)&&(c=new Date(c));if(!na(c))return c;for(;e;)(h=gd.exec(e))?(i=i.concat(ha.call(h,1)),e=i.pop()):(i.push(e),e=null);m(i,function(a){f=hd[a];g+=f?f(c,b.DATETIME_FORMATS):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function bd(){return function(b){return ca(b,!0)}}function cd(){return function(b,a){if(!(b instanceof Array))return b;var a=G(a),c=[],d,e;if(!b||!(b instanceof Array))return c;a>b.length?a=b.length:a<
+-b.length&&(a=-b.length);a>0?(d=0,e=a):(d=b.length+a,e=b.length);for(;d<e;d++)c.push(b[d]);return c}}function Ub(b){return function(a,c,d){function e(a,b){return Xa(b)?function(b,c){return a(c,b)}:a}if(!(a instanceof Array))return a;if(!c)return a;for(var c=K(c)?c:[c],c=Ua(c,function(a){var c=!1,d=a||ma;if(F(a)){if(a.charAt(0)=="+"||a.charAt(0)=="-")c=a.charAt(0)=="-",a=a.substring(1);d=b(a)}return e(function(a,b){var c;c=d(a);var e=d(b),f=typeof c,g=typeof e;f==g?(f=="string"&&(c=c.toLowerCase()),
+f=="string"&&(e=e.toLowerCase()),c=c===e?0:c<e?-1:1):c=f<g?-1:1;return c},c)}),g=[],i=0;i<a.length;i++)g.push(a[i]);return g.sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=c[d](a,b);if(e!==0)return e}return 0},d))}}function R(b){M(b)&&(b={link:b});b.restrict=b.restrict||"AC";return J(b)}function Xb(b,a){function c(a,c){c=c?"-"+ab(c,"-"):"";b.removeClass((a?Na:Oa)+c).addClass((a?Oa:Na)+c)}var d=this,e=b.parent().controller("form")||Pa,g=0,i=d.$error={};d.$name=a.name;d.$dirty=!1;d.$pristine=
+!0;d.$valid=!0;d.$invalid=!1;e.$addControl(d);b.addClass(Qa);c(!0);d.$addControl=function(a){a.$name&&!d.hasOwnProperty(a.$name)&&(d[a.$name]=a)};d.$removeControl=function(a){a.$name&&d[a.$name]===a&&delete d[a.$name];m(i,function(b,c){d.$setValidity(c,!0,a)})};d.$setValidity=function(a,b,k){var j=i[a];if(b){if(j&&(za(j,k),!j.length)){g--;if(!g)c(b),d.$valid=!0,d.$invalid=!1;i[a]=!1;c(!0,a);e.$setValidity(a,!0,d)}}else{g||c(b);if(j){if(Va(j,k)!=-1)return}else i[a]=j=[],g++,c(!1,a),e.$setValidity(a,
+!1,d);j.push(k);d.$valid=!1;d.$invalid=!0}};d.$setDirty=function(){b.removeClass(Qa).addClass(Yb);d.$dirty=!0;d.$pristine=!1}}function S(b){return t(b)||b===""||b===null||b!==b}function Ra(b,a,c,d,e,g){var i=function(){var c=Q(a.val());d.$viewValue!==c&&b.$apply(function(){d.$setViewValue(c)})};if(e.hasEvent("input"))a.bind("input",i);else{var f;a.bind("keydown",function(a){a=a.keyCode;a===91||15<a&&a<19||37<=a&&a<=40||f||(f=g.defer(function(){i();f=null}))});a.bind("change",i)}d.$render=function(){a.val(S(d.$viewValue)?
+"":d.$viewValue)};var h=c.ngPattern,k=function(a,b){return S(b)||a.test(b)?(d.$setValidity("pattern",!0),b):(d.$setValidity("pattern",!1),p)};h&&(h.match(/^\/(.*)\/$/)?(h=RegExp(h.substr(1,h.length-2)),e=function(a){return k(h,a)}):e=function(a){var c=b.$eval(h);if(!c||!c.test)throw new A("Expected "+h+" to be a RegExp but was "+c);return k(c,a)},d.$formatters.push(e),d.$parsers.push(e));if(c.ngMinlength){var j=G(c.ngMinlength),e=function(a){return!S(a)&&a.length<j?(d.$setValidity("minlength",!1),
+p):(d.$setValidity("minlength",!0),a)};d.$parsers.push(e);d.$formatters.push(e)}if(c.ngMaxlength){var l=G(c.ngMaxlength),c=function(a){return!S(a)&&a.length>l?(d.$setValidity("maxlength",!1),p):(d.$setValidity("maxlength",!0),a)};d.$parsers.push(c);d.$formatters.push(c)}}function kb(b,a){b="ngClass"+b;return R(function(c,d,e){c.$watch(e[b],function(b,e){if(a===!0||c.$index%2===a)e&&b!==e&&(I(e)&&!K(e)&&(e=Ua(e,function(a,b){if(a)return b})),d.removeClass(K(e)?e.join(" "):e)),I(b)&&!K(b)&&(b=Ua(b,
+function(a,b){if(a)return b})),b&&d.addClass(K(b)?b.join(" "):b)},!0)})}var E=function(b){return F(b)?b.toLowerCase():b},la=function(b){return F(b)?b.toUpperCase():b},A=T.Error,$=G((/msie (\d+)/.exec(E(navigator.userAgent))||[])[1]),y,ia,ha=[].slice,Sa=[].push,Ta=Object.prototype.toString,Zb=T.angular||(T.angular={}),ta,Db,Z=["0","0","0"];D.$inject=[];ma.$inject=[];Db=$<9?function(b){b=b.nodeName?b:b[0];return b.scopeName&&b.scopeName!="HTML"?la(b.scopeName+":"+b.nodeName):b.nodeName}:function(b){return b.nodeName?
+b.nodeName:b[0].nodeName};var lc=/[A-Z]/g,id={full:"1.0.2",major:1,minor:0,dot:2,codeName:"debilitating-awesomeness"},Ba=P.cache={},Aa=P.expando="ng-"+(new Date).getTime(),pc=1,$b=T.document.addEventListener?function(b,a,c){b.addEventListener(a,c,!1)}:function(b,a,c){b.attachEvent("on"+a,c)},eb=T.document.removeEventListener?function(b,a,c){b.removeEventListener(a,c,!1)}:function(b,a,c){b.detachEvent("on"+a,c)},nc=/([\:\-\_]+(.))/g,oc=/^moz([A-Z])/,ua=P.prototype={ready:function(b){function a(){c||
+(c=!0,b())}var c=!1;this.bind("DOMContentLoaded",a);P(T).bind("load",a)},toString:function(){var b=[];m(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return b>=0?y(this[b]):y(this[this.length+b])},length:0,push:Sa,sort:[].sort,splice:[].splice},Ea={};m("multiple,selected,checked,disabled,readOnly,required".split(","),function(b){Ea[E(b)]=b});var Ab={};m("input,select,option,textarea,button,form".split(","),function(b){Ab[la(b)]=!0});m({data:vb,inheritedData:Da,scope:function(b){return Da(b,
+"$scope")},controller:yb,injector:function(b){return Da(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:Ca,css:function(b,a,c){a=sb(a);if(u(c))b.style[a]=c;else{var d;$<=8&&(d=b.currentStyle&&b.currentStyle[a],d===""&&(d="auto"));d=d||b.style[a];$<=8&&(d=d===""?p:d);return d}},attr:function(b,a,c){var d=E(a);if(Ea[d])if(u(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));else return b[a]||(b.attributes.getNamedItem(a)||D).specified?d:p;else if(u(c))b.setAttribute(a,
+c);else if(b.getAttribute)return b=b.getAttribute(a,2),b===null?p:b},prop:function(b,a,c){if(u(c))b[a]=c;else return b[a]},text:x($<9?function(b,a){if(b.nodeType==1){if(t(a))return b.innerText;b.innerText=a}else{if(t(a))return b.nodeValue;b.nodeValue=a}}:function(b,a){if(t(a))return b.textContent;b.textContent=a},{$dv:""}),val:function(b,a){if(t(a))return b.value;b.value=a},html:function(b,a){if(t(a))return b.innerHTML;for(var c=0,d=b.childNodes;c<d.length;c++)sa(d[c]);b.innerHTML=a}},function(b,
+a){P.prototype[a]=function(a,d){var e,g;if((b.length==2&&b!==Ca&&b!==yb?a:d)===p)if(I(a)){for(e=0;e<this.length;e++)if(b===vb)b(this[e],a);else for(g in a)b(this[e],g,a[g]);return this}else{if(this.length)return b(this[0],a,d)}else{for(e=0;e<this.length;e++)b(this[e],a,d);return this}return b.$dv}});m({removeData:tb,dealoc:sa,bind:function a(c,d,e){var g=da(c,"events"),i=da(c,"handle");g||da(c,"events",g={});i||da(c,"handle",i=qc(c,g));m(d.split(" "),function(d){var h=g[d];if(!h){if(d=="mouseenter"||
+d=="mouseleave"){var k=0;g.mouseenter=[];g.mouseleave=[];a(c,"mouseover",function(a){k++;k==1&&i(a,"mouseenter")});a(c,"mouseout",function(a){k--;k==0&&i(a,"mouseleave")})}else $b(c,d,i),g[d]=[];h=g[d]}h.push(e)})},unbind:ub,replaceWith:function(a,c){var d,e=a.parentNode;sa(a);m(new P(c),function(c){d?e.insertBefore(c,d.nextSibling):e.replaceChild(c,a);d=c})},children:function(a){var c=[];m(a.childNodes,function(a){a.nodeName!="#text"&&c.push(a)});return c},contents:function(a){return a.childNodes},
+append:function(a,c){m(new P(c),function(c){a.nodeType===1&&a.appendChild(c)})},prepend:function(a,c){if(a.nodeType===1){var d=a.firstChild;m(new P(c),function(c){d?a.insertBefore(c,d):(a.appendChild(c),d=c)})}},wrap:function(a,c){var c=y(c)[0],d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:function(a){sa(a);var c=a.parentNode;c&&c.removeChild(a)},after:function(a,c){var d=a,e=a.parentNode;m(new P(c),function(a){e.insertBefore(a,d.nextSibling);d=a})},addClass:xb,removeClass:wb,toggleClass:function(a,
+c,d){t(d)&&(d=!Ca(a,c));(d?xb:wb)(a,c)},parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},next:function(a){return a.nextSibling},find:function(a,c){return a.getElementsByTagName(c)},clone:db},function(a,c){P.prototype[c]=function(c,e){for(var g,i=0;i<this.length;i++)g==p?(g=a(this[i],c,e),g!==p&&(g=y(g))):cb(g,a(this[i],c,e));return g==p?this:g}});Fa.prototype={put:function(a,c){this[ja(a)]=c},get:function(a){return this[ja(a)]},remove:function(a){var c=this[a=ja(a)];delete this[a];
+return c}};fb.prototype={push:function(a,c){var d=this[a=ja(a)];d?d.push(c):this[a]=[c]},shift:function(a){var c=this[a=ja(a)];if(c)return c.length==1?(delete this[a],c[0]):c.shift()}};var sc=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,tc=/,/,uc=/^\s*(_?)(.+?)\1\s*$/,rc=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Eb="Non-assignable model expression: ";Cb.$inject=["$provide"];var Ac=/^(x[\:\-_]|data[\:\-_])/i,Gb=/^([^:]+):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?(\/[^\?#]*)?(\?([^#]*))?(#(.*))?$/,ac=/^([^\?#]*)?(\?([^#]*))?(#(.*))?$/,
+Hc=ac,Hb={http:80,https:443,ftp:21};hb.prototype={$$replace:!1,absUrl:Ka("$$absUrl"),url:function(a,c){if(t(a))return this.$$url;var d=ac.exec(a);d[1]&&this.path(decodeURIComponent(d[1]));if(d[2]||d[1])this.search(d[3]||"");this.hash(d[5]||"",c);return this},protocol:Ka("$$protocol"),host:Ka("$$host"),port:Ka("$$port"),path:Jb("$$path",function(a){return a.charAt(0)=="/"?a:"/"+a}),search:function(a,c){if(t(a))return this.$$search;u(c)?c===null?delete this.$$search[a]:this.$$search[a]=c:this.$$search=
+F(a)?Ya(a):a;this.$$compose();return this},hash:Jb("$$hash",ma),replace:function(){this.$$replace=!0;return this}};Ja.prototype=ya(hb.prototype);Ib.prototype=ya(Ja.prototype);var La={"null":function(){return null},"true":function(){return!0},"false":function(){return!1},undefined:D,"+":function(a,c,d,e){d=d(a,c);e=e(a,c);return(u(d)?d:0)+(u(e)?e:0)},"-":function(a,c,d,e){d=d(a,c);e=e(a,c);return(u(d)?d:0)-(u(e)?e:0)},"*":function(a,c,d,e){return d(a,c)*e(a,c)},"/":function(a,c,d,e){return d(a,c)/
+e(a,c)},"%":function(a,c,d,e){return d(a,c)%e(a,c)},"^":function(a,c,d,e){return d(a,c)^e(a,c)},"=":D,"==":function(a,c,d,e){return d(a,c)==e(a,c)},"!=":function(a,c,d,e){return d(a,c)!=e(a,c)},"<":function(a,c,d,e){return d(a,c)<e(a,c)},">":function(a,c,d,e){return d(a,c)>e(a,c)},"<=":function(a,c,d,e){return d(a,c)<=e(a,c)},">=":function(a,c,d,e){return d(a,c)>=e(a,c)},"&&":function(a,c,d,e){return d(a,c)&&e(a,c)},"||":function(a,c,d,e){return d(a,c)||e(a,c)},"&":function(a,c,d,e){return d(a,c)&
+e(a,c)},"|":function(a,c,d,e){return e(a,c)(a,c,d(a,c))},"!":function(a,c,d){return!d(a,c)}},Lc={n:"\n",f:"\u000c",r:"\r",t:"\t",v:"\u000b","'":"'",'"':'"'},ib={},Yc=T.XMLHttpRequest||function(){try{return new ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(c){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(d){}throw new A("This browser does not support XMLHttpRequest.");};Qb.$inject=["$provide"];Rb.$inject=["$locale"];Tb.$inject=["$locale"];
+var Wb=".",hd={yyyy:O("FullYear",4),yy:O("FullYear",2,0,!0),y:O("FullYear",1),MMMM:Ma("Month"),MMM:Ma("Month",!0),MM:O("Month",2,1),M:O("Month",1,1),dd:O("Date",2),d:O("Date",1),HH:O("Hours",2),H:O("Hours",1),hh:O("Hours",2,-12),h:O("Hours",1,-12),mm:O("Minutes",2),m:O("Minutes",1),ss:O("Seconds",2),s:O("Seconds",1),EEEE:Ma("Day"),EEE:Ma("Day",!0),a:function(a,c){return a.getHours()<12?c.AMPMS[0]:c.AMPMS[1]},Z:function(a){a=a.getTimezoneOffset();return jb(a/60,2)+jb(Math.abs(a%60),2)}},gd=/((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z))(.*)/,
+fd=/^\d+$/;Sb.$inject=["$locale"];var dd=J(E),ed=J(la);Ub.$inject=["$parse"];var jd=J({restrict:"E",compile:function(a,c){c.href||c.$set("href","");return function(a,c){c.bind("click",function(a){c.attr("href")||a.preventDefault()})}}}),lb={};m(Ea,function(a,c){var d=fa("ng-"+c);lb[d]=function(){return{priority:100,compile:function(){return function(a,g,i){a.$watch(i[d],function(a){i.$set(c,!!a)})}}}}});m(["src","href"],function(a){var c=fa("ng-"+a);lb[c]=function(){return{priority:99,link:function(d,
+e,g){g.$observe(c,function(c){g.$set(a,c);$&&e.prop(a,c)})}}}});var Pa={$addControl:D,$removeControl:D,$setValidity:D,$setDirty:D};Xb.$inject=["$element","$attrs","$scope"];var Sa=function(a){return["$timeout",function(c){var d={name:"form",restrict:"E",controller:Xb,compile:function(){return{pre:function(a,d,i,f){if(!i.action){var h=function(a){a.preventDefault?a.preventDefault():a.returnValue=!1};$b(d[0],"submit",h);d.bind("$destroy",function(){c(function(){eb(d[0],"submit",h)},0,!1)})}var k=d.parent().controller("form"),
+j=i.name||i.ngForm;j&&(a[j]=f);k&&d.bind("$destroy",function(){k.$removeControl(f);j&&(a[j]=p);x(f,Pa)})}}}};return a?x(U(d),{restrict:"EAC"}):d}]},kd=Sa(),ld=Sa(!0),md=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,nd=/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/,od=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,bc={text:Ra,number:function(a,c,d,e,g,i){Ra(a,c,d,e,g,i);e.$parsers.push(function(a){var c=S(a);return c||od.test(a)?(e.$setValidity("number",!0),a===""?
+null:c?a:parseFloat(a)):(e.$setValidity("number",!1),p)});e.$formatters.push(function(a){return S(a)?"":""+a});if(d.min){var f=parseFloat(d.min),a=function(a){return!S(a)&&a<f?(e.$setValidity("min",!1),p):(e.$setValidity("min",!0),a)};e.$parsers.push(a);e.$formatters.push(a)}if(d.max){var h=parseFloat(d.max),d=function(a){return!S(a)&&a>h?(e.$setValidity("max",!1),p):(e.$setValidity("max",!0),a)};e.$parsers.push(d);e.$formatters.push(d)}e.$formatters.push(function(a){return S(a)||wa(a)?(e.$setValidity("number",
+!0),a):(e.$setValidity("number",!1),p)})},url:function(a,c,d,e,g,i){Ra(a,c,d,e,g,i);a=function(a){return S(a)||md.test(a)?(e.$setValidity("url",!0),a):(e.$setValidity("url",!1),p)};e.$formatters.push(a);e.$parsers.push(a)},email:function(a,c,d,e,g,i){Ra(a,c,d,e,g,i);a=function(a){return S(a)||nd.test(a)?(e.$setValidity("email",!0),a):(e.$setValidity("email",!1),p)};e.$formatters.push(a);e.$parsers.push(a)},radio:function(a,c,d,e){t(d.name)&&c.attr("name",xa());c.bind("click",function(){c[0].checked&&
+a.$apply(function(){e.$setViewValue(d.value)})});e.$render=function(){c[0].checked=d.value==e.$viewValue};d.$observe("value",e.$render)},checkbox:function(a,c,d,e){var g=d.ngTrueValue,i=d.ngFalseValue;F(g)||(g=!0);F(i)||(i=!1);c.bind("click",function(){a.$apply(function(){e.$setViewValue(c[0].checked)})});e.$render=function(){c[0].checked=e.$viewValue};e.$formatters.push(function(a){return a===g});e.$parsers.push(function(a){return a?g:i})},hidden:D,button:D,submit:D,reset:D},cc=["$browser","$sniffer",
+function(a,c){return{restrict:"E",require:"?ngModel",link:function(d,e,g,i){i&&(bc[E(g.type)]||bc.text)(d,e,g,i,c,a)}}}],Oa="ng-valid",Na="ng-invalid",Qa="ng-pristine",Yb="ng-dirty",pd=["$scope","$exceptionHandler","$attrs","$element","$parse",function(a,c,d,e,g){function i(a,c){c=c?"-"+ab(c,"-"):"";e.removeClass((a?Na:Oa)+c).addClass((a?Oa:Na)+c)}this.$modelValue=this.$viewValue=Number.NaN;this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$pristine=!0;this.$dirty=!1;this.$valid=
+!0;this.$invalid=!1;this.$name=d.name;var g=g(d.ngModel),f=g.assign;if(!f)throw A(Eb+d.ngModel+" ("+pa(e)+")");this.$render=D;var h=e.inheritedData("$formController")||Pa,k=0,j=this.$error={};e.addClass(Qa);i(!0);this.$setValidity=function(a,c){if(j[a]!==!c){if(c){if(j[a]&&k--,!k)i(!0),this.$valid=!0,this.$invalid=!1}else i(!1),this.$invalid=!0,this.$valid=!1,k++;j[a]=!c;i(c,a);h.$setValidity(a,c,this)}};this.$setViewValue=function(d){this.$viewValue=d;if(this.$pristine)this.$dirty=!0,this.$pristine=
+!1,e.removeClass(Qa).addClass(Yb),h.$setDirty();m(this.$parsers,function(a){d=a(d)});if(this.$modelValue!==d)this.$modelValue=d,f(a,d),m(this.$viewChangeListeners,function(a){try{a()}catch(d){c(d)}})};var l=this;a.$watch(g,function(a){if(l.$modelValue!==a){var c=l.$formatters,d=c.length;for(l.$modelValue=a;d--;)a=c[d](a);if(l.$viewValue!==a)l.$viewValue=a,l.$render()}})}],qd=function(){return{require:["ngModel","^?form"],controller:pd,link:function(a,c,d,e){var g=e[0],i=e[1]||Pa;i.$addControl(g);
+c.bind("$destroy",function(){i.$removeControl(g)})}}},rd=J({require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),dc=function(){return{require:"?ngModel",link:function(a,c,d,e){if(e){d.required=!0;var g=function(a){if(d.required&&(S(a)||a===!1))e.$setValidity("required",!1);else return e.$setValidity("required",!0),a};e.$formatters.push(g);e.$parsers.unshift(g);d.$observe("required",function(){g(e.$viewValue)})}}}},sd=function(){return{require:"ngModel",
+link:function(a,c,d,e){var g=(a=/\/(.*)\//.exec(d.ngList))&&RegExp(a[1])||d.ngList||",";e.$parsers.push(function(a){var c=[];a&&m(a.split(g),function(a){a&&c.push(Q(a))});return c});e.$formatters.push(function(a){return K(a)?a.join(", "):p})}}},td=/^(true|false|\d+)$/,ud=function(){return{priority:100,compile:function(a,c){return td.test(c.ngValue)?function(a,c,g){g.$set("value",a.$eval(g.ngValue))}:function(a,c,g){a.$watch(g.ngValue,function(a){g.$set("value",a,!1)})}}}},vd=R(function(a,c,d){c.addClass("ng-binding").data("$binding",
+d.ngBind);a.$watch(d.ngBind,function(a){c.text(a==p?"":a)})}),wd=["$interpolate",function(a){return function(c,d,e){c=a(d.attr(e.$attr.ngBindTemplate));d.addClass("ng-binding").data("$binding",c);e.$observe("ngBindTemplate",function(a){d.text(a)})}}],xd=[function(){return function(a,c,d){c.addClass("ng-binding").data("$binding",d.ngBindHtmlUnsafe);a.$watch(d.ngBindHtmlUnsafe,function(a){c.html(a||"")})}}],yd=kb("",!0),zd=kb("Odd",0),Ad=kb("Even",1),Bd=R({compile:function(a,c){c.$set("ngCloak",p);
+a.removeClass("ng-cloak")}}),Cd=[function(){return{scope:!0,controller:"@"}}],Dd=["$sniffer",function(a){return{priority:1E3,compile:function(){a.csp=!0}}}],ec={};m("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave".split(" "),function(a){var c=fa("ng-"+a);ec[c]=["$parse",function(d){return function(e,g,i){var f=d(i[c]);g.bind(E(a),function(a){e.$apply(function(){f(e,{$event:a})})})}}]});var Ed=R(function(a,c,d){c.bind("submit",function(){a.$apply(d.ngSubmit)})}),
+Fd=["$http","$templateCache","$anchorScroll","$compile",function(a,c,d,e){return{restrict:"ECA",terminal:!0,compile:function(g,i){var f=i.ngInclude||i.src,h=i.onload||"",k=i.autoscroll;return function(g,i){var n=0,m,o=function(){m&&(m.$destroy(),m=null);i.html("")};g.$watch(f,function(f){var q=++n;f?a.get(f,{cache:c}).success(function(a){q===n&&(m&&m.$destroy(),m=g.$new(),i.html(a),e(i.contents())(m),u(k)&&(!k||g.$eval(k))&&d(),m.$emit("$includeContentLoaded"),g.$eval(h))}).error(function(){q===n&&
+o()}):o()})}}}}],Gd=R({compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),Hd=R({terminal:!0,priority:1E3}),Id=["$locale","$interpolate",function(a,c){var d=/{}/g;return{restrict:"EA",link:function(e,g,i){var f=i.count,h=g.attr(i.$attr.when),k=i.offset||0,j=e.$eval(h),l={},n=c.startSymbol(),r=c.endSymbol();m(j,function(a,e){l[e]=c(a.replace(d,n+f+"-"+k+r))});e.$watch(function(){var c=parseFloat(e.$eval(f));return isNaN(c)?"":(j[c]||(c=a.pluralCat(c-k)),l[c](e,g,!0))},function(a){g.text(a)})}}}],
+Jd=R({transclude:"element",priority:1E3,terminal:!0,compile:function(a,c,d){return function(a,c,i){var f=i.ngRepeat,i=f.match(/^\s*(.+)\s+in\s+(.*)\s*$/),h,k,j;if(!i)throw A("Expected ngRepeat in form of '_item_ in _collection_' but got '"+f+"'.");f=i[1];h=i[2];i=f.match(/^(?:([\$\w]+)|\(([\$\w]+)\s*,\s*([\$\w]+)\))$/);if(!i)throw A("'item' in 'item in collection' should be identifier or (key, value) but got '"+f+"'.");k=i[3]||i[1];j=i[2];var l=new fb;a.$watch(function(a){var e,f,i=a.$eval(h),m=hc(i,
+!0),p,y=new fb,B,z,t,u,s=c;if(K(i))t=i||[];else{t=[];for(B in i)i.hasOwnProperty(B)&&B.charAt(0)!="$"&&t.push(B);t.sort()}e=0;for(f=t.length;e<f;e++){B=i===t?e:t[e];z=i[B];if(u=l.shift(z)){p=u.scope;y.push(z,u);if(e!==u.index)u.index=e,s.after(u.element);s=u.element}else p=a.$new();p[k]=z;j&&(p[j]=B);p.$index=e;p.$first=e===0;p.$last=e===m-1;p.$middle=!(p.$first||p.$last);u||d(p,function(a){s.after(a);u={scope:p,element:s=a,index:e};y.push(z,u)})}for(B in l)if(l.hasOwnProperty(B))for(t=l[B];t.length;)z=
+t.pop(),z.element.remove(),z.scope.$destroy();l=y})}}}),Kd=R(function(a,c,d){a.$watch(d.ngShow,function(a){c.css("display",Xa(a)?"":"none")})}),Ld=R(function(a,c,d){a.$watch(d.ngHide,function(a){c.css("display",Xa(a)?"none":"")})}),Md=R(function(a,c,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&m(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Nd=J({restrict:"EA",compile:function(a,c){var d=c.ngSwitch||c.on,e={};a.data("ng-switch",e);return function(a,i){var f,h,k;a.$watch(d,function(d){h&&(k.$destroy(),
+h.remove(),h=k=null);if(f=e["!"+d]||e["?"])a.$eval(c.change),k=a.$new(),f(k,function(a){h=a;i.append(a)})})}}}),Od=R({transclude:"element",priority:500,compile:function(a,c,d){a=a.inheritedData("ng-switch");qa(a);a["!"+c.ngSwitchWhen]=d}}),Pd=R({transclude:"element",priority:500,compile:function(a,c,d){a=a.inheritedData("ng-switch");qa(a);a["?"]=d}}),Qd=R({controller:["$transclude","$element",function(a,c){a(function(a){c.append(a)})}]}),Rd=["$http","$templateCache","$route","$anchorScroll","$compile",
+"$controller",function(a,c,d,e,g,i){return{restrict:"ECA",terminal:!0,link:function(a,c,k){function j(){var j=d.current&&d.current.locals,k=j&&j.$template;if(k){c.html(k);l&&(l.$destroy(),l=null);var k=g(c.contents()),m=d.current;l=m.scope=a.$new();if(m.controller)j.$scope=l,j=i(m.controller,j),c.contents().data("$ngControllerController",j);k(l);l.$emit("$viewContentLoaded");l.$eval(n);e()}else c.html(""),l&&(l.$destroy(),l=null)}var l,n=k.onload||"";a.$on("$routeChangeSuccess",j);j()}}}],Sd=["$templateCache",
+function(a){return{restrict:"E",terminal:!0,compile:function(c,d){d.type=="text/ng-template"&&a.put(d.id,c[0].text)}}}],Td=J({terminal:!0}),Ud=["$compile","$parse",function(a,c){var d=/^\s*(.*?)(?:\s+as\s+(.*?))?(?:\s+group\s+by\s+(.*))?\s+for\s+(?:([\$\w][\$\w\d]*)|(?:\(\s*([\$\w][\$\w\d]*)\s*,\s*([\$\w][\$\w\d]*)\s*\)))\s+in\s+(.*)$/,e={$setViewValue:D};return{restrict:"E",require:["select","?ngModel"],controller:["$element","$scope","$attrs",function(a,c,d){var h=this,k={},j=e,l;h.databound=d.ngModel;
+h.init=function(a,c,d){j=a;l=d};h.addOption=function(c){k[c]=!0;j.$viewValue==c&&(a.val(c),l.parent()&&l.remove())};h.removeOption=function(a){this.hasOption(a)&&(delete k[a],j.$viewValue==a&&this.renderUnknownOption(a))};h.renderUnknownOption=function(c){c="? "+ja(c)+" ?";l.val(c);a.prepend(l);a.val(c);l.prop("selected",!0)};h.hasOption=function(a){return k.hasOwnProperty(a)};c.$on("$destroy",function(){h.renderUnknownOption=D})}],link:function(e,i,f,h){function k(a,c,d,e){d.$render=function(){var a=
+d.$viewValue;e.hasOption(a)?(z.parent()&&z.remove(),c.val(a),a===""&&v.prop("selected",!0)):t(a)&&v?c.val(""):e.renderUnknownOption(a)};c.bind("change",function(){a.$apply(function(){z.parent()&&z.remove();d.$setViewValue(c.val())})})}function j(a,c,d){var e;d.$render=function(){var a=new Fa(d.$viewValue);m(c.children(),function(c){c.selected=u(a.get(c.value))})};a.$watch(function(){ga(e,d.$viewValue)||(e=U(d.$viewValue),d.$render())});c.bind("change",function(){a.$apply(function(){var a=[];m(c.children(),
+function(c){c.selected&&a.push(c.value)});d.$setViewValue(a)})})}function l(e,f,g){function h(){var a={"":[]},c=[""],d,i,t,u,s;t=g.$modelValue;u=r(e)||[];var y=l?mb(u):u,z,w,x;w={};s=!1;var C,A;if(o)s=new Fa(t);else if(t===null||q)a[""].push({selected:t===null,id:"",label:""}),s=!0;for(x=0;z=y.length,x<z;x++){w[k]=u[l?w[l]=y[x]:x];d=m(e,w)||"";if(!(i=a[d]))i=a[d]=[],c.push(d);o?d=s.remove(n(e,w))!=p:(d=t===n(e,w),s=s||d);i.push({id:l?y[x]:x,label:j(e,w)||"",selected:d})}!o&&!s&&a[""].unshift({id:"?",
+label:"",selected:!0});w=0;for(y=c.length;w<y;w++){d=c[w];i=a[d];if(v.length<=w)t={element:B.clone().attr("label",d),label:i.label},u=[t],v.push(u),f.append(t.element);else if(u=v[w],t=u[0],t.label!=d)t.element.attr("label",t.label=d);C=null;x=0;for(z=i.length;x<z;x++)if(d=i[x],s=u[x+1]){C=s.element;if(s.label!==d.label)C.text(s.label=d.label);if(s.id!==d.id)C.val(s.id=d.id);if(s.element.selected!==d.selected)C.prop("selected",s.selected=d.selected)}else d.id===""&&q?A=q:(A=D.clone()).val(d.id).attr("selected",
+d.selected).text(d.label),u.push({element:A,label:d.label,id:d.id,selected:d.selected}),C?C.after(A):t.element.append(A),C=A;for(x++;u.length>x;)u.pop().element.remove()}for(;v.length>w;)v.pop()[0].element.remove()}var i;if(!(i=w.match(d)))throw A("Expected ngOptions in form of '_select_ (as _label_)? for (_key_,)?_value_ in _collection_' but got '"+w+"'.");var j=c(i[2]||i[1]),k=i[4]||i[6],l=i[5],m=c(i[3]||""),n=c(i[2]?i[1]:k),r=c(i[7]),v=[[{element:f,label:""}]];q&&(a(q)(e),q.removeClass("ng-scope"),
+q.remove());f.html("");f.bind("change",function(){e.$apply(function(){var a,c=r(e)||[],d={},h,i,j,m,q,s;if(o){i=[];m=0;for(s=v.length;m<s;m++){a=v[m];j=1;for(q=a.length;j<q;j++)if((h=a[j].element)[0].selected)h=h.val(),l&&(d[l]=h),d[k]=c[h],i.push(n(e,d))}}else h=f.val(),h=="?"?i=p:h==""?i=null:(d[k]=c[h],l&&(d[l]=h),i=n(e,d));g.$setViewValue(i)})});g.$render=h;e.$watch(h)}if(h[1]){for(var n=h[0],r=h[1],o=f.multiple,w=f.ngOptions,q=!1,v,D=y(ba.createElement("option")),B=y(ba.createElement("optgroup")),
+z=D.clone(),h=0,x=i.children(),E=x.length;h<E;h++)if(x[h].value==""){v=q=x.eq(h);break}n.init(r,q,z);if(o&&(f.required||f.ngRequired)){var s=function(a){r.$setValidity("required",!f.required||a&&a.length);return a};r.$parsers.push(s);r.$formatters.unshift(s);f.$observe("required",function(){s(r.$viewValue)})}w?l(e,i,r):o?j(e,i,r):k(e,i,r,n)}}}}],Vd=["$interpolate",function(a){var c={addOption:D,removeOption:D};return{restrict:"E",priority:100,compile:function(d,e){if(t(e.value)){var g=a(d.text(),
+!0);g||e.$set("value",d.text())}return function(a,d,e){var k=d.parent(),j=k.data("$selectController")||k.parent().data("$selectController");j&&j.databound?d.prop("selected",!1):j=c;g?a.$watch(g,function(a,c){e.$set("value",a);a!==c&&j.removeOption(c);j.addOption(a)}):j.addOption(e.value);d.bind("$destroy",function(){j.removeOption(e.value)})}}}}],Wd=J({restrict:"E",terminal:!0});(ia=T.jQuery)?(y=ia,x(ia.fn,{scope:ua.scope,controller:ua.controller,injector:ua.injector,inheritedData:ua.inheritedData}),
+bb("remove",!0),bb("empty"),bb("html")):y=P;Zb.element=y;(function(a){x(a,{bootstrap:qb,copy:U,extend:x,equals:ga,element:y,forEach:m,injector:rb,noop:D,bind:Wa,toJson:ca,fromJson:ob,identity:ma,isUndefined:t,isDefined:u,isString:F,isFunction:M,isObject:I,isNumber:wa,isElement:gc,isArray:K,version:id,isDate:na,lowercase:E,uppercase:la,callbacks:{counter:0}});ta=mc(T);try{ta("ngLocale")}catch(c){ta("ngLocale",[]).provider("$locale",Zc)}ta("ng",["ngLocale"],["$provide",function(a){a.provider("$compile",
+Cb).directive({a:jd,input:cc,textarea:cc,form:kd,script:Sd,select:Ud,style:Wd,option:Vd,ngBind:vd,ngBindHtmlUnsafe:xd,ngBindTemplate:wd,ngClass:yd,ngClassEven:Ad,ngClassOdd:zd,ngCsp:Dd,ngCloak:Bd,ngController:Cd,ngForm:ld,ngHide:Ld,ngInclude:Fd,ngInit:Gd,ngNonBindable:Hd,ngPluralize:Id,ngRepeat:Jd,ngShow:Kd,ngSubmit:Ed,ngStyle:Md,ngSwitch:Nd,ngSwitchWhen:Od,ngSwitchDefault:Pd,ngOptions:Td,ngView:Rd,ngTransclude:Qd,ngModel:qd,ngList:sd,ngChange:rd,required:dc,ngRequired:dc,ngValue:ud}).directive(lb).directive(ec);
+a.provider({$anchorScroll:vc,$browser:xc,$cacheFactory:yc,$controller:Bc,$document:Cc,$exceptionHandler:Dc,$filter:Qb,$interpolate:Ec,$http:Vc,$httpBackend:Wc,$location:Ic,$log:Jc,$parse:Nc,$route:Qc,$routeParams:Rc,$rootScope:Sc,$q:Oc,$sniffer:Tc,$templateCache:zc,$timeout:$c,$window:Uc})}])})(Zb);y(ba).ready(function(){kc(ba,qb)})})(window,document);angular.element(document).find("head").append('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak{display:none;}ng\\:form{display:block;}</style>');
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index c5af08e0a3..67c10480f1 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -1,7 +1,4 @@
-- content_for :head do
-  = javascript_include_tag "http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"
-
-= angular_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path, :html => {'ng-app' => '', 'ng-controller' => 'AdminEnterpriseFeesCtrl'} do |enterprise_fee_set_form|
+= angular_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path, :html => {'ng-app' => 'enterprise_fees', 'ng-controller' => 'AdminEnterpriseFeesCtrl'} do |enterprise_fee_set_form|
   - if @enterprise_fee_set.errors.present?
     %h2 Errors
     %ul
@@ -28,22 +25,11 @@
           %td= f.angular_text_field :name
           %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
           %td{'ng-bind-html-unsafe' => 'enterprise_fee.calculator_settings'}
-          %td Delete
+          %td{'spree-delete-resource' => "1"}
 
       %tr
         %td ---
 
-      / -- Manual HTML / form_tag
-      %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees'}
-        %td
-          %select{:id => 'enterprise_fee_set_collection_attributes_{{ $index }}_enterprise_id', :name => "enterprise_fee_set[collection_attributes][{{ $index }}][enterprise_id]", 'ng-model' => 'enterprise_fee'}
-            %option{:value => ""}
-            - Enterprise.all.each do |enterprise|
-              %option{:value => enterprise.id, 'ng-selected' => "enterprise_fee.enterprise_id == #{enterprise.id}"}= enterprise.name
-        %td= select_tag :fee_type, angular_options_for_select(enterprise_fee_type_options, 'enterprise_fee.fee_type')
-        %td= text_field_tag 'enterprise_fee_set[collection_attributes][{{ $index }}][name]', '{{ enterprise_fee.name }}', :id => 'enterprise_fee_set_collection_attributes_{{ $index }}_name'
-        %td {{ enterprise_fee.calculator_type }}
-
       / -- Plain old Rails
       = enterprise_fee_set_form.fields_for :collection do |f|
         - enterprise_fee = f.object

From 52ebe2c495543856b84919160b062d9fe03d711d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 Nov 2012 16:38:25 +1100
Subject: [PATCH 22/29] Provide proper names for angular select fields, add
 angular hidden field

---
 app/helpers/angular_form_builder.rb           | 26 +++++++++++++++----
 .../admin/enterprise_fees/index.html.haml     | 21 +++------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 3d51291cbc..8444928f91 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -13,19 +13,35 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
     # @fields_for_record_name --> :collection
     # @object.send(@fields_for_record_name).first.class.to_s.underscore --> enterprise_fee
 
-    name = "#{@object_name}[#{@fields_for_record_name}_attributes][{{ $index }}][#{method}]"
-    id = "#{@object_name}_#{@fields_for_record_name}_attributes_{{ $index }}_#{method}"
     value = "{{ #{@object.send(@fields_for_record_name).first.class.to_s.underscore}.#{method} }}"
 
-    @template.text_field_tag name, value, :id => id
+    @template.text_field_tag angular_name(method), value, :id => angular_id(method)
+  end
+
+  def angular_hidden_field(method, options = {})
+    value = "{{ #{@object.send(@fields_for_record_name).first.class.to_s.underscore}.#{method} }}"
+
+    @template.hidden_field_tag angular_name(method), value, :id => angular_id(method)
   end
 
   def angular_select(method, choices, angular_field, options = {})
-    @template.select_tag method, @template.angular_options_for_select(choices, angular_field), options.reverse_merge!({'ng-model' => angular_field})
+    options.reverse_merge!({'id' => angular_id(method)})
+
+    @template.select_tag angular_name(method), @template.angular_options_for_select(choices, angular_field), options
   end
 
   def angular_collection_select(method, collection, value_method, text_method, angular_field, options = {})
-    @template.select_tag method, @template.angular_options_from_collection_for_select(collection, value_method, text_method, angular_field), options.reverse_merge!({'ng-model' => angular_field})
+    options.reverse_merge!({'id' => angular_id(method)})
+
+    @template.select_tag angular_name(method), @template.angular_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
   end
 
+  private
+  def angular_name(method)
+    "#{@object_name}[#{@fields_for_record_name}_attributes][{{ $index }}][#{method}]"
+  end
+
+  def angular_id(method)
+    "#{@object_name}_#{@fields_for_record_name}_attributes_{{ $index }}_#{method}"
+  end
 end
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 67c10480f1..0ce3168b53 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -20,28 +20,13 @@
       / -- Finished product
       = enterprise_fee_set_form.angular_fields_for :collection do |f|
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees | filter:query'}
-          %td= f.angular_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
+          %td
+            = f.angular_hidden_field :id
+            = f.angular_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
           %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
           %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
           %td{'ng-bind-html-unsafe' => 'enterprise_fee.calculator_settings'}
           %td{'spree-delete-resource' => "1"}
 
-      %tr
-        %td ---
-
-      / -- Plain old Rails
-      = enterprise_fee_set_form.fields_for :collection do |f|
-        - enterprise_fee = f.object
-        %tr
-          %td= f.collection_select :enterprise_id, Enterprise.all, :id, :name, :include_blank => true
-          %td= f.select :fee_type, enterprise_fee_type_options
-          %td= f.text_field :name
-          %td= f.collection_select :calculator_type, @calculators, :name, :description, {}, {:class => 'calculator_type'}
-          %td
-            - if !enterprise_fee.new_record?
-              .calculator-settings
-                = f.fields_for :calculator do |calculator_form|
-                  = preference_fields(enterprise_fee.calculator, calculator_form)
-          %td= link_to_delete enterprise_fee unless enterprise_fee.new_record?
   = enterprise_fee_set_form.submit 'Update'

From 5e0a5654ffcd7d0138ddf03251e2ba6792c61ad2 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 Nov 2012 17:02:58 +1100
Subject: [PATCH 23/29] Correctly index calculator fields. Adds
 ng-bind-html-unsafe-compiled.

---
 app/assets/javascripts/admin/enterprise_fees.js    |  8 +++++++-
 .../admin/enterprise_fees_controller.rb            |  2 +-
 app/models/model_set.rb                            |  3 +--
 app/presenters/enterprise_fee_presenter.rb         |  9 ++++-----
 .../enterprise_fees/_calculator_settings.html.haml | 14 ++++++++------
 app/views/admin/enterprise_fees/index.html.haml    |  3 +--
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/admin/enterprise_fees.js b/app/assets/javascripts/admin/enterprise_fees.js
index 5e586ccdc3..a497c8cf96 100644
--- a/app/assets/javascripts/admin/enterprise_fees.js
+++ b/app/assets/javascripts/admin/enterprise_fees.js
@@ -4,8 +4,14 @@ function AdminEnterpriseFeesCtrl($scope, $http) {
   });
 }
 
-
 angular.module('enterprise_fees', [])
+  .directive('ngBindHtmlUnsafeCompiled', function($compile) {
+    return function(scope, element, attrs) {
+      scope.$watch(attrs.ngBindHtmlUnsafeCompiled, function(value) {
+	element.html($compile(value)(scope));
+      });
+    }
+  })
   .directive('spreeDeleteResource', function() {
     return function(scope, element, attrs) {
       if(scope.enterprise_fee.id) {
diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index 2958ab6c73..3f1ec8e265 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -6,7 +6,7 @@ module Admin
     def index
       respond_to do |format|
         format.html
-        format.json { @presented_collection = @collection.map { |ef| EnterpriseFeePresenter.new(self, ef) } }
+        format.json { @presented_collection = @collection.each_with_index.map { |ef, i| EnterpriseFeePresenter.new(self, ef, i) } }
       end
     end
 
diff --git a/app/models/model_set.rb b/app/models/model_set.rb
index 778a148b82..0452b0bafb 100644
--- a/app/models/model_set.rb
+++ b/app/models/model_set.rb
@@ -5,8 +5,7 @@ class ModelSet
 
   attr_accessor :collection
 
-
-  def initialize(klass, collection, reject_if, attributes={})
+  def initialize(klass, collection, reject_if=nil, attributes={})
     @klass, @collection, @reject_if = klass, collection, reject_if
 
     attributes.each do |name, value|
diff --git a/app/presenters/enterprise_fee_presenter.rb b/app/presenters/enterprise_fee_presenter.rb
index bbecfc0f4f..a0a6d8460a 100644
--- a/app/presenters/enterprise_fee_presenter.rb
+++ b/app/presenters/enterprise_fee_presenter.rb
@@ -1,7 +1,6 @@
 class EnterpriseFeePresenter
-  def initialize(controller, enterprise_fee)
-    @controller = controller
-    @enterprise_fee = enterprise_fee
+  def initialize(controller, enterprise_fee, index)
+    @controller, @enterprise_fee, @index = controller, enterprise_fee, index
   end
 
   delegate :id, :enterprise_id, :fee_type, :name, :calculator_type, :to => :enterprise_fee
@@ -23,10 +22,10 @@ class EnterpriseFeePresenter
     result = nil
 
     @controller.send(:with_format, :html) do
-      result = @controller.render_to_string :partial => 'admin/enterprise_fees/calculator_settings', :locals => {:enterprise_fee => @enterprise_fee}
+      result = @controller.render_to_string :partial => 'admin/enterprise_fees/calculator_settings', :locals => {:enterprise_fee => @enterprise_fee, :index => @index}
     end
 
-    result
+    result.gsub('[0]', '[{{ $index }}]').gsub('_0_', '_{{ $index }}_')
   end
 
 end
diff --git a/app/views/admin/enterprise_fees/_calculator_settings.html.haml b/app/views/admin/enterprise_fees/_calculator_settings.html.haml
index 8a81602b71..31488703ac 100644
--- a/app/views/admin/enterprise_fees/_calculator_settings.html.haml
+++ b/app/views/admin/enterprise_fees/_calculator_settings.html.haml
@@ -1,9 +1,11 @@
 -# Render only the calculator settings and not the surrounding form
+- enterprise_fee_set = ModelSet.new(EnterpriseFee, EnterpriseFee.where(:id => enterprise_fee.id))
 - form = nil
-- form_for enterprise_fee, :url => '' do |f|
-  - form = capture do
-    - if !enterprise_fee.new_record?
-      .calculator-settings
-        = f.fields_for :calculator do |calculator_form|
-          = preference_fields(enterprise_fee.calculator, calculator_form)
+= form_for enterprise_fee_set, :as => :enterprise_fee_set, :url => '' do |form|
+  = form.fields_for :collection do |f|
+    - form = capture do
+      - if !enterprise_fee.new_record?
+        .calculator-settings
+          = f.fields_for :calculator do |calculator_form|
+            = preference_fields(enterprise_fee.calculator, calculator_form)
 = form
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 0ce3168b53..13a1f6f25c 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -17,7 +17,6 @@
         %th Calculator values
         %th
     %tbody
-      / -- Finished product
       = enterprise_fee_set_form.angular_fields_for :collection do |f|
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees | filter:query'}
           %td
@@ -26,7 +25,7 @@
           %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
           %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
-          %td{'ng-bind-html-unsafe' => 'enterprise_fee.calculator_settings'}
+          %td{'ng-bind-html-unsafe-compiled' => 'enterprise_fee.calculator_settings'}
           %td{'spree-delete-resource' => "1"}
 
   = enterprise_fee_set_form.submit 'Update'

From c46b8585638f6bbfdef6ba48d4bd99a1e9d37373 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 Nov 2012 17:20:52 +1100
Subject: [PATCH 24/29] Don't render teh bits we dont wants

---
 .../enterprise_fees/_calculator_settings.html.haml    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/enterprise_fees/_calculator_settings.html.haml b/app/views/admin/enterprise_fees/_calculator_settings.html.haml
index 31488703ac..45e2a7c394 100644
--- a/app/views/admin/enterprise_fees/_calculator_settings.html.haml
+++ b/app/views/admin/enterprise_fees/_calculator_settings.html.haml
@@ -1,11 +1,12 @@
 -# Render only the calculator settings and not the surrounding form
 - enterprise_fee_set = ModelSet.new(EnterpriseFee, EnterpriseFee.where(:id => enterprise_fee.id))
-- form = nil
-= form_for enterprise_fee_set, :as => :enterprise_fee_set, :url => '' do |form|
-  = form.fields_for :collection do |f|
-    - form = capture do
+- calculator_form_string = nil
+- form_for enterprise_fee_set, :as => :enterprise_fee_set, :url => '' do |form|
+  - form.fields_for :collection do |f|
+    - calculator_form_string = capture do
       - if !enterprise_fee.new_record?
         .calculator-settings
           = f.fields_for :calculator do |calculator_form|
             = preference_fields(enterprise_fee.calculator, calculator_form)
-= form
+
+= calculator_form_string

From 5ae13d61564cf031088e01af5b3024e48f57fe29 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 Nov 2012 17:21:46 +1100
Subject: [PATCH 25/29] Order all the fees

---
 app/controllers/admin/enterprise_fees_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index 3f1ec8e265..ca48ac7dc5 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -30,7 +30,7 @@ module Admin
     end
 
     def collection
-      super + (1..3).map { EnterpriseFee.new }
+      super.order('enterprise_id', 'fee_type', 'name') + (1..3).map { EnterpriseFee.new }
     end
 
   end

From d5027053625ea57e3ca55fd181c2c5924ccaa6c4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 Nov 2012 07:50:09 +1100
Subject: [PATCH 26/29] Raise an error when using unsupported nested
 angular_fields_for

---
 app/helpers/angular_form_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 8444928f91..14f8e28e02 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -2,7 +2,7 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
   # TODO: Use ng_ prefix, like ng_fields_for
 
   def angular_fields_for(record_name, *args, &block)
-    # TODO: Handle nested angular_fields_for
+    raise "Nested angular_fields_for is not yet supported" if @fields_for_record_name.present
     @fields_for_record_name = record_name
     block.call self
     @fields_for_record_name = nil

From 59af447739f161d8ba33db47ac1ff8c96f941fb1 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Mon, 26 Nov 2012 09:44:42 +1100
Subject: [PATCH 27/29] Fix ?

---
 app/helpers/angular_form_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 14f8e28e02..4b60706b36 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -2,7 +2,7 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
   # TODO: Use ng_ prefix, like ng_fields_for
 
   def angular_fields_for(record_name, *args, &block)
-    raise "Nested angular_fields_for is not yet supported" if @fields_for_record_name.present
+    raise "Nested angular_fields_for is not yet supported" if @fields_for_record_name.present?
     @fields_for_record_name = record_name
     block.call self
     @fields_for_record_name = nil

From 6106f1b46987bcd72a6f6709ee85e9f60ee8a0c6 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Mon, 26 Nov 2012 09:45:06 +1100
Subject: [PATCH 28/29] Calculator type change works, enterprise fee tests pass

---
 .../javascripts/admin/enterprise_fees.js      | 57 ++++++++++---------
 .../admin/enterprise_fees/index.html.haml     |  2 +-
 spec/requests/admin/enterprise_fees_spec.rb   |  6 +-
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/app/assets/javascripts/admin/enterprise_fees.js b/app/assets/javascripts/admin/enterprise_fees.js
index a497c8cf96..e73ff0dfcf 100644
--- a/app/assets/javascripts/admin/enterprise_fees.js
+++ b/app/assets/javascripts/admin/enterprise_fees.js
@@ -1,9 +1,16 @@
 function AdminEnterpriseFeesCtrl($scope, $http) {
   $http.get('/admin/enterprise_fees.json').success(function(data) {
     $scope.enterprise_fees = data;
+
+    // TODO: Angular 1.1.0 will have a means to reset a form to its pristine state, which
+    //       would avoid the need to save off original calculator types for comparison.
+    for(i in $scope.enterprise_fees) {
+      $scope.enterprise_fees[i].orig_calculator_type = $scope.enterprise_fees[i].calculator_type;
+    }
   });
 }
 
+
 angular.module('enterprise_fees', [])
   .directive('ngBindHtmlUnsafeCompiled', function($compile) {
     return function(scope, element, attrs) {
@@ -20,36 +27,30 @@ angular.module('enterprise_fees', [])
 	element.append(html);
       }
     }
-  });
+  })
+  .directive('spreeEnsureCalculatorPreferencesMatchType', function() {
+    // Hide calculator preference fields when calculator type changed
+    // Fixes 'Enterprise fee is not found' error when changing calculator type
+    // See spree/core/app/assets/javascripts/admin/calculator.js
 
+    // Note: For some reason, DOM --> model bindings aren't working here, so
+    // we use element.val() instead of querying the model itself.
 
+    return function(scope, element, attrs) {
+      scope.$watch(function(scope) {
+	//return scope.enterprise_fee.calculator_type;
+	return element.val();
+      }, function(value) {
+	var settings = element.parent().parent().find("div.calculator-settings");
 
-
-/*
-// Hide calculator preference fields when calculator type changed
-// Fixes 'Enterprise fee is not found' error when changing calculator type
-// See spree/core/app/assets/javascripts/admin/calculator.js
-
-$(document).ready(function() {
-  // Store original value
-  $("select.calculator_type").each(function(i, ct) {
-    ct = $(ct);
-    ct.data('original-value', ct.attr('value'));
-  });
-
-  // Hide and disable calculator fields when calculator type is changed
-  $("select.calculator_type").change(function() {
-    var ct = $(this);
-    var cs = ct.parent().parent().find("div.calculator-settings");
-
-    if(ct.attr('value') == ct.data('original-value')) {
-      cs.show();
-      cs.find("input").prop("disabled", false);
-
-    } else {
-      cs.hide();
-      cs.find("input").prop("disabled", true);
+	// scope.enterprise_fee.calculator_type == scope.enterprise_fee.orig_calculator_type
+	if(element.val() == scope.enterprise_fee.orig_calculator_type) {
+	  settings.show();
+	  settings.find("input").prop("disabled", false);
+	} else {
+	  settings.hide();
+	  settings.find("input").prop("disabled", true);
+	}
+      });
     }
   });
-});
-*/
\ No newline at end of file
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index 13a1f6f25c..e2c5d4e854 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -24,7 +24,7 @@
             = f.angular_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
           %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
           %td= f.angular_text_field :name
-          %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {:class => 'calculator_type'}
+          %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {'class' => 'calculator_type', 'ng-model' => 'calculatorType', 'spree-ensure-calculator-preferences-match-type' => "1"}
           %td{'ng-bind-html-unsafe-compiled' => 'enterprise_fee.calculator_settings'}
           %td{'spree-delete-resource' => "1"}
 
diff --git a/spec/requests/admin/enterprise_fees_spec.rb b/spec/requests/admin/enterprise_fees_spec.rb
index 90f7f065d3..8af01b149f 100644
--- a/spec/requests/admin/enterprise_fees_spec.rb
+++ b/spec/requests/admin/enterprise_fees_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 feature %q{
     As an administrator
     I want to manage enterprise fees
-} do
+}, js: true do
   include AuthenticationWorkflow
   include WebHelper
 
@@ -49,7 +49,7 @@ feature %q{
     page.should have_selector "#enterprise_fee_set_collection_attributes_0_calculator_attributes_preferred_flat_percent[value='12.34']"
   end
 
-  scenario "editing an enterprise fee", js: true do
+  scenario "editing an enterprise fee" do
     # Given an enterprise fee
     fee = create(:enterprise_fee)
     create(:enterprise, name: 'Foo')
@@ -73,7 +73,7 @@ feature %q{
     page.should have_selector "option[selected]", text: 'Flat Percent'
   end
 
-  scenario "deleting an enterprise fee", js: true do
+  scenario "deleting an enterprise fee" do
     # Given an enterprise fee
     fee = create(:enterprise_fee)
 

From 7c5dcd6a90af83662415720f41ff8fbc0b22f228 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Mon, 26 Nov 2012 10:03:20 +1100
Subject: [PATCH 29/29] Change angular_ prefix to ng_

---
 app/helpers/angular_form_builder.rb            | 18 ++++++++----------
 app/helpers/angular_form_helper.rb             |  6 +++---
 app/helpers/application_helper.rb              |  2 +-
 .../admin/enterprise_fees/index.html.haml      | 14 +++++++-------
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/helpers/angular_form_builder.rb b/app/helpers/angular_form_builder.rb
index 4b60706b36..5d913eb291 100644
--- a/app/helpers/angular_form_builder.rb
+++ b/app/helpers/angular_form_builder.rb
@@ -1,14 +1,12 @@
 class AngularFormBuilder < ActionView::Helpers::FormBuilder
-  # TODO: Use ng_ prefix, like ng_fields_for
-
-  def angular_fields_for(record_name, *args, &block)
-    raise "Nested angular_fields_for is not yet supported" if @fields_for_record_name.present?
+  def ng_fields_for(record_name, *args, &block)
+    raise "Nested ng_fields_for is not yet supported" if @fields_for_record_name.present?
     @fields_for_record_name = record_name
     block.call self
     @fields_for_record_name = nil
   end
 
-  def angular_text_field(method, options = {})
+  def ng_text_field(method, options = {})
     # @object_name --> "enterprise_fee_set"
     # @fields_for_record_name --> :collection
     # @object.send(@fields_for_record_name).first.class.to_s.underscore --> enterprise_fee
@@ -18,22 +16,22 @@ class AngularFormBuilder < ActionView::Helpers::FormBuilder
     @template.text_field_tag angular_name(method), value, :id => angular_id(method)
   end
 
-  def angular_hidden_field(method, options = {})
+  def ng_hidden_field(method, options = {})
     value = "{{ #{@object.send(@fields_for_record_name).first.class.to_s.underscore}.#{method} }}"
 
     @template.hidden_field_tag angular_name(method), value, :id => angular_id(method)
   end
 
-  def angular_select(method, choices, angular_field, options = {})
+  def ng_select(method, choices, angular_field, options = {})
     options.reverse_merge!({'id' => angular_id(method)})
 
-    @template.select_tag angular_name(method), @template.angular_options_for_select(choices, angular_field), options
+    @template.select_tag angular_name(method), @template.ng_options_for_select(choices, angular_field), options
   end
 
-  def angular_collection_select(method, collection, value_method, text_method, angular_field, options = {})
+  def ng_collection_select(method, collection, value_method, text_method, angular_field, options = {})
     options.reverse_merge!({'id' => angular_id(method)})
 
-    @template.select_tag angular_name(method), @template.angular_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
+    @template.select_tag angular_name(method), @template.ng_options_from_collection_for_select(collection, value_method, text_method, angular_field), options
   end
 
   private
diff --git a/app/helpers/angular_form_helper.rb b/app/helpers/angular_form_helper.rb
index 9116d403fa..a7fd6e0e28 100644
--- a/app/helpers/angular_form_helper.rb
+++ b/app/helpers/angular_form_helper.rb
@@ -1,5 +1,5 @@
 module AngularFormHelper
-  def angular_options_for_select(container, angular_field=nil)
+  def ng_options_for_select(container, angular_field=nil)
     return container if String === container
 
     container.map do |element|
@@ -10,12 +10,12 @@ module AngularFormHelper
     end.join("\n").html_safe
   end
 
-  def angular_options_from_collection_for_select(collection, value_method, text_method, angular_field)
+  def ng_options_from_collection_for_select(collection, value_method, text_method, angular_field)
     options = collection.map do |element|
       [element.send(text_method), element.send(value_method)]
     end
 
-    angular_options_for_select(options, angular_field)
+    ng_options_for_select(options, angular_field)
   end
 end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5035bf8809..794aee744b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -6,7 +6,7 @@ module ApplicationHelper
   end
 
 
-  def angular_form_for(name, *args, &block)
+  def ng_form_for(name, *args, &block)
     options = args.extract_options!
 
     form_for(name, *(args << options.merge(:builder => AngularFormBuilder)), &block)
diff --git a/app/views/admin/enterprise_fees/index.html.haml b/app/views/admin/enterprise_fees/index.html.haml
index e2c5d4e854..c52afb060c 100644
--- a/app/views/admin/enterprise_fees/index.html.haml
+++ b/app/views/admin/enterprise_fees/index.html.haml
@@ -1,4 +1,4 @@
-= angular_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path, :html => {'ng-app' => 'enterprise_fees', 'ng-controller' => 'AdminEnterpriseFeesCtrl'} do |enterprise_fee_set_form|
+= ng_form_for @enterprise_fee_set, :url => main_app.bulk_update_admin_enterprise_fees_path, :html => {'ng-app' => 'enterprise_fees', 'ng-controller' => 'AdminEnterpriseFeesCtrl'} do |enterprise_fee_set_form|
   - if @enterprise_fee_set.errors.present?
     %h2 Errors
     %ul
@@ -17,14 +17,14 @@
         %th Calculator values
         %th
     %tbody
-      = enterprise_fee_set_form.angular_fields_for :collection do |f|
+      = enterprise_fee_set_form.ng_fields_for :collection do |f|
         %tr{'ng-repeat' => 'enterprise_fee in enterprise_fees | filter:query'}
           %td
-            = f.angular_hidden_field :id
-            = f.angular_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
-          %td= f.angular_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
-          %td= f.angular_text_field :name
-          %td= f.angular_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {'class' => 'calculator_type', 'ng-model' => 'calculatorType', 'spree-ensure-calculator-preferences-match-type' => "1"}
+            = f.ng_hidden_field :id
+            = f.ng_collection_select :enterprise_id, Enterprise.all, :id, :name, 'enterprise_fee.enterprise_id', :include_blank => true
+          %td= f.ng_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
+          %td= f.ng_text_field :name
+          %td= f.ng_collection_select :calculator_type, @calculators, :name, :description, 'enterprise_fee.calculator_type', {'class' => 'calculator_type', 'ng-model' => 'calculatorType', 'spree-ensure-calculator-preferences-match-type' => "1"}
           %td{'ng-bind-html-unsafe-compiled' => 'enterprise_fee.calculator_settings'}
           %td{'spree-delete-resource' => "1"}