Merge branch 'master' into rob-github-fixes

GitHub issue #571

.rspec_parallel

@@ -0,0 +1,4 @@
+--format progress
+--format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
+--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
+--tag ~performance

Gemfile

@@ -15,6 +15,8 @@ gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-s
 gem 'spree_paypal_express', :github => "openfoodfoundation/better_spree_paypal_express", :branch => "1-3-stable"
 #gem 'spree_paypal_express', :github => "spree-contrib/better_spree_paypal_express", :branch => "1-3-stable"
 
+gem 'delayed_job_active_record'
+gem 'daemons'
 gem 'comfortable_mexican_sofa'
 
 # Fix bug in simple_form preventing collection_check_boxes usage within form_for block
@@ -26,7 +28,7 @@ gem 'angularjs-rails', '1.2.13'
 gem 'bugsnag'
 gem 'newrelic_rpm'
 gem 'haml'
-gem 'sass', "~> 3.2"
+gem 'sass', "~> 3.3"
 gem 'sass-rails', '~> 3.2.3', groups: [:default, :assets]
 gem 'aws-sdk'
 gem 'db2fog'
@@ -47,6 +49,7 @@ gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
 gem 'angularjs-file-upload-rails', '~> 1.1.0'
 gem 'roadie-rails', '~> 1.0.3'
 gem 'figaro'
+gem 'acts-as-taggable-on', '~> 3.4'
 
 gem 'foreigner'
 gem 'immigrant'
@@ -67,7 +70,7 @@ group :assets do
   gem 'turbo-sprockets-rails3'
   gem 'foundation-icons-sass-rails'
   gem 'momentjs-rails'
-  gem 'angular-rails-templates'
+  gem 'angular-rails-templates', '~> 0.2.0'
 end
 gem "foundation-rails"
 gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
@@ -110,4 +113,5 @@ group :development do
   gem 'guard-rails'
   gem 'guard-zeus'
   gem 'guard-rspec'
+  gem 'parallel_tests'
 end

Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: 4e0075b07acb56864aca89eee3d9670136176c23
+  revision: afcc23e489eb604a3e2651598a7c8364e2acc7b3
   branch: 1-3-stable
   specs:
     spree (1.3.6.beta)
@@ -123,7 +123,7 @@ GEM
     active_link_to (1.0.0)
     active_model_serializers (0.8.1)
       activemodel (>= 3.0)
-    activemerchant (1.46.0)
+    activemerchant (1.48.0)
       activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
@@ -142,12 +142,14 @@ GEM
     activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    acts-as-taggable-on (3.5.0)
+      activerecord (>= 3.2, < 5)
     acts_as_list (0.1.4)
     addressable (2.3.3)
     andand (1.3.3)
-    angular-rails-templates (0.1.1)
+    angular-rails-templates (0.2.0)
       railties (>= 3.1)
-      sprockets
+      sprockets (~> 2)
       tilt
     angularjs-file-upload-rails (1.1.0)
     angularjs-rails (1.2.13)
@@ -177,11 +179,11 @@ GEM
     celluloid (0.15.2)
       timers (~> 1.1.0)
     chronic (0.10.2)
-    chunky_png (1.3.0)
+    chunky_png (1.3.4)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.5)
+    cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
     coffee-rails (3.2.2)
@@ -191,22 +193,33 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    colorize (0.7.5)
+    colorize (0.7.7)
     columnize (0.3.6)
     comfortable_mexican_sofa (1.6.24)
       active_link_to (~> 1.0.0)
       paperclip (>= 2.3.0)
       rails (>= 3.0.0)
-    compass (0.12.4)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.17)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    compass-rails (2.0.4)
+      compass (~> 1.0.0)
+      sass-rails (<= 5.0.1)
+      sprockets (< 2.13)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
     css_parser (1.3.5)
       addressable
+    daemons (1.2.2)
     dalli (2.7.2)
     database_cleaner (0.7.1)
     db2fog (0.8.0)
@@ -219,6 +232,11 @@ GEM
       debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.2.3)
+    delayed_job (4.0.4)
+      activesupport (>= 3.0, < 4.2)
+    delayed_job_active_record (4.0.2)
+      activerecord (>= 3.0, < 4.2)
+      delayed_job (>= 3.0, < 4.1)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -233,8 +251,7 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.25.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.5.2)
     factory_girl (3.3.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (3.3.0)
@@ -261,10 +278,9 @@ GEM
     foundation-icons-sass-rails (3.0.0)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
-    foundation-rails (5.2.2.0)
+    foundation-rails (5.5.0.0)
       railties (>= 3.1.0)
-      sass (>= 3.2.0)
-    fssm (0.2.10)
+      sass (>= 3.2.0, < 3.4)
     fuubar (1.3.3)
       rspec (>= 2.14.0, < 3.1.0)
       ruby-progressbar (~> 1.4)
@@ -304,14 +320,14 @@ GEM
     jquery-rails (2.2.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
     json_spec (1.1.1)
       multi_json (~> 1.0)
       rspec (~> 2.0)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.7.4)
+    kgio (2.9.3)
     launchy (2.1.2)
       addressable (~> 2.3)
     letter_opener (1.0.0)
@@ -332,12 +348,12 @@ GEM
       railties (>= 3.1)
     money (5.1.1)
       i18n (~> 0.6.0)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
-    newrelic_rpm (3.6.7.152)
+    newrelic_rpm (3.12.0.288)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oj (2.1.2)
@@ -347,6 +363,9 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
+    parallel (1.4.1)
+    parallel_tests (1.3.7)
+      parallel
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
       xml-simple
@@ -398,7 +417,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.9.0)
+    raindrops (0.13.0)
     rake (10.4.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
@@ -442,7 +461,7 @@ GEM
     ruby-hmac (0.4.0)
     ruby-progressbar (1.7.1)
     safe_yaml (0.9.5)
-    sass (3.2.19)
+    sass (3.3.14)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -481,11 +500,11 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.43)
-    uglifier (1.2.4)
+    tzinfo (0.3.44)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    unicorn (4.3.1)
+      json (>= 1.8.0)
+    unicorn (4.9.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -517,8 +536,9 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers
+  acts-as-taggable-on (~> 3.4)
   andand
-  angular-rails-templates
+  angular-rails-templates (~> 0.2.0)
   angularjs-file-upload-rails (~> 1.1.0)
   angularjs-rails (= 1.2.13)
   awesome_print
@@ -529,11 +549,13 @@ DEPENDENCIES
   comfortable_mexican_sofa
   compass-rails
   custom_error_message!
+  daemons
   dalli
   database_cleaner (= 0.7.1)
   db2fog
   debugger-linecache
   deface!
+  delayed_job_active_record
   factory_girl_rails
   figaro
   foreigner
@@ -558,6 +580,7 @@ DEPENDENCIES
   newrelic_rpm
   oj
   paperclip
+  parallel_tests
   pg
   poltergeist
   pry-debugger
@@ -569,7 +592,7 @@ DEPENDENCIES
   representative_view
   roadie-rails (~> 1.0.3)
   rspec-rails
-  sass (~> 3.2)
+  sass (~> 3.3)
   sass-rails (~> 3.2.3)
   shoulda-matchers
   simple_form!

README.markdown

@@ -1,4 +1,3 @@
-[![Build Status](http://ci.openfood.com.au:8080/buildStatus/icon?job=openfoodweb - tests)](http://ci.openfood.com.au:8080/job/openfoodweb%20-%20tests/)
 [![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network

app/assets/javascripts/admin/admin.js.coffee

@@ -1,3 +1,3 @@
-angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown", "admin.products", "admin.taxons", "infinite-scroll"]).config ($httpProvider) ->
+angular.module("ofn.admin", ["ngResource", "ngAnimate", "admin.indexUtils", "admin.dropdown", "admin.products", "admin.taxons", "infinite-scroll"]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin/all.js

@@ -12,14 +12,21 @@
 //= require angular
 //= require angular-resource
 //= require angular-animate
+//= require angular-sanitize
 //= require admin/spree_core
 //= require admin/spree_auth
 //= require admin/spree_promo
 //= require admin/spree_paypal_express
 //= require ../shared/ng-infinite-scroll.min.js
+//= require ../shared/ng-tags-input.min.js
+//= require angular-rails-templates
+//= require_tree ../templates/admin
 //= require ./admin
+//= require ./customers/customers
+//= require ./dropdown/dropdown
 //= require ./enterprises/enterprises
 //= require ./enterprise_groups/enterprise_groups
+//= require ./index_utils/index_utils
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods
@@ -29,5 +36,6 @@
 //= require ./users/users
 //= require textAngular.min.js
 //= require textAngular-sanitize.min.js
+//= require ../shared/bindonce.min.js
 
 //= require_tree .

app/assets/javascripts/admin/bulk_order_management.js.coffee

@@ -1,6 +1,6 @@
 angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
-  "$scope", "$http", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer", "SpreeApiKey"
-  ($scope, $http, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer, SpreeApiKey) ->
+  "$scope", "$http", "$filter", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer", "SpreeApiKey", "Columns"
+  ($scope, $http, $filter, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer, SpreeApiKey, Columns) ->
     $scope.loading = true
 
     $scope.initialiseVariables = ->
@@ -18,9 +18,7 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       $scope.selectedUnitsProduct = {};
       $scope.selectedUnitsVariant = {};
       $scope.sharedResource = false
-      $scope.predicate = ""
-      $scope.reverse = false
-      $scope.columns =
+      $scope.columns = Columns.setColumns
         order_no:     { name: "Order No.",    visible: false }
         full_name:    { name: "Name",         visible: true }
         email:        { name: "Email",        visible: false }
@@ -32,7 +30,8 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
         variant:      { name: "Variant",      visible: true }
         quantity:     { name: "Quantity",     visible: true }
         max:          { name: "Max",          visible: true }
-
+        unit_value:   { name: "Weight/Volume", visible: false }
+        price:        { name: "Price",        visible: false }
     $scope.initialise = ->
       $scope.initialiseVariables()
       authorise_api_reponse = ""
@@ -42,13 +41,15 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
         if $scope.spree_api_key_ok
           $http.defaults.headers.common["X-Spree-Token"] = SpreeApiKey
           dataFetcher("/api/enterprises/accessible?template=bulk_index&q[is_primary_producer_eq]=true").then (data) ->
-            $scope.suppliers = data
+            $scope.suppliers = $filter('orderBy')(data, 'name')
             $scope.suppliers.unshift blankOption()
-            dataFetcher("/api/enterprises/accessible?template=bulk_index&q[is_distributor_eq]=true").then (data) ->
-              $scope.distributors = data
+            dataFetcher("/api/enterprises/accessible?template=bulk_index&q[sells_in][]=own&q[sells_in][]=any").then (data) ->
+              $scope.distributors = $filter('orderBy')(data, 'name')
               $scope.distributors.unshift blankOption()
-              ocFetcher = dataFetcher("/api/order_cycles/accessible").then (data) ->
+              ocFetcher = dataFetcher("/api/order_cycles/accessible?as=distributor&q[orders_close_at_gt]=#{formatDate(daysFromToday(-90))}").then (data) ->
                 $scope.orderCycles = data
+                $scope.orderCyclesByID = []
+                $scope.orderCyclesByID[oc.id] = oc for oc in $scope.orderCycles
                 $scope.orderCycles.unshift blankOption()
                 $scope.fetchOrders()
               ocFetcher.then ->
@@ -60,7 +61,7 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
 
     $scope.fetchOrders = ->
       $scope.loading = true
-      dataFetcher("/api/orders/managed?template=bulk_index;page=1;per_page=500;q[completed_at_not_null]=true;q[completed_at_gt]=#{$scope.startDate};q[completed_at_lt]=#{$scope.endDate}").then (data) ->
+      dataFetcher("/admin/orders/managed?template=bulk_index;page=1;per_page=500;q[state_not_eq]=canceled;q[completed_at_not_null]=true;q[completed_at_gt]=#{$scope.startDate};q[completed_at_lt]=#{$scope.endDate}").then (data) ->
         $scope.resetOrders data
         $scope.loading = false
 
@@ -162,6 +163,25 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       $scope.supplierFilter = $scope.suppliers[0].id
       $scope.orderCycleFilter = $scope.orderCycles[0].id
       $scope.quickSearch = ""
+
+    $scope.weightAdjustedPrice = (lineItem, oldValue) ->
+      if oldValue <= 0
+        oldValue = lineItem.units_variant.unit_value
+      if lineItem.unit_value <= 0
+        lineItem.unit_value = lineItem.units_variant.unit_value
+      lineItem.price = lineItem.price * lineItem.unit_value / oldValue
+      #$scope.bulk_order_form.line_item.price.$setViewValue($scope.bulk_order_form.line_item.price.$viewValue)
+
+    $scope.unitValueLessThanZero = (lineItem) ->
+      if lineItem.units_variant.unit_value <= 0
+        true
+      else
+        false
+
+    $scope.$watch "orderCycleFilter", (newVal, oldVal) ->
+      unless $scope.orderCycleFilter == "0" || angular.equals(newVal, oldVal)
+        $scope.startDate = $scope.orderCyclesByID[$scope.orderCycleFilter].first_order
+        $scope.endDate = $scope.orderCyclesByID[$scope.orderCycleFilter].last_order
 ]
 
 daysFromToday = (days) ->

app/assets/javascripts/admin/bulk_product_update.js.coffee

@@ -1,16 +1,20 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth, Columns, tax_categories) ->
     $scope.loading = true
 
     $scope.StatusMessage = StatusMessage
 
-    $scope.columns =
-      producer:     {name: "Producer",      visible: true}
-      name:         {name: "Name",          visible: true}
-      unit:         {name: "Unit",          visible: true}
-      price:        {name: "Price",         visible: true}
-      on_hand:      {name: "On Hand",       visible: true}
-      category:     {name: "Category",      visible: false}
-      available_on: {name: "Available On",  visible: false}
+    $scope.columns = Columns.setColumns
+      producer:             {name: "Producer",              visible: true}
+      sku:                  {name: "SKU",                   visible: false}
+      name:                 {name: "Name",                  visible: true}
+      unit:                 {name: "Unit",                  visible: true}
+      price:                {name: "Price",                 visible: true}
+      on_hand:              {name: "On Hand",               visible: true}
+      on_demand:            {name: "On Demand",             visible: false}
+      category:             {name: "Category",              visible: false}
+      tax_category:         {name: "Tax Category",          visible: false}
+      inherits_properties:  {name: "Inherits Properties?",  visible: false}
+      available_on:         {name: "Available On",          visible: false}
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
@@ -30,6 +34,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
     $scope.producers = producers
     $scope.taxons = Taxons.taxons
+    $scope.tax_categories = tax_categories
     $scope.filterProducers = [{id: "0", name: ""}].concat $scope.producers
     $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons
     $scope.producerFilter = "0"
@@ -104,6 +109,12 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         window.location = "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 
 
+    $scope.toggleShowAllVariants = ->
+      showVariants = !DisplayProperties.showVariants 0
+      $scope.filteredProducts.forEach (product) ->
+        DisplayProperties.setShowVariants product.id, showVariants
+      DisplayProperties.setShowVariants 0, showVariants
+
     $scope.addVariant = (product) ->
       product.variants.push
         id: $scope.nextVariantId()
@@ -135,15 +146,18 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
 
     $scope.deleteVariant = (product, variant) ->
-      if !$scope.variantSaved(variant)
-        $scope.removeVariant(product, variant)
+      if product.variants.length > 1
+        if !$scope.variantSaved(variant)
+          $scope.removeVariant(product, variant)
+        else
+          if confirm("Are you sure?")
+            $http(
+              method: "DELETE"
+              url: "/api/products/" + product.permalink_live + "/variants/" + variant.id + "/soft_delete"
+            ).success (data) ->
+              $scope.removeVariant(product, variant)
       else
-        if confirm("Are you sure?")
-          $http(
-            method: "DELETE"
-            url: "/api/products/" + product.permalink_live + "/variants/" + variant.id + "/soft_delete"
-          ).success (data) ->
-            $scope.removeVariant(product, variant)
+        alert("The last variant cannot be deleted!")
 
     $scope.removeVariant = (product, variant) ->
       product.variants.splice product.variants.indexOf(variant), 1
@@ -285,6 +299,9 @@ filterSubmitProducts = (productsToFilter) ->
           filteredMaster ?= { id: product.master.id }
           filteredMaster.display_as = product.master.display_as
 
+        if product.hasOwnProperty("sku")
+          filteredProduct.sku = product.sku
+          hasUpdatableProperty = true
         if product.hasOwnProperty("name")
           filteredProduct.name = product.name
           hasUpdatableProperty = true
@@ -304,9 +321,18 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("on_hand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_hand = product.on_hand
           hasUpdatableProperty = true
+        if product.hasOwnProperty("on_demand") and filteredVariants.length == 0 #only update if no variants present
+          filteredProduct.on_demand = product.on_demand
+          hasUpdatableProperty = true
         if product.hasOwnProperty("category_id")
           filteredProduct.primary_taxon_id = product.category_id
           hasUpdatableProperty = true
+        if product.hasOwnProperty("tax_category_id")
+          filteredProduct.tax_category_id = product.tax_category_id
+          hasUpdatableProperty = true
+        if product.hasOwnProperty("inherits_properties")
+          filteredProduct.inherits_properties = product.inherits_properties
+          hasUpdatableProperty = true
         if product.hasOwnProperty("available_on")
           filteredProduct.available_on = product.available_on
           hasUpdatableProperty = true
@@ -329,6 +355,9 @@ filterSubmitVariant = (variant) ->
     if variant.hasOwnProperty("on_hand")
       filteredVariant.on_hand = variant.on_hand
       hasUpdatableProperty = true
+    if variant.hasOwnProperty("on_demand")
+      filteredVariant.on_demand = variant.on_demand
+      hasUpdatableProperty = true
     if variant.hasOwnProperty("price")
       filteredVariant.price = variant.price
       hasUpdatableProperty = true

app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee

@@ -9,3 +9,26 @@ angular.module("ofn.admin").controller "AdminEnterpriseRelationshipsCtrl", ($sco
   $scope.delete = (enterprise_relationship) ->
     if confirm("Are you sure?")
       $scope.EnterpriseRelationships.delete enterprise_relationship
+
+  $scope.toggleKeyword = (string, key) ->
+    string = '' unless string
+    words = string.split ' '
+    words = words.filter (s) ->
+      s
+    index = words.indexOf key
+    if index > -1
+      words.splice index, 1
+    else
+      words.push key
+    words.join ' '
+
+  $scope.allPermissionsChecked = ->
+    for i in EnterpriseRelationships.all_permissions
+      if !$scope.permissions[i]
+        return false
+    return true
+
+  $scope.checkAllPermissions = ->
+    newValue = !$scope.allPermissionsChecked()
+    EnterpriseRelationships.all_permissions.forEach (p) ->
+      $scope.permissions[p] = newValue

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -0,0 +1,17 @@
+angular.module("admin.customers").controller "customersCtrl", ($scope, Customers, Columns, pendingChanges, shops) ->
+  $scope.shop = null
+  $scope.shops = shops
+  $scope.submitAll = pendingChanges.submitAll
+
+  $scope.columns = Columns.setColumns
+    email:     { name: "Email",    visible: true }
+    code:      { name: "Code",     visible: true }
+    tags:      { name: "Tags",     visible: true }
+
+  $scope.$watch "shop", ->
+    if $scope.shop?
+      Customers.loaded = false
+      $scope.customers = Customers.index(enterprise_id: $scope.shop.id)
+
+  $scope.loaded = ->
+    Customers.loaded

app/assets/javascripts/admin/customers/customers.js.coffee

@@ -0,0 +1 @@
+angular.module("admin.customers", ['ngResource', 'ngTagsInput', 'admin.indexUtils', 'admin.dropdown'])

app/assets/javascripts/admin/customers/directives/tags_with_translation.js.coffee

@@ -0,0 +1,8 @@
+angular.module("admin.customers").directive "tagsWithTranslation", ->
+  restrict: "E"
+  template: "<tags-input ng-model='object.tags'>"
+  scope:
+    object: "="
+  link: (scope, element, attrs) ->
+    scope.$watchCollection "object.tags", ->
+      scope.object.tag_list = (tag.text for tag in scope.object.tags).join(",")

app/assets/javascripts/admin/customers/services/customer_resource.js.coffee

@@ -0,0 +1,8 @@
+angular.module("admin.customers").factory 'CustomerResource', ($resource) ->
+  $resource('/admin/customers.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+      params:
+        enterprise_id: '@enterprise_id'
+  })

app/assets/javascripts/admin/customers/services/customers.js.coffee

@@ -0,0 +1,16 @@
+angular.module("admin.customers").factory 'Customers', (CustomerResource) ->
+  new class Customers
+    customers: []
+    customers_by_id: {}
+    loaded: false
+
+    index: (params={}, callback=null) ->
+    	CustomerResource.index params, (data) =>
+        for customer in data
+          @customers.push customer
+          @customers_by_id[customer.id] = customer
+
+        @loaded = true
+        (callback || angular.noop)(@customers)
+
+    	@customers

app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee

@@ -1,23 +0,0 @@
-angular.module("ofn.admin").directive "ofnLineItemUpdAttr", [
-  "switchClass", "pendingChanges"
-  (switchClass, pendingChanges) ->
-    require: "ngModel"
-    link: (scope, element, attrs, ngModel) ->
-      attrName = attrs.ofnLineItemUpdAttr
-      element.dbValue = scope.$eval(attrs.ngModel)
-      scope.$watch ->
-        scope.$eval(attrs.ngModel)
-      , (value) ->
-        if ngModel.$dirty
-          if value == element.dbValue
-            pendingChanges.remove(scope.line_item.id, attrName)
-            switchClass( element, "", ["update-pending", "update-error", "update-success"], false )
-          else
-            changeObj =
-              lineItem: scope.line_item
-              element: element
-              attrName: attrName
-              url: "/api/orders/#{scope.line_item.order.number}/line_items/#{scope.line_item.id}?line_item[#{attrName}]=#{value}"
-            pendingChanges.add(scope.line_item.id, attrName, changeObj)
-            switchClass( element, "update-pending", ["update-error", "update-success"], false )
-]

app/assets/javascripts/admin/directives/toggle_column.js.coffee

@@ -1,11 +0,0 @@
-angular.module("ofn.admin").directive "ofnToggleColumn", ->
-  link: (scope, element, attrs) ->
-    element.addClass "selected" if scope.column.visible
-    element.click "click", ->
-      scope.$apply ->
-        if scope.column.visible
-          scope.column.visible = false
-          element.removeClass "selected"
-        else
-          scope.column.visible = true
-          element.addClass "selected"

app/assets/javascripts/admin/directives/toggle_variants.js.coffee

@@ -1,10 +1,8 @@
 angular.module("ofn.admin").directive "ofnToggleVariants", (DisplayProperties) ->
   link: (scope, element, attrs) ->
     if DisplayProperties.showVariants scope.product.id
-      element.removeClass "icon-chevron-right"
       element.addClass "icon-chevron-down"
     else
-      element.removeClass "icon-chevron-down"
       element.addClass "icon-chevron-right"
 
     element.on "click", ->
@@ -16,4 +14,4 @@ angular.module("ofn.admin").directive "ofnToggleVariants", (DisplayProperties) -
         else
           DisplayProperties.setShowVariants scope.product.id, true
           element.removeClass "icon-chevron-right"
-          element.addClass "icon-chevron-down"
+          element.addClass "icon-chevron-down"

app/assets/javascripts/admin/dropdown/controllers/dropdown_controller.js.coffee

@@ -0,0 +1,2 @@
+angular.module("admin.dropdown").controller "DropDownCtrl", ($scope) ->
+  $scope.expanded = false

app/assets/javascripts/admin/dropdown/directives/close_on_click.js.coffee

@@ -0,0 +1,5 @@
+ angular.module("admin.dropdown").directive "ofnCloseOnClick", ($document) ->
+   link: (scope, element, attrs) ->
+     element.click (event) ->
+       event.stopPropagation()
+       scope.$emit "offClick"

app/assets/javascripts/admin/dropdown/directives/dropdown.js.coffee

@@ -1,6 +1,4 @@
-dropDownModule = angular.module("ofn.dropdown", [])
-
-dropDownModule.directive "ofnDropDown", ($document) ->
+ angular.module("admin.dropdown").directive "ofnDropDown", ($document) ->
   link: (scope, element, attrs) ->
     outsideClickListener = (event) ->
       unless $(event.target).is("div.ofn_drop_down##{attrs.id} div.menu") ||
@@ -20,12 +18,3 @@ dropDownModule.directive "ofnDropDown", ($document) ->
         scope.$apply ->
           scope.expanded = true
           element.addClass "expanded"
-
-dropDownModule.directive "ofnCloseOnClick", ($document) ->
-  link: (scope, element, attrs) ->
-    element.click (event) ->
-      event.stopPropagation()
-      scope.$emit "offClick"
-
-dropDownModule.controller "DropDownCtrl", ($scope) ->
-  $scope.expanded = false

app/assets/javascripts/admin/dropdown/dropdown.js.coffee

@@ -0,0 +1 @@
+angular.module("admin.dropdown", [])

app/assets/javascripts/admin/enterprise_groups/enterprise_groups.js.coffee

@@ -1 +1 @@
-angular.module("admin.enterprise_groups", ["admin.side_menu", "admin.users"])
+angular.module("admin.enterprise_groups", ["admin.side_menu", "admin.users", "textAngular"])

app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

@@ -1,6 +1,6 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, NavigationCheck, Enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu) ->
-    $scope.Enterprise = Enterprise.enterprise
+  .controller "enterpriseCtrl", ($scope, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu) ->
+    $scope.Enterprise = enterprise
     $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
     $scope.navClear = NavigationCheck.clear

app/assets/javascripts/admin/enterprises/controllers/enterprise_index_row_controller.js.coffee

@@ -0,0 +1,49 @@
+angular.module("admin.enterprises").controller "EnterpriseIndexRowCtrl", ($scope) ->
+  $scope.status = ->
+    if $scope.enterprise.issues.length > 0
+      "issue"
+    else if $scope.enterprise.warnings.length > 0
+      "warning"
+    else
+      "ok"
+
+
+  $scope.producerText = ->
+    switch $scope.enterprise.is_primary_producer
+      when true
+        "Producer"
+      else
+        "Non-Producer"
+
+  $scope.packageText = ->
+    switch $scope.enterprise.is_primary_producer
+      when true
+        switch $scope.enterprise.sells
+          when "none"
+            "Profile"
+          when "own"
+            "Shop"
+          when "any"
+            "Hub"
+          else
+            "Choose"
+      else
+        switch $scope.enterprise.sells
+          when "none"
+            "Profile"
+          when "any"
+            "Hub"
+          else
+            "Choose"
+
+  $scope.updateRowText = ->
+    $scope.producer = $scope.producerText()
+    $scope.package = $scope.packageText()
+    $scope.producerError = ($scope.producer == "Choose")
+    $scope.packageError = ($scope.package == "Choose")
+
+
+  $scope.updateRowText()
+
+  $scope.$on "enterprise:updated", ->
+    $scope.updateRowText()

app/assets/javascripts/admin/enterprises/controllers/enterprises_controller.js.coffee

@@ -0,0 +1,13 @@
+angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, Enterprises, Columns) ->
+    Enterprises.loaded = false
+    $scope.allEnterprises = Enterprises.index()
+
+    $scope.loaded = ->
+      Enterprises.loaded
+
+    $scope.columns = Columns.setColumns
+      name:     { name: "Name",     visible: true }
+      producer: { name: "Producer", visible: true }
+      package:  { name: "Package",  visible: true }
+      status:   { name: "Status",   visible: true }
+      manage:   { name: "Manage",   visible: true }

app/assets/javascripts/admin/enterprises/controllers/index_package_panel_controller.js.coffee

@@ -0,0 +1,2 @@
+angular.module("admin.enterprises").controller 'indexPackagePanelCtrl', ($scope, $controller) ->
+    angular.extend this, $controller('indexPanelCtrl', {$scope: $scope})

app/assets/javascripts/admin/enterprises/controllers/index_panel_controller.js.coffee

@@ -0,0 +1,23 @@
+angular.module("admin.enterprises").controller 'indexPanelCtrl', ($scope, Enterprises) ->
+  $scope.enterprise = $scope.object
+  $scope.saving = false
+
+  $scope.saved = ->
+    Enterprises.saved($scope.enterprise)
+
+  $scope.save = ->
+    unless $scope.saved()
+      $scope.saving = true
+      Enterprises.save($scope.enterprise).then (data) ->
+        $scope.$emit("enterprise:updated")
+        $scope.saving = false
+      , (response) ->
+        $scope.saving = false
+        if response.status == 422 && response.data.errors?
+          message = 'Please resolve the following errors:\n'
+          for attr, msg of response.data.errors
+            message += "#{attr} #{msg}\n"
+          alert(message)
+
+  $scope.resetAttribute = (attribute) ->
+    Enterprises.resetAttribute($scope.enterprise, attribute)

app/assets/javascripts/admin/enterprises/controllers/index_producer_panel_controller.js.coffee

@@ -0,0 +1,14 @@
+angular.module("admin.enterprises").controller 'indexProducerPanelCtrl', ($scope, $controller) ->
+  angular.extend this, $controller('indexPanelCtrl', {$scope: $scope})
+
+  $scope.changeToProducer = ->
+    $scope.resetAttribute('sells')
+    $scope.resetAttribute('producer_profile_only')
+    $scope.enterprise.is_primary_producer = true
+
+  $scope.changeToNonProducer = ->
+    if $scope.enterprise.sells == 'own'
+      $scope.enterprise.sells = 'any'
+    if $scope.enterprise.producer_profile_only = true
+      $scope.enterprise.producer_profile_only = false
+    $scope.enterprise.is_primary_producer = false

app/assets/javascripts/admin/enterprises/controllers/index_status_panel_controller.js.coffee

@@ -0,0 +1,3 @@
+angular.module("admin.enterprises").controller 'indexStatusPanelCtrl', ($scope, $filter) ->
+  $scope.issues = $scope.object.issues
+  $scope.warnings = $scope.object.warnings

app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee

@@ -1,6 +1,6 @@
 angular.module("admin.enterprises")
-  .controller "sideMenuCtrl", ($scope, $parse, Enterprise, SideMenu, enterprisePermissions) ->
-    $scope.Enterprise = Enterprise.enterprise
+  .controller "sideMenuCtrl", ($scope, $parse, enterprise, SideMenu, enterprisePermissions) ->
+    $scope.Enterprise = enterprise
     $scope.menu = SideMenu
     $scope.select = SideMenu.select
 
@@ -13,6 +13,7 @@ angular.module("admin.enterprises")
       { name: 'About', icon_class: "icon-pencil" }
       { name: 'Business Details', icon_class: "icon-briefcase" }
       { name: 'Images', icon_class: "icon-picture" }
+      { name: "Properties", icon_class: "icon-tags", show: "showProperties()" }
       { name: "Shipping Methods", icon_class: "icon-truck", show: "showShippingMethods()" }
       { name: "Payment Methods", icon_class: "icon-money", show: "showPaymentMethods()" }
       { name: "Enterprise Fees", icon_class: "icon-tasks", show: "showEnterpriseFees()" }
@@ -28,6 +29,9 @@ angular.module("admin.enterprises")
       else
         true
 
+    $scope.showProperties = ->
+      !!$scope.Enterprise.is_primary_producer
+
     $scope.showShippingMethods = ->
       enterprisePermissions.can_manage_shipping_methods && $scope.Enterprise.sells != "none"
 

app/assets/javascripts/admin/enterprises/enterprises.js.coffee

@@ -1 +1 @@
-angular.module("admin.enterprises", [
+angular.module("admin.enterprises", [

app/assets/javascripts/admin/enterprises/services/enterprise_payment_methods.js.coffee

@@ -1,11 +1,11 @@
 angular.module("admin.enterprises")
-  .factory "EnterprisePaymentMethods", (Enterprise, PaymentMethods) ->
+  .factory "EnterprisePaymentMethods", (enterprise, PaymentMethods) ->
     new class EnterprisePaymentMethods
       paymentMethods: PaymentMethods.paymentMethods
 
       constructor: ->
         for payment_method in @paymentMethods
-          payment_method.selected = payment_method.id in Enterprise.enterprise.payment_method_ids
+          payment_method.selected = payment_method.id in enterprise.payment_method_ids
 
       displayColor: ->
         if @paymentMethods.length > 0 && @selectedCount() > 0

app/assets/javascripts/admin/enterprises/services/enterprise_resource.js.coffee

@@ -0,0 +1,8 @@
+angular.module("admin.enterprises").factory 'EnterpriseResource', ($resource) ->
+  $resource('/admin/enterprises/:id.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+    'update':
+      method: 'PUT'
+  })

app/assets/javascripts/admin/enterprises/services/enterprise_shipping_methods.js.coffee

@@ -1,11 +1,11 @@
 angular.module("admin.enterprises")
-  .factory "EnterpriseShippingMethods", (Enterprise, ShippingMethods) ->
+  .factory "EnterpriseShippingMethods", (enterprise, ShippingMethods) ->
     new class EnterpriseShippingMethods
       shippingMethods: ShippingMethods.shippingMethods
 
       constructor: ->
         for shipping_method in @shippingMethods
-          shipping_method.selected = shipping_method.id in Enterprise.enterprise.shipping_method_ids
+          shipping_method.selected = shipping_method.id in enterprise.shipping_method_ids
 
       displayColor: ->
         if @shippingMethods.length > 0 && @selectedCount() > 0

app/assets/javascripts/admin/enterprises/services/enterprises.js.coffee

@@ -0,0 +1,39 @@
+angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource) ->
+  new class Enterprises
+    enterprises: []
+    enterprises_by_id: {}
+    pristine_by_id: {}
+    loaded: false
+
+    index: (params={}, callback=null) ->
+    	EnterpriseResource.index params, (data) =>
+        for enterprise in data
+          @enterprises.push enterprise
+          @pristine_by_id[enterprise.id] = angular.copy(enterprise)
+
+        @loaded = true
+        (callback || angular.noop)(@enterprises)
+
+    	@enterprises
+
+    save: (enterprise) ->
+      deferred = $q.defer()
+      enterprise.$update({id: enterprise.permalink})
+      .then( (data) =>
+        @pristine_by_id[enterprise.id] = angular.copy(enterprise)
+        deferred.resolve(data)
+      ).catch (response) ->
+        deferred.reject(response)
+      deferred.promise
+
+    saved: (enterprise) ->
+      @diff(enterprise).length == 0
+
+    diff: (enterprise) ->
+      changed = []
+      for attr, value of enterprise when not angular.equals(value, @pristine_by_id[enterprise.id][attr])
+        changed.push attr unless attr is "$$hashKey"
+      changed
+
+    resetAttribute: (enterprise, attribute) ->
+      enterprise[attribute] = @pristine_by_id[enterprise.id][attribute]

app/assets/javascripts/admin/filters/keywords_filter.js.coffee

@@ -0,0 +1,7 @@
+angular.module("ofn.admin").filter "keywords", ($filter) ->
+  return (array, query) ->
+    return array unless query
+    keywords = query.split ' '
+    keywords.forEach (key) ->
+      array = $filter('filter')(array, key)
+    array

app/assets/javascripts/admin/index_utils/controllers/columns_controller.js.coffee

@@ -0,0 +1,4 @@
+angular.module("admin.indexUtils").controller "ColumnsCtrl", ($scope, Columns) ->
+  $scope.columns = Columns.columns
+  $scope.predicate = ""
+  $scope.reverse = false

app/assets/javascripts/admin/index_utils/directives/obj_for_update.js.coffee

@@ -0,0 +1,36 @@
+angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendingChanges) ->
+  scope:
+    object: "&objForUpdate"
+    type: "@objForUpdate"
+    attr: "@attrForUpdate"
+  link: (scope, element, attrs) ->
+    scope.savedValue = scope.object()[scope.attr]
+
+    scope.$watch "object().#{scope.attr}", (value) ->
+      if value == scope.savedValue
+        pendingChanges.remove(scope.object().id, scope.attr)
+        scope.clear()
+      else
+        change =
+          object: scope.object()
+          type: scope.type
+          attr: scope.attr
+          value: value
+          scope: scope
+        scope.pending()
+        pendingChanges.add(scope.object().id, scope.attr, change)
+
+    scope.reset = (value) ->
+      scope.savedValue = value
+
+    scope.success = ->
+      switchClass( element, "update-success", ["update-pending", "update-error"], 3000 )
+
+    scope.pending = ->
+      switchClass( element, "update-pending", ["update-error", "update-success"], false )
+
+    scope.error = ->
+      switchClass( element, "update-error", ["update-pending", "update-success"], false )
+
+    scope.clear = ->
+      switchClass( element, "", ["update-pending", "update-error", "update-success"], false )

app/assets/javascripts/admin/index_utils/directives/panel_row.js.coffee

@@ -0,0 +1,37 @@
+angular.module("admin.indexUtils").directive "panelRow", (Panels, Columns) ->
+  restrict: "C"
+  templateUrl: "admin/panel.html"
+  scope:
+    object: "="
+    panels: "="
+  link: (scope, element, attrs) ->
+    scope.template = ""
+    selected = null
+    scope.columnCount = Columns.visibleCount
+
+    scope.$on "columnCount:changed", (event, count) ->
+      scope.columnCount = count
+
+    setTemplate = ->
+      if selected?
+        scope.template = 'admin/panels/' + scope.panels[selected] + '.html'
+      else
+        scope.template = ""
+
+    scope.getSelected = ->
+      selected
+
+    scope.setSelected = (name) ->
+      scope.$apply ->
+        selected = name
+        setTemplate()
+
+    scope.open = (name) ->
+      element.show 0, ->
+        scope.setSelected name
+
+    scope.close = ->
+      element.hide 0, ->
+        scope.setSelected null
+
+    Panels.register(scope.object.id, scope)

app/assets/javascripts/admin/index_utils/directives/panel_toggle.js.coffee

@@ -0,0 +1,12 @@
+angular.module("admin.indexUtils").directive "panelToggle", ->
+  restrict: "C"
+  transclude: true
+  template: '<div ng-transclude></div><i class=\'icon-chevron\'></i>'
+  require: "^panelToggleRow"
+  scope:
+    name: "@"
+  link: (scope, element, attrs, ctrl) ->
+    scope.selected = ctrl.register(scope.name, element)
+
+    element.on "click", ->
+      scope.selected = ctrl.select(scope.name)

app/assets/javascripts/admin/index_utils/directives/panel_toggle_row.js.coffee

@@ -0,0 +1,29 @@
+angular.module("admin.indexUtils").directive "panelToggleRow", (Panels) ->
+  restrict: "C"
+  scope:
+    object: "="
+    selected: "@?"
+  controller: ($scope) ->
+    panelToggles = {}
+
+    this.register = (name, element) ->
+      panelToggles[name] = element
+      panelToggles[name].addClass("selected") if $scope.selected == name
+      $scope.selected == name
+
+    this.select = (name) ->
+      panelToggle.removeClass("selected") for panelName, panelToggle of panelToggles
+
+      switch $scope.selected = Panels.toggle($scope.object.id, name)
+        when null
+          panelToggles[name].parent(".panel-toggle-row").removeClass("expanded")
+        else
+          panelToggles[$scope.selected].addClass("selected")
+          panelToggles[$scope.selected].parent(".panel-toggle-row").addClass("expanded")
+
+      $scope.selected == name
+
+    this
+  #
+  # link: (scope, element, attrs) ->
+  #   Panels.registerInitialSelection(scope.object.id, scope.selected)

app/assets/javascripts/admin/index_utils/directives/toggle_column.js.coffee

@@ -0,0 +1,8 @@
+angular.module("admin.indexUtils").directive "ofnToggleColumn", (Columns) ->
+  link: (scope, element, attrs) ->
+    element.addClass "selected" if scope.column.visible
+
+    element.click "click", ->
+      scope.$apply ->
+        Columns.toggleColumn(scope.column)
+        element.toggleClass "selected"

app/assets/javascripts/admin/index_utils/index_utils.js.coffee

@@ -0,0 +1 @@
+angular.module("admin.indexUtils", ['ngResource', 'templates']).config ($httpProvider) ->

app/assets/javascripts/admin/index_utils/services/columns.js.coffee

@@ -0,0 +1,18 @@
+angular.module("admin.indexUtils").factory 'Columns', ($rootScope) ->
+  new class Columns
+    columns: {}
+    visibleCount: 0
+
+    setColumns: (columns) =>
+      @columns = {}
+      @columns[name] = column for name, column of columns
+      @calculateVisibleCount()
+      @columns
+
+    toggleColumn: (column) =>
+      column.visible = !column.visible
+      @calculateVisibleCount()
+
+    calculateVisibleCount: =>
+      @visibleCount = (column for name, column of @columns when column.visible).length
+      $rootScope.$broadcast "columnCount:changed", @visibleCount

app/assets/javascripts/admin/index_utils/services/panels.js.coffee

@@ -0,0 +1,19 @@
+angular.module("admin.indexUtils").factory 'Panels', ->
+  new class Panels
+    panels: {}
+
+    register: (id, scope) ->
+      if id? && scope?
+        @panels[id] = scope
+
+    toggle: (id, name) ->
+      scope = @panels[id]
+      selected = scope.getSelected()
+      switch selected
+        when name
+          scope.close()
+        when null
+          scope.open(name)
+        else
+          scope.setSelected(name)
+      scope.getSelected()

app/assets/javascripts/admin/index_utils/services/pending_changes.js.coffee

@@ -0,0 +1,33 @@
+angular.module("admin.indexUtils").factory "pendingChanges", (resources) ->
+  new class pendingChanges
+    pendingChanges: {}
+
+    add: (id, attr, change) =>
+      @pendingChanges["#{id}"] = {} unless @pendingChanges.hasOwnProperty("#{id}")
+      @pendingChanges["#{id}"]["#{attr}"] = change
+
+    removeAll: =>
+      @pendingChanges = {}
+
+    remove: (id, attr) =>
+      if @pendingChanges.hasOwnProperty("#{id}")
+        delete @pendingChanges["#{id}"]["#{attr}"]
+        delete @pendingChanges["#{id}"] if @changeCount( @pendingChanges["#{id}"] ) < 1
+
+    submitAll: =>
+      all = []
+      for id, objectChanges of @pendingChanges
+        for attrName, change of objectChanges
+          all.push @submit(change)
+      all
+
+    submit: (change) ->
+      resources.update(change).$promise.then (data) =>
+        @remove change.object.id, change.attr
+        change.scope.reset( data["#{change.attr}"] )
+        change.scope.success()
+      , (error) ->
+        change.scope.error()
+
+    changeCount: (objectChanges) ->
+      Object.keys(objectChanges).length

app/assets/javascripts/admin/index_utils/services/resources.js.coffee

@@ -0,0 +1,30 @@
+angular.module("admin.indexUtils").factory "resources", ($resource) ->
+  LineItem = $resource '/api/orders/:order_number/line_items/:line_item_id.json',
+    { order_number: '@order_number', line_item_id: '@line_item_id'},
+    'update': { method: 'PUT' }
+  Customer = $resource '/admin/customers/:customer_id.json',
+    { customer_id: '@customer_id'},
+    'update': { method: 'PUT' }
+
+  return {
+    update: (change) ->
+      params = {}
+      data = {}
+      resource = null
+
+      switch change.type
+        when "line_item"
+          resource = LineItem
+          params.order_number = change.object.order.number
+          params.line_item_id = change.object.id
+          data.line_item = {}
+          data.line_item[change.attr] = change.value
+        when "customer"
+          resource = Customer
+          params.customer_id = change.object.id
+          data.customer = {}
+          data.customer[change.attr] = change.value
+        else ""
+
+      resource.update(params, data)
+  }

app/assets/javascripts/admin/index_utils/services/switch_class.js.coffee

@@ -0,0 +1,10 @@
+angular.module("admin.indexUtils").factory "switchClass", ($timeout) ->
+  return (element,classToAdd,removeClasses,timeout) ->
+    $timeout.cancel element.timeout if element.timeout
+    element.removeClass className for className in removeClasses
+    element.addClass classToAdd
+    intRegex = /^\d+$/
+    if timeout && intRegex.test(timeout)
+      element.timeout = $timeout(->
+        element.removeClass classToAdd
+      , timeout, true)

app/assets/javascripts/admin/order_cycle.js.erb.coffee

@@ -1,11 +1,10 @@
 angular.module('admin.order_cycles', ['ngResource'])
-  .controller('AdminCreateOrderCycleCtrl', ['$scope', 'OrderCycle', 'Enterprise', 'EnterpriseFee', 'ocInstance', ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
-    $scope.enterprises = Enterprise.index()
+  .controller('AdminCreateOrderCycleCtrl', ['$scope', '$filter', 'OrderCycle', 'Enterprise', 'EnterpriseFee', 'ocInstance', ($scope, $filter, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
+    $scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id)
     $scope.supplied_products = Enterprise.supplied_products
-    $scope.enterprise_fees = EnterpriseFee.index()
+    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
 
-    $scope.order_cycle = OrderCycle.order_cycle
-    $scope.order_cycle.coordinator_id = ocInstance.coordinator_id
+    $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
 
     $scope.loaded = ->
       Enterprise.loaded && EnterpriseFee.loaded
@@ -28,14 +27,14 @@ angular.module('admin.order_cycles', ['ngResource'])
     $scope.variantSuppliedToOrderCycle = (variant) ->
       OrderCycle.variantSuppliedToOrderCycle(variant)
 
-    $scope.incomingExchangesVariants = ->
-      OrderCycle.incomingExchangesVariants()
+    $scope.incomingExchangeVariantsFor = (enterprise_id) ->
+      $filter('filterExchangeVariants')(OrderCycle.incomingExchangesVariants(), $scope.order_cycle.visible_variants_for_outgoing_exchanges[enterprise_id])
 
     $scope.exchangeDirection = (exchange) ->
       OrderCycle.exchangeDirection(exchange)
 
-    $scope.participatingEnterprises = ->
-      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds()
+    $scope.enterprisesWithFees = ->
+      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
 
     $scope.toggleProducts = ($event, exchange) ->
       $event.preventDefault()
@@ -80,12 +79,12 @@ angular.module('admin.order_cycles', ['ngResource'])
       OrderCycle.create()
   ])
 
-  .controller('AdminEditOrderCycleCtrl', ['$scope', '$location', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
-    $scope.enterprises = Enterprise.index()
-    $scope.supplied_products = Enterprise.supplied_products
-    $scope.enterprise_fees = EnterpriseFee.index()
-
+  .controller('AdminEditOrderCycleCtrl', ['$scope', '$filter', '$location', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, $filter, $location, OrderCycle, Enterprise, EnterpriseFee) ->
     order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
+    $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
+    $scope.supplied_products = Enterprise.supplied_products
+    $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
+
     $scope.order_cycle = OrderCycle.load(order_cycle_id)
 
     $scope.loaded = ->
@@ -109,14 +108,14 @@ angular.module('admin.order_cycles', ['ngResource'])
     $scope.variantSuppliedToOrderCycle = (variant) ->
       OrderCycle.variantSuppliedToOrderCycle(variant)
 
-    $scope.incomingExchangesVariants = ->
-      OrderCycle.incomingExchangesVariants()
+    $scope.incomingExchangeVariantsFor = (enterprise_id) ->
+      $filter('filterExchangeVariants')(OrderCycle.incomingExchangesVariants(), $scope.order_cycle.visible_variants_for_outgoing_exchanges[enterprise_id])
 
     $scope.exchangeDirection = (exchange) ->
       OrderCycle.exchangeDirection(exchange)
 
-    $scope.participatingEnterprises = ->
-      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds()
+    $scope.enterprisesWithFees = ->
+      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
 
     $scope.toggleProducts = ($event, exchange) ->
       $event.preventDefault()

app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee

@@ -1,8 +1,9 @@
-angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
-  $scope.enterprises = Enterprise.index (enterprises) =>
-    $scope.init(enterprises)
-  $scope.enterprise_fees = EnterpriseFee.index()
-  $scope.order_cycle = OrderCycle.order_cycle
+angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
+  $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, =>
+    # TODO: make this a get method, which only fetches one enterprise
+    $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) =>
+      $scope.init(enterprises)
+    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
 
   $scope.init = (enterprises) ->
     enterprise = enterprises[Object.keys(enterprises)[0]]

app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee

@@ -2,8 +2,8 @@ angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl",
   $scope.orderCycleId = ->
     $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
 
-  $scope.enterprises = Enterprise.index()
-  $scope.enterprise_fees = EnterpriseFee.index()
+  $scope.enterprises = Enterprise.index(order_cycle_id: $scope.orderCycleId())
+  $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: $scope.orderCycleId())
   $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
     $scope.init()
 

app/assets/javascripts/admin/order_cycles/filters/filter_exchange_variants.js.coffee

@@ -0,0 +1,6 @@
+angular.module("admin.order_cycles").filter "filterExchangeVariants", ->
+  return (variants, rules) ->
+    if variants? && rules?
+      return (variant for variant in variants when variant in rules)
+    else
+      return []

app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee

@@ -0,0 +1,4 @@
+angular.module("admin.order_cycles").filter "visibleProductVariants", ->
+  return (product, exchange, rules) ->
+    variants = product.variants.concat( [{ "id": product.master_id}] )
+    return (variant for variant in variants when variant.id in rules[exchange.enterprise_id])

app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee

@@ -0,0 +1,3 @@
+angular.module("admin.order_cycles").filter "visibleProducts", ($filter) ->
+  return (products, exchange, rules) ->
+    return (product for product in products when $filter('visibleProductVariants')(product, exchange, rules).length > 0)

app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee

@@ -1,24 +1,28 @@
 angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
-  Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {'index': {method: 'GET', isArray: true}})
-
+  Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+      params:
+        order_cycle_id: '@order_cycle_id'
+        coordinator_id: '@coordinator_id'
+  })
   {
     Enterprise: Enterprise
     enterprises: {}
     supplied_products: []
     loaded: false
 
-    index: (callback=null) ->
-    	service = this
-
-    	Enterprise.index (data) ->
+    index: (params={}, callback=null) ->
+    	Enterprise.index params, (data) =>
         for enterprise in data
-          service.enterprises[enterprise.id] = enterprise
+          @enterprises[enterprise.id] = enterprise
 
           for product in enterprise.supplied_products
-            service.supplied_products.push(product)
+            @supplied_products.push(product)
 
-        service.loaded = true
-        (callback || angular.noop)(service.enterprises)
+        @loaded = true
+        (callback || angular.noop)(@enterprises)
 
     	this.enterprises
 
@@ -40,4 +44,4 @@ angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
           numVariants += if product.variants.length == 0 then 1 else product.variants.length
 
       numVariants
-  })
+  })

app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee

@@ -1,18 +1,23 @@
 angular.module('admin.order_cycles').factory('EnterpriseFee', ($resource) ->
-  EnterpriseFee = $resource('/admin/enterprise_fees/:enterprise_fee_id.json', {}, {'index': {method: 'GET', isArray: true}})
+  EnterpriseFee = $resource('/admin/enterprise_fees/for_order_cycle/:enterprise_fee_id.json', {},  {
+    'index':
+      method: 'GET'
+      isArray: true
+      params:
+        order_cycle_id: '@order_cycle_id'
+        coordinator_id: '@coordinator_id'
+  })
 
   {
     EnterpriseFee: EnterpriseFee
     enterprise_fees: {}
     loaded: false
 
-    index: ->
-      service = this
-      EnterpriseFee.index (data) ->
-        service.enterprise_fees = data
-        service.loaded = true
+    index: (params={}) ->
+      EnterpriseFee.index params, (data) =>
+        @enterprise_fees = data
+        @loaded = true
 
     forEnterprise: (enterprise_id) ->
-      enterprise_fee for enterprise_fee in this.enterprise_fees when enterprise_fee.enterprise_id == enterprise_id
+      enterprise_fee for enterprise_fee in @enterprise_fees when enterprise_fee.enterprise_id == enterprise_id
   })
-

app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee

@@ -1,14 +1,12 @@
 angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window) ->
-  OrderCycle = $resource '/admin/order_cycles/:order_cycle_id.json', {}, {
+  OrderCycle = $resource '/admin/order_cycles/:action_name/:order_cycle_id.json', {}, {
     'index':  { method: 'GET', isArray: true}
+    'new'   : { method: 'GET', params: { action_name: "new" } }
 		'create': { method: 'POST'}
 		'update': { method: 'PUT'}}
 
   {
-    order_cycle:
-      incoming_exchanges: []
- 	    outgoing_exchanges: []
-      coordinator_fees: []
+    order_cycle: {}
 
     loaded: false
 
@@ -24,7 +22,9 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
     	exchange.showProducts = !exchange.showProducts
 
     setExchangeVariants: (exchange, variants, selected) ->
-      exchange.variants[variant] = selected for variant in variants
+      direction = if exchange.incoming then "incoming" else "outgoing"
+      editable = @order_cycle["editable_variants_for_#{direction}_exchanges"][exchange.enterprise_id] || []
+      exchange.variants[variant] = selected for variant in variants when variant in editable
 
     addSupplier: (new_supplier_id) ->
     	this.order_cycle.incoming_exchanges.push({enterprise_id: new_supplier_id, incoming: true, active: true, variants: {}, enterprise_fees: []})
@@ -84,6 +84,20 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
       for exchange in this.order_cycle.outgoing_exchanges
         exchange.variants[variant_id] = false
 
+    new: (params, callback=null) ->
+      OrderCycle.new params, (oc) =>
+        delete oc.$promise
+        delete oc.$resolved
+        angular.extend(@order_cycle, oc)
+        @order_cycle.incoming_exchanges = []
+        @order_cycle.outgoing_exchanges = []
+        delete(@order_cycle.exchanges)
+        @loaded = true
+
+        (callback || angular.noop)(@order_cycle)
+
+      @order_cycle
+
     load: (order_cycle_id, callback=null) ->
       service = this
       OrderCycle.get {order_cycle_id: order_cycle_id}, (oc) ->
@@ -127,6 +141,7 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
 
     dataForSubmit: ->
       data = this.deepCopy()
+      data = this.stripNonSubmittableAttributes(data)
       data = this.removeInactiveExchanges(data)
       data = this.translateCoordinatorFees(data)
       data = this.translateExchangeFees(data)
@@ -147,6 +162,14 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
 
       data
 
+    stripNonSubmittableAttributes: (order_cycle) ->
+      delete order_cycle.id
+      delete order_cycle.viewing_as_coordinator
+      delete order_cycle.editable_variants_for_incoming_exchanges
+      delete order_cycle.editable_variants_for_outgoing_exchanges
+      delete order_cycle.visible_variants_for_outgoing_exchanges
+      order_cycle
+
     removeInactiveExchanges: (order_cycle) ->
       order_cycle.incoming_exchanges =
         (exchange for exchange in order_cycle.incoming_exchanges when exchange.active)

app/assets/javascripts/admin/products/units_controller.js.coffee

@@ -5,6 +5,13 @@ angular.module("admin.products")
     $scope.placeholder_text = ""
 
     $scope.$watchCollection '[product.variant_unit_with_scale, product.master.unit_value_with_description]', ->
+      $scope.processVariantUnitWithScale()
+      $scope.processUnitValueWithDescription()
+      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name()
+
+    $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
+
+    $scope.processVariantUnitWithScale = ->
       if $scope.product.variant_unit_with_scale
         match = $scope.product.variant_unit_with_scale.match(/^([^_]+)_([\d\.]+)$/)
         if match
@@ -16,18 +23,15 @@ angular.module("admin.products")
       else
         $scope.product.variant_unit = $scope.product.variant_unit_scale = null
 
+    $scope.processUnitValueWithDescription = ->
       if $scope.product.master.hasOwnProperty("unit_value_with_description")
-        match = $scope.product.master.unit_value_with_description.match(/^([\d\.]+(?= |$)|)( |)(.*)$/)
+        match = $scope.product.master.unit_value_with_description.match(/^([\d\.]+(?= *|$)|)( *)(.*)$/)
         if match
           $scope.product.master.unit_value  = parseFloat(match[1])
           $scope.product.master.unit_value  = null if isNaN($scope.product.master.unit_value)
           $scope.product.master.unit_value *= $scope.product.variant_unit_scale if $scope.product.master.unit_value && $scope.product.variant_unit_scale
           $scope.product.master.unit_description = match[3]
 
-      $scope.placeholder_text = new OptionValueNamer($scope.product.master).name()
-
-    $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
-
     $scope.hasVariants = (product) ->
       Object.keys(product.variants).length > 0
 

app/assets/javascripts/admin/services/bulk_products.js.coffee

@@ -19,7 +19,7 @@ angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher)
         # when a respond_overrride for the clone action is used.
         id = data.product.id
         dataFetcher("/api/products/" + id + "?template=bulk_show").then (newProduct) =>
-          @addProducts [newProduct]
+          @insertProductAfter(product, newProduct)
 
     updateVariantLists: (serverProducts, productsWithUnsavedVariants) ->
       for product in productsWithUnsavedVariants
@@ -39,6 +39,10 @@ angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher)
         @unpackProduct product
         @products.push product
 
+    insertProductAfter: (product, newProduct) ->
+      index = @products.indexOf(product)
+      @products.splice(index + 1, 0, newProduct)
+
     unpackProduct: (product) ->
       #$scope.matchProducer product
       @loadVariantUnit product

app/assets/javascripts/admin/services/data_submitter.js.coffee

@@ -1,13 +0,0 @@
-angular.module("ofn.admin").factory "dataSubmitter", [
-  "$http", "$q", "switchClass"
-  ($http, $q, switchClass) ->
-    return (changeObj) ->
-      deferred = $q.defer()
-      $http.put(changeObj.url).success((data) ->
-        switchClass changeObj.element, "update-success", ["update-pending", "update-error"], 3000
-        deferred.resolve data
-      ).error ->
-        switchClass changeObj.element, "update-error", ["update-pending", "update-success"], false
-        deferred.reject()
-      deferred.promise
-]

app/assets/javascripts/admin/services/display_properties.js.coffee

@@ -3,12 +3,10 @@ angular.module("ofn.admin").factory "DisplayProperties", ->
     displayProperties: {}
 
     showVariants: (product_id) ->
-      @initProduct product_id
-      @displayProperties[product_id].showVariants
+      @productProperties(product_id).showVariants
 
     setShowVariants: (product_id, showVariants) ->
-      @initProduct product_id
-      @displayProperties[product_id].showVariants = showVariants
+      @productProperties(product_id).showVariants = showVariants
 
-    initProduct: (product_id) ->
+    productProperties: (product_id) ->
       @displayProperties[product_id] ||= {showVariants: false}

app/assets/javascripts/admin/services/enterprise_relationships.js.coffee

@@ -26,7 +26,7 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
 
     permission_presentation: (permission) ->
       switch permission
-        when "add_to_order_cycle" then "to add to order cycle"
-        when "manage_products" then "to manage products"
-        when "edit_profile" then "to edit profile"
-        when "create_variant_overrides" then "to override variant details"
+        when "add_to_order_cycle" then "add to order cycle"
+        when "manage_products" then "manage products"
+        when "edit_profile" then "edit profile"
+        when "create_variant_overrides" then "override variant details"

app/assets/javascripts/admin/services/pending_changes.js.coffee

@@ -1,32 +0,0 @@
-angular.module("ofn.admin").factory "pendingChanges",[
-  "dataSubmitter"
-  (dataSubmitter) ->
-    pendingChanges: {}
-
-    add: (id, attrName, changeObj) ->
-      @pendingChanges["#{id}"] = {} unless @pendingChanges.hasOwnProperty("#{id}")
-      @pendingChanges["#{id}"]["#{attrName}"] = changeObj
-
-    removeAll: ->
-      @pendingChanges = {}
-
-    remove: (id, attrName) ->
-      if @pendingChanges.hasOwnProperty("#{id}")
-        delete @pendingChanges["#{id}"]["#{attrName}"]
-        delete @pendingChanges["#{id}"] if @changeCount( @pendingChanges["#{id}"] ) < 1
-
-    submitAll: ->
-      all = []
-      for id,lineItem of @pendingChanges
-        for attrName,changeObj of lineItem
-          all.push @submit(id, attrName, changeObj)
-      all
-
-    submit: (id, attrName, change) ->
-      dataSubmitter(change).then (data) =>
-        @remove id, attrName
-        change.element.dbValue = data["#{attrName}"]
-
-    changeCount: (lineItem) ->
-      Object.keys(lineItem).length
-]

app/assets/javascripts/admin/services/switch_class.js.coffee

@@ -1,13 +0,0 @@
-angular.module("ofn.admin").factory "switchClass", [
-  "$timeout"
-  ($timeout) ->
-    return (element,classToAdd,removeClasses,timeout) ->
-      $timeout.cancel element.timeout if element.timeout
-      element.removeClass className for className in removeClasses
-      element.addClass classToAdd
-      intRegex = /^\d+$/
-      if timeout && intRegex.test(timeout)
-        element.timeout = $timeout(->
-          element.removeClass classToAdd
-        , timeout, true)
-]

app/assets/javascripts/darkswarm/all.js.coffee

@@ -36,4 +36,4 @@
 $ ->
   # Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
   Foundation.set_namespace ""
-  #$(document).foundation()
+  $(document).foundation()

app/assets/javascripts/darkswarm/controllers/group_enterprises_controller.js.coffee

@@ -1,10 +1,10 @@
-Darkswarm.controller "GroupEnterprisesCtrl", ($scope, Enterprises, Search, FilterSelectorsService) ->
-  $scope.Enterprises = Enterprises
+Darkswarm.controller "GroupEnterprisesCtrl", ($scope, Search, FilterSelectorsService, EnterpriseModal) ->
   $scope.totalActive =  FilterSelectorsService.totalActive
   $scope.clearAll =  FilterSelectorsService.clearAll
   $scope.filterText =  FilterSelectorsService.filterText
   $scope.FilterSelectorsService =  FilterSelectorsService
   $scope.query = Search.search()
+  $scope.openModal = EnterpriseModal.open
   $scope.activeTaxons = []
   $scope.show_profiles = false
   $scope.filtersActive = false

app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee

@@ -0,0 +1,14 @@
+Darkswarm.controller "GroupPageCtrl", ($scope, group_enterprises, Enterprises, MapConfiguration, OfnMap) ->
+  $scope.Enterprises = Enterprises
+
+  group_enterprises_ids = group_enterprises.map (enterprise) =>
+    enterprise.id
+  is_in_group = (enterprise) ->
+    group_enterprises_ids.indexOf(enterprise.id) != -1
+
+  $scope.group_producers = Enterprises.producers.filter is_in_group
+  $scope.group_hubs = Enterprises.hubs.filter is_in_group
+
+  $scope.map = angular.copy MapConfiguration.options
+  $scope.mapMarkers = OfnMap.enterprise_markers group_enterprises
+

app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee

@@ -1,8 +1,3 @@
 Darkswarm.controller "GroupsCtrl", ($scope, Groups, $anchorScroll, $rootScope) ->
   $scope.Groups = Groups
   $scope.order = 'position'
-
-  #$rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) ->
-    #$anchorScroll()
-    #
-      #

app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee

@@ -1,6 +1,6 @@
 Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, Navigation, $location, $templateCache, CurrentHub) ->
-  $scope.toggle = ->
-    HashNavigation.toggle $scope.hub.hash
+  $scope.toggle = (e) ->
+    HashNavigation.toggle $scope.hub.hash if !angular.element(e.target).inheritedData('is-link')
 
   $scope.open = ->
     HashNavigation.active $scope.hub.hash

app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee

@@ -1,4 +1,4 @@
-Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle, FilterSelectorsService, Cart) ->
+Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle, FilterSelectorsService, Cart, Taxons, Properties) ->
   $scope.Products = Products
   $scope.Cart = Cart
   $scope.totalActive =  FilterSelectorsService.totalActive
@@ -9,6 +9,9 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle,
   $scope.limit = 3
   $scope.order_cycle = OrderCycle.order_cycle
 
+  $scope.$watch "Products.loading", (newValue, oldValue) ->
+    $scope.$broadcast("loadFilterSelectors") if !newValue
+
   $scope.incrementLimit = ->
     if $scope.limit < Products.products.length
       $scope.limit = $scope.limit + 1
@@ -17,3 +20,17 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle,
     code = e.keyCode || e.which
     if code == 13
       e.preventDefault()
+
+  $scope.appliedTaxonsList = ->
+    $scope.activeTaxons.map( (taxon_id) ->
+      Taxons.taxons_by_id[taxon_id].name
+    ).join(" & ") if $scope.activeTaxons?
+
+  $scope.appliedPropertiesList = ->
+    $scope.activeProperties.map( (property_id) ->
+      Properties.properties_by_id[property_id].name
+    ).join(" & ") if $scope.activeProperties?
+
+  $scope.clearAll = ->
+    $scope.query = ""
+    FilterSelectorsService.clearAll()

app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee

@@ -3,7 +3,7 @@ Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, Enterpris
   $scope.enterprise = EnterpriseRegistrationService.enterprise
   $scope.select = RegistrationService.select
 
-  $scope.steps = ['details','contact','type','about','images','social']
+  $scope.steps = ['details', 'contact', 'type', 'about', 'images', 'social']
 
   $scope.countries = availableCountries
 

app/assets/javascripts/darkswarm/directives/active_selector.js.coffee

@@ -6,10 +6,10 @@ Darkswarm.directive "activeSelector",  ->
   replace: true
   templateUrl: 'active_selector.html'
   link: (scope, elem, attr)->
-    scope.selector.emit = scope.emit
-    elem.bind "click", ->
-      scope.$apply ->
-        scope.selector.active = !scope.selector.active 
-        # This function is a convention, e.g. a callback on the scope applied when active changes
-        scope.emit() if scope.emit 
-  
+    unless scope.readOnly && scope.readOnly()
+      scope.selector.emit = scope.emit
+      elem.bind "click", ->
+        scope.$apply ->
+          scope.selector.active = !scope.selector.active
+          # This function is a convention, e.g. a callback on the scope applied when active changes
+          scope.emit() if scope.emit

app/assets/javascripts/darkswarm/directives/filter_selector.js.coffee

@@ -1,43 +1,48 @@
-Darkswarm.directive "taxonSelector",  (FilterSelectorsService)->
+Darkswarm.directive "filterSelector",  (FilterSelectorsService)->
   # Automatically builds activeSelectors for taxons
   # Lots of magic here
   restrict: 'E'
   replace: true
   scope:
     objects: "&"
-    results: "="
-  templateUrl: "taxon_selector.html"
+    activeSelectors: "=?"
+    allSelectors: "=?" # Optional
+  templateUrl: "filter_selector.html"
 
   link: (scope, elem, attr)->
     selectors_by_id = {}
     selectors = null  # To get scoping/closure right
 
+    scope.readOnly = ->
+      !attr.activeSelectors?
+
     scope.emit = ->
-      scope.results = selectors.filter (selector)->
+      scope.activeSelectors = selectors.filter (selector)->
         selector.active
       .map (selector)->
-        selector.taxon.id
+        selector.object.id
 
-    # Build hash of unique taxons, each of which gets an ActiveSelector
-    scope.selectors = ->
-      taxons = {} 
-      selectors = []
-      for object in scope.objects()
-        for taxon in object.taxons
-          taxons[taxon.id] = taxon
-        if object.supplied_taxons
-          for taxon in object.supplied_taxons
-            taxons[taxon.id] = taxon
-      
-      # Generate a selector for each taxon.
+    scope.$watchCollection "objects()", (newValue, oldValue) ->
+      scope.allSelectors = scope.buildSelectors()
+
+    # Build a list of selectors
+    scope.buildSelectors = ->
+      # Generate a selector for each object.
       # NOTE: THESE ARE MEMOIZED to stop new selectors from being created constantly, otherwise function always returns non-identical results
       # This means the $digest cycle can never close and times out
       # See http://stackoverflow.com/questions/19306452/how-to-fix-10-digest-iterations-reached-aborting-error-in-angular-1-2-fil
-      for id, taxon of taxons
+      selectors = []
+      for id, object of scope.objects()
         if selector = selectors_by_id[id]
           selectors.push selector
         else
           selector = selectors_by_id[id] = FilterSelectorsService.new
-            taxon: taxon
+            object: object
           selectors.push selector
       selectors
+
+    scope.ifDefined = (value, if_undefined) ->
+      if angular.isDefined(value)
+        value
+      else
+        if_undefined

app/assets/javascripts/darkswarm/directives/single_line_selectors.coffee

@@ -0,0 +1,73 @@
+Darkswarm.directive 'singleLineSelectors', ($timeout, $filter) ->
+  restrict: 'E'
+  templateUrl: "single_line_selectors.html"
+  scope:
+    objects: "&"
+    activeSelectors: "="
+    selectorName: "@activeSelectors"
+  link: (scope,element,attrs) ->
+    scope.fitting = false
+
+    scope.overFlowSelectors = ->
+      return [] unless scope.allSelectors?
+      $filter('filter')(scope.allSelectors, { fits: false })
+
+    scope.selectedOverFlowSelectors = ->
+      $filter('filter')(scope.overFlowSelectors(), { active: true })
+
+    # had to duplicate this to make overflow selectors work
+    scope.emit = ->
+      scope.activeSelectors = scope.allSelectors.filter (selector)->
+        selector.active
+      .map (selector)->
+        selector.object.id
+
+    # From: http://stackoverflow.com/questions/4298612/jquery-how-to-call-resize-event-only-once-its-finished-resizing
+    debouncer = (func, timeout) ->
+      timeoutID = undefined
+      timeout = timeout or 50
+      ->
+        subject = this
+        args = arguments
+        clearTimeout timeoutID
+        timeoutID = setTimeout(->
+          func.apply subject, Array::slice.call(args)
+        , timeout)
+
+    loadWidths = ->
+      $(element).find("li").not(".more").each (i) ->
+        scope.allSelectors[i].width = $(this).outerWidth(true)
+        return null # So we don't exit the loop weirdly
+
+
+    fit = ->
+      used = $(element).find("li.more").outerWidth(true)
+      used += selector.width for selector in scope.allSelectors when selector.fits
+      available = $(element).parent(".filter-shopfront").innerWidth() - used
+      if available > 0
+        for selector in scope.allSelectors when !selector.fits
+          available -= selector.width
+          selector.fits = true if available > 0
+      else
+        if scope.allSelectors.length > 0
+          for i in [scope.allSelectors.length-1..0]
+            selector = scope.allSelectors[i]
+            if !selector.fits
+              continue
+            else
+              if available < 0
+                selector.fits = false
+                available += selector.width
+      scope.fitting = false
+
+    scope.$watchCollection "allSelectors", ->
+      if scope.allSelectors?
+        scope.fitting = true
+        selector.fits = true for selector in scope.allSelectors
+        $timeout(loadWidths, 0, true).then ->
+          $timeout fit, 0, true
+
+    $(window).resize debouncer (e) ->
+      scope.fitting = true
+      if scope.allSelectors?
+        $timeout fit, 0, true

app/assets/javascripts/darkswarm/filters/properties.js.coffee

@@ -0,0 +1,16 @@
+Darkswarm.filter 'properties', ()->
+  # Filter anything that responds to object.properties
+  (objects, ids) ->
+    objects ||= []
+    ids ?= []
+    if ids.length == 0
+      # No properties selected, pass all objects through.
+      objects
+    else
+      objects.filter (obj)->
+        properties = obj.properties
+        # Combine object properties with supplied properties, if they exist.
+        # properties = properties.concat obj.supplied_properties if obj.supplied_properties
+        # Match property array.
+        properties.some (property)->
+          property.id in ids

app/assets/javascripts/darkswarm/filters/properties_of.js.coffee

@@ -0,0 +1,7 @@
+Darkswarm.filter 'propertiesOf', ->
+  (objects)->
+    properties = {}
+    for object in objects
+      for property in object.properties
+        properties[property.id] = property
+    properties

app/assets/javascripts/darkswarm/filters/properties_with_values_of.js.coffee

@@ -0,0 +1,7 @@
+Darkswarm.filter 'propertiesWithValuesOf', ->
+  (objects)->
+    propertiesWithValues = {}
+    for object in objects
+      for property in object.properties_with_values
+        propertiesWithValues[property.id] = property
+    propertiesWithValues

app/assets/javascripts/darkswarm/filters/taxons_of.js.coffee

@@ -0,0 +1,10 @@
+Darkswarm.filter 'taxonsOf', ->
+  (objects)->
+    taxons = {}
+    for object in objects
+      for taxon in object.taxons
+        taxons[taxon.id] = taxon
+      if object.supplied_taxons
+        for taxon in object.supplied_taxons
+          taxons[taxon.id] = taxon
+    taxons

app/assets/javascripts/darkswarm/services/authentication_service.js.coffee

@@ -25,7 +25,7 @@ Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redir
     active: Navigation.active
 
     close: ->
-      if location.pathname == "/"
+      if location.pathname in ["/", "/checkout"]
         Navigation.navigate "/"
       else
         Loading.message = "Taking you back to the home page"

app/assets/javascripts/darkswarm/services/map.js.coffee

@@ -1,11 +1,13 @@
-Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal, visibleFilter)->
+Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal, visibleFilter) ->
   new class OfnMap
     constructor: ->
-      @enterprises = (@extend(enterprise) for enterprise in visibleFilter(Enterprises.enterprises))
+      @enterprises = @enterprise_markers(Enterprises.enterprises)
 
+    enterprise_markers: (enterprises) ->
+      @extend(enterprise) for enterprise in visibleFilter(enterprises)
 
     # Adding methods to each enterprise
-    extend: (enterprise)->
+    extend: (enterprise) ->
       new class MapMarker
         # We're whitelisting attributes because GMaps tries to crawl
         # our data, and our data is recursive, so it breaks

app/assets/javascripts/darkswarm/services/map_configuration.js.coffee

@@ -7,5 +7,5 @@ Darkswarm.factory "MapConfiguration", ->
       zoom: 12
       additional_options: {}
         #mapTypeId: 'satellite' 
-      styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]}]
+      styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]},{"featureType":"road","elementType": "labels.icon","stylers":[{"visibility":"off"}]}]
 

app/assets/javascripts/darkswarm/services/products.js.coffee

@@ -1,27 +1,30 @@
-Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Cart, Variants) ->
+Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Properties, Cart, Variants) ->
   new class Products
     constructor: ->
       @update()
-    
+
     # TODO: don't need to scope this into object
     # Already on object as far as controller scope is concerned
     products: null
     loading: true
 
     update: =>
-      @loading = true 
+      @loading = true
       @products = $resource("/shop/products").query (products)=>
         @extend() && @dereference()
-        @registerVariants() 
+        @registerVariants()
         @registerVariantsWithCart()
         @loading = false
       @
-    
+
     dereference: ->
       for product in @products
         product.supplier = Enterprises.enterprises_by_id[product.supplier.id]
         Dereferencer.dereference product.taxons, Taxons.taxons_by_id
-    
+
+        product.properties = angular.copy(product.properties_with_values)
+        Dereferencer.dereference product.properties, Properties.properties_by_id
+
     # May return different objects! If the variant has already been registered
     # by another service, we fetch those
     registerVariants: ->
@@ -29,8 +32,9 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Car
         if product.variants
           product.variants = (Variants.register variant for variant in product.variants)
           variant.product = product for variant in product.variants
-        product.master.product = product
-        product.master = Variants.register product.master if product.master
+        if product.master
+          product.master.product = product
+          product.master = Variants.register product.master
 
     registerVariantsWithCart: ->
       for product in @products
@@ -45,7 +49,7 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Car
           prices = (v.price for v in product.variants)
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
-        
+
         product.primaryImage = product.images[0]?.small_url if product.images
         product.primaryImageOrMissing = product.primaryImage || "/assets/noimage/small.png"
         product.largeImage = product.images[0]?.large_url if product.images

app/assets/javascripts/darkswarm/services/properties.js.coffee

@@ -0,0 +1,9 @@
+Darkswarm.factory "Properties", (properties)->
+  new class Properties
+    # Populate ProductProperties.properties from json in page.
+    properties: properties
+    properties_by_id: {}
+    constructor: ->
+      # Map properties to id/object pairs for lookup.
+      for property in @properties
+        @properties_by_id[property.id] = property

app/assets/javascripts/templates/active_selector.html.haml

@@ -1,2 +1,3 @@
-%li{"ng-class" => "{active: selector.active}"}
-  %a{"ng-transclude" => true}
+%li{ ng: { class: "{active: selector.active}" } }
+  %a{ "tooltip" => "{{selector.object.value}}", "tooltip-placement" => "bottom",
+    ng: { transclude: true, class: "{active: selector.active, 'has-tip': selector.object.value}" } }

app/assets/javascripts/templates/admin/panel.html.haml

@@ -0,0 +1,2 @@
+%td{ colspan: "{{columnCount}}" }
+  .panel{ ng: { include: "template" } }

app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml

@@ -0,0 +1,133 @@
+.row.enterprise_package_panel{ ng: { controller: 'indexPackagePanelCtrl' } }
+  .alpha.eight.columns
+    %div{ ng: { if: "!enterprise.is_primary_producer", switch: "enterprise.sells" } }
+      .info{ ng: { switch: { when: "none" } } }
+        %h3 Hub Profile
+
+        %p
+          %strong COST: ALWAYS FREE
+
+        %p People can find and contact you on the Open Food Network. Your enterprise will be visible on the map, and will be searchable in listings.
+
+        %p Having a profile, and making connections within your local food system through the Open Food Network will always be free.
+
+      .info{ ng: { switch: { when: "any" } } }
+        %h3 Hub Shop
+
+        %p
+          %strong COST: 2% OF SALES, CAPPED AT $50 PER MONTH
+
+        %p Your enterprise is the backbone of your local food system. You aggregate produce from other enterprises and can sell it through your shop on the Open Food Network.
+
+        %p Hubs can take many forms, whether they be a food co-op, a buying group, a veggie-box program, or a local grocery store.
+
+        %p If you also want to sell your own products, you will need to switch this enterprise to be a producer.
+
+      .info{ ng: { switch: { default: true } } }
+        %h3
+          Please Choose a Package
+          %i.icon-arrow-right
+
+        %p
+          %strong Your enterprise will not be fully activated until a package is selected from the options on the left.
+
+        %p
+          Click on an option to see more detailed information about each package, and hit the red SAVE button when you are done!
+
+
+
+    %div{ ng: { if: "enterprise.is_primary_producer", switch: "enterprise.sells" } }
+      .info{ ng: { switch: { when: "none" } } }
+        %h3 Profile Only
+
+        %p
+          %strong COST: ALWAYS FREE
+
+        %p A profile makes you visible and contactable to others and is a way to share your story.
+
+        %p If you prefer to focus on producing food, and want to leave the work of selling it to someone else, you won't require a shop on the Open Food Network.
+
+        %p Add your products to Open Food Network, allowing hubs to stock your products in their stores.
+
+      .info{ ng: { switch: { when: "own" } } }
+        %h3 Producer Shop
+
+        %p
+          %strong COST: 2% OF SALES, CAPPED AT $50 PER MONTH
+
+        %p Sell your products directly to customers through your very own Open Food Network shopfront.
+
+        %p A Producer Shop is for your produce only, if you want to sell produce grown/produced off site, please select 'Producer Hub'.
+
+      .info{ ng: { switch: { when: "any" } } }
+        %h3 Producer Hub
+
+        %p
+          %strong COST: 2% OF SALES, CAPPED AT $50 PER MONTH
+
+        %p Your enterprise is the backbone of your local food system. You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network.
+
+        %p Producer Hubs can take many forms, whether they be a CSA, a veggie-box program, or a food co-op with a rooftop garden.
+
+        %p The Open Food Network aims to support as many hub models as possible, so no matter your situation, we want to provide the tools you need to run your organisation or local food business.
+
+      .info{ ng: { switch: { default: true } } }
+        %h3
+          Please Choose a Package
+          %i.icon-arrow-right
+
+        %p
+          %strong Your producer enterprise will not be fully activated until a package is selected from the options on the left.
+
+        %p
+          Click on an option to see more detailed information about each package, and hit the red SAVE button when you are done!
+
+  .omega.eight.columns{ ng: { switch: "enterprise.is_primary_producer" } }
+    %div{ ng: { switch: { when: "false" } } }
+      %a.button.selector.hub-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
+        .top
+          %h3 Profile Only
+          %p Get a listing
+        .bottom ALWAYS FREE
+      %a.button.selector.hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
+        .top
+          %h3 Hub Shop
+          %p Sell produce from others
+        .bottom
+          \2% OF SALES
+          %br
+          CAPPED AT $50 PER MONTH
+
+    %div{ ng: { switch: { when: "true" } } }
+      %a.button.selector.producer-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
+        .top
+          %h3 Profile Only
+          %p Get a listing
+        .bottom ALWAYS FREE
+      %a.button.selector.producer-shop{ ng: { click: "enterprise.owned && (enterprise.sells='own')", class: "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" } }
+        .top
+          %h3 Producer Shop
+          %p Sell your own produce
+        .bottom
+          \2% OF SALES
+          %br
+          CAPPED AT $50 PER MONTH
+      %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
+        .top
+          %h3 Producer Hub
+          %p Sell produce from self and others
+        .bottom
+          \2% OF SALES
+          %br
+          CAPPED AT $50 PER MONTH
+
+    %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
+      %span{ ng: {hide: "saved() || saving" } }
+        SAVE
+        %i.icon-save
+      %span{ ng: {show: "saved() && !saving" } }
+        SAVED
+        %i.icon-ok-sign
+      %span{ ng: {show: "saving" } }
+        SAVING
+        %i.icon-refresh

app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml

@@ -0,0 +1,39 @@
+.row.enterprise_producer_panel{ ng: { controller: 'indexProducerPanelCtrl' } }
+
+  .alpha.eight.columns
+    .info{ ng: { show: "enterprise.is_primary_producer==true" } }
+      %h3 Producer
+      %p Producers make yummy things to eat &/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it.
+
+      %p Producers can also perform other functions, such as aggregating food from other enterprises and selling it through a shop on the Open Food Network.
+
+
+    .info{ ng: { show: "enterprise.is_primary_producer==false" } }
+      %h3 Non-Producer
+      %p Non-producers do not produce any food themselves, meaning that they cannot create their own products for sale through the Open Food Network.
+
+      %p Instead, non-producers specialise in linking producers to the end eater, whether it be by aggregating, grading, packing, selling or delivering food.
+
+  .omega.eight.columns
+    %a.button.selector.producer{ ng: { click: 'enterprise.owned && changeToProducer()', class: "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" } }
+      .top
+        %h3 PRODUCER
+        %p Producers of food
+      .bottom eg. GROWERS, BAKERS, BREWERS, MAKERS
+
+    %a.button.selector.non-producer{ ng: { click: 'enterprise.owned && changeToNonProducer()', class: "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" } }
+      .top
+        %h3 Non-Producer
+        %p All other food enterprises
+      .bottom eg. Grocery stores, Food co-ops, Buying groups
+
+    %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
+      %span{ ng: {hide: "saved() || saving" } }
+        SAVE
+        %i.icon-save
+      %span{ ng: {show: "saved() && !saving" } }
+        SAVED
+        %i.icon-ok-sign
+      %span{ ng: {show: "saving" } }
+        SAVING
+        %i.icon-refresh

app/assets/javascripts/templates/admin/panels/enterprise_status.html.haml

@@ -0,0 +1,29 @@
+.row.enterprise_status_panel{ ng: { controller: 'indexStatusPanelCtrl' } }
+  .alpha.omega.sixteen.columns
+
+    %h4.status-ok.text-center{ ng: { show: "issues.length == 0 && warnings.length == 0" } }
+      %i.icon-ok-sign
+      {{ object.name }} is set up and ready to go!
+
+    %table{ ng: { show: "issues.length > 0 || warnings.length > 0" } }
+      %thead
+        %th.severity
+          Severity
+        %th.description
+          Description
+        %th.resolve
+          Resolve
+      %tr{ ng: { repeat: "issue in issues"} }
+        %td.severity
+          %i.icon-warning-sign.issue
+        %td.description
+          %span{ bo: { bind: "issue.description" } }
+        %td.resolve
+          %div{ ng: { bind: { html: "issue.link" } } }
+      %tr{ ng: { repeat: "warning in warnings"} }
+        %td.severity
+          %i.icon-warning-sign.warning
+        %td.description
+          %span{ bo: { bind: "warning.description" } }
+        %td.resolve
+          %div{ ng: { bind: { html: "warning.link" } } }

app/assets/javascripts/templates/filter_selector.html.haml

@@ -0,0 +1,4 @@
+%ul{ bindonce: true }
+  %active-selector{ ng: { repeat: "selector in allSelectors", show: "ifDefined(selector.fits, true)" } }
+    %render-svg{path: "{{selector.object.icon}}", ng: { if: "selector.object.icon"} }
+    %span{"bo-text" => "selector.object.name"}

app/assets/javascripts/templates/partials/contact.html.haml

@@ -1,14 +1,11 @@
 %div.contact-container{bindonce: true}
   %div.modal-centered{"bo-if" => "enterprise.email || enterprise.website || enterprise.phone"}
     %p.modal-header Contact
-    %p{"ng-if" => "enterprise.phone"}
-      {{ enterprise.phone }}
+    %p{"bo-if" => "enterprise.phone", "bo-text" => "enterprise.phone"}
 
     %p.word-wrap{"ng-if" => "enterprise.email"}
-      %a{"ng-href" => "{{enterprise.email | stripUrl}}", target: "_blank", mailto: true}
-        %span.email
-          {{ enterprise.email | stripUrl }}
+      %a{"bo-href" => "enterprise.email | stripUrl", target: "_blank", mailto: true}
+        %span.email{"bo-bind" => "enterprise.email | stripUrl"}
 
     %p.word-wrap{"ng-if" => "enterprise.website"}
-      %a{"ng-href" => "http://{{enterprise.website | stripUrl}}", target: "_blank" }
-        {{ enterprise.website | stripUrl }}
+      %a{"bo-href-i" => "http://{{enterprise.website | stripUrl}}", target: "_blank", "bo-bind" => "enterprise.website | stripUrl"}

app/assets/javascripts/templates/partials/enterprise_details.html.haml

@@ -1,9 +1,28 @@
-.row{bindonce: true} 
+.row{bindonce: true}
   .small-12.large-8.columns
-    %div{"ng-if" => "enterprise.long_description.length > 0 || enterprise.logo"}
+    / TODO: Rob add logic for taxons and properties too:
+    / %div{"ng-if" => "enterprise.long_description.length > 0 || enterprise.logo"}
+    %div
       %p.modal-header About
-      .about-container
-        %img.enterprise-logo{"bo-src" => "enterprise.logo", "bo-if" => "enterprise.logo"} 
+      / TODO: Rob - add in taxons and properties and property pop-overs
+
+      -# TODO: Add producer taxons and properties here
+      -# %div
+      -#   %span.filter-shopfront.taxon-selectors
+      -#     %ul.inline-block
+      -#       %li
+      -#         %a.button.tiny.disabled Grains
+      -#       %li
+      -#         %a.button.tiny.disabled Dairy
+      -#
+      -#   %span.filter-shopfront.property-selectors.pad-top
+      -#     %ul.inline-block
+      -#       %li
+      -#         %a.button.tiny Organic certified
+      -#         / TODO: Rob - need popover, use will's directive or this? http://pineconellc.github.io/angular-foundation/
+      -#
+      .about-container.pad-top
+        %img.enterprise-logo{"bo-src" => "enterprise.logo", "bo-if" => "enterprise.logo"}
         %p.text-small{"ng-bind-html" => "enterprise.long_description"}
   .small-12.large-4.columns
     %ng-include{src: "'partials/contact.html'"}

app/assets/javascripts/templates/partials/enterprise_header.html.haml

@@ -1,13 +1,13 @@
-.highlight{"ng-class" => "{'is_distributor' : enterprise.is_distributor}"}
+.highlight{bindonce: true, "ng-class" => "{'is_distributor' : enterprise.is_distributor}"}
   .highlight-top.row
     .small-12.medium-7.large-8.columns
       %h3{"ng-if" => "enterprise.is_distributor"}
-        %a{"bo-href" => "enterprise.path", "ofn-empties-cart" => "enterprise", bindonce: true}
+        %a{"bo-href" => "enterprise.path", "ofn-empties-cart" => "enterprise"}
           %i{"ng-class" => "enterprise.icon_font"}
-          %span {{ enterprise.name }}
+          %span{"bo-text" => "enterprise.name"}
       %h3{"ng-if" => "!enterprise.is_distributor", "ng-class" => "{'is_producer' : enterprise.is_primary_producer}"}
         %i{"ng-class" => "enterprise.icon_font"}
-        %span {{ enterprise.name }}
+        %span{"bo-text" => "enterprise.name"}
     .small-12.medium-5.large-4.columns.text-right.small-only-text-left
-      %p {{ [enterprise.address.city, enterprise.address.state_name] | printArray}}
-  %img.hero-img{"ng-src" => "{{enterprise.promo_image}}"} 
+      %p{"bo-bind" => "[enterprise.address.city, enterprise.address.state_name] | printArray"}
+  %img.hero-img{"bo-src" => "enterprise.promo_image"} 

app/assets/javascripts/templates/partials/follow.html.haml

@@ -1,19 +1,19 @@
-%div.modal-centered{"ng-if" => "enterprise.twitter || enterprise.facebook || enterprise.linkedin || enterprise.instagram"}
+%div.modal-centered{bindonce: true, "bo-if" => "enterprise.twitter || enterprise.facebook || enterprise.linkedin || enterprise.instagram"}
   %p.modal-header Follow
-  .follow-icons{bindonce: true}
-    %span{"ng-if" => "enterprise.twitter"} 
-      %a{"ng-href" => "http://twitter.com/{{enterprise.twitter}}", target: "_blank"}
+  .follow-icons
+    %span{"bo-if" => "enterprise.twitter"} 
+      %a{"bo-href-i" => "http://twitter.com/{{enterprise.twitter}}", target: "_blank"}
         %i.ofn-i_041-twitter
     
-    %span{"ng-if" => "enterprise.facebook"}
-      %a{"ng-href" => "http://{{enterprise.facebook | stripUrl}}", target: "_blank"}
+    %span{"bo-if" => "enterprise.facebook"}
+      %a{"bo-href-i" => "http://{{enterprise.facebook | stripUrl}}", target: "_blank"}
         %i.ofn-i_044-facebook
     
-    %span{"ng-if" => "enterprise.linkedin"}
-      %a{"ng-href" => "http://{{enterprise.linkedin | stripUrl}}", target: "_blank"}
+    %span{"bo-if" => "enterprise.linkedin"}
+      %a{"bo-href-i" => "http://{{enterprise.linkedin | stripUrl}}", target: "_blank"}
         %i.ofn-i_042-linkedin
     
-    %span{"ng-if" => "enterprise.instagram"}
-      %a{"ng-href" => "http://instagram.com/{{enterprise.instagram}}", target: "_blank"}  
+    %span{"bo-if" => "enterprise.instagram"}
+      %a{"bo-href-i" => "http://instagram.com/{{enterprise.instagram}}", target: "_blank"}  
         %i.ofn-i_043-instagram
 

app/assets/javascripts/templates/partials/hub_actions.html.haml

@@ -2,7 +2,7 @@
   .cta-container.small-12.columns
     %label 
       Shop for 
-      %strong {{enterprise.name}} 
+      %strong{"bo-text" => "enterprise.name"} 
       products at:
     %a.cta-hub{"ng-repeat" => "hub in enterprise.hubs", 
     "bo-href" => "hub.path", 
@@ -10,7 +10,7 @@
     "ofn-empties-cart" => "hub"}
       %i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
       %i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
-      .hub-name {{hub.name}} 
-      .button-address {{ hub.address.city }} , {{hub.address.state_name}}
+      .hub-name{"bo-text" => "hub.name"} 
+      .button-address{"bo-bind" => "[hub.address.city, hub.address.state_name] | printArray"}
       / %i.ofn-i_007-caret-right
 

app/assets/javascripts/templates/partials/hub_details.html.haml

@@ -19,6 +19,6 @@
         "ofn-empties-cart" => "enterprise"}
           %i.ofn-i_033-open-sign{"bo-if" => "enterprise.active"}
           %i.ofn-i_032-closed-sign{"bo-if" => "!enterprise.active"}
-          .hub-name {{enterprise.name}}
-          .button-address {{ enterprise.address.city }} , {{enterprise.address.state_name}}
+          .hub-name{"bo-text" => "enterprise.name"}
+          .button-address{"bo-bind" => "[enterprise.address.city, enterprise.address.state_name] | printArray"}
           / %i.ofn-i_007-caret-right