Making where clause unambiguous

This reverts commit 485eee4bdd.

.mailmap

@@ -0,0 +1,2 @@
+Rob Harrington <oeoeaio@gmail.com>
+Laura Summers <summerscope@gmail.com>

.rspec

@@ -1,2 +1,2 @@
 --colour
---profile
+--format Fuubar

Gemfile

@@ -1,12 +1,13 @@
 source 'https://rubygems.org'
 ruby "1.9.3"
 
-gem 'rails', '3.2.19'
+gem 'rails', '3.2.21'
 gem 'rails-i18n', '~> 3.0.0'
+gem 'i18n', '~> 0.6.11'
 
 gem 'pg'
 gem 'spree', :github => 'openfoodfoundation/spree', :branch => '1-3-stable'
-gem 'spree_i18n', :github => 'spree/spree_i18n'
+gem 'spree_i18n', :github => 'spree/spree_i18n', :branch => '1-3-stable'
 gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-stable'
 
 # Waiting on merge of PR #117
@@ -14,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
@@ -21,11 +24,11 @@ gem 'comfortable_mexican_sofa'
 gem 'simple_form', :github => 'RohanM/simple_form'
 
 gem 'unicorn'
-gem 'angularjs-rails'
+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'
@@ -78,6 +81,7 @@ gem 'jquery-rails'
 group :test, :development do
   # Pretty printed test output
   gem 'turn', '~> 0.8.3', :require => false
+  gem 'fuubar'
   gem 'rspec-rails'
   gem 'shoulda-matchers'
   gem 'factory_girl_rails', :require => false

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)
@@ -86,11 +86,13 @@ GIT
 
 GIT
   remote: git://github.com/spree/spree_i18n.git
-  revision: a96bee02340e008e60549295a4f09e047fd2e628
+  revision: 752eb67204e9c5a4e22b62591a8fd55fe2285e43
+  branch: 1-3-stable
   specs:
     spree_i18n (1.0.0)
       i18n (~> 0.5)
-      spree (~> 1.1)
+      rails-i18n
+      spree_core (>= 1.1)
 
 GIT
   remote: git://github.com/willrjmarshall/foundation_rails_helper.git
@@ -105,12 +107,12 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
+    actionmailer (3.2.21)
+      actionpack (= 3.2.21)
       mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    actionpack (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -121,29 +123,23 @@ GEM
     active_link_to (1.0.0)
     active_model_serializers (0.8.1)
       activemodel (>= 3.0)
-    active_utils (2.2.3)
-      activesupport (>= 2.3.11)
-      i18n
-    activemerchant (1.44.1)
-      active_utils (~> 2.2.0)
+    activemerchant (1.48.0)
       activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
-      json (~> 1.7)
       nokogiri (~> 1.4)
-      offsite_payments (~> 2.0.0)
-    activemodel (3.2.19)
-      activesupport (= 3.2.19)
+    activemodel (3.2.21)
+      activesupport (= 3.2.21)
       builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
+    activerecord (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
+    activeresource (3.2.21)
+      activemodel (= 3.2.21)
+      activesupport (= 3.2.21)
+    activesupport (3.2.21)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     acts_as_list (0.1.4)
@@ -181,11 +177,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.4)
+    cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
     coffee-rails (3.2.2)
@@ -195,22 +191,33 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    colorize (0.7.3)
+    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)
@@ -223,6 +230,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)
@@ -265,10 +277,12 @@ 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)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
     guard (2.2.4)
@@ -305,7 +319,7 @@ GEM
     jquery-rails (2.2.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     json_spec (1.1.1)
       multi_json (~> 1.0)
       rspec (~> 2.0)
@@ -326,29 +340,21 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
+    method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.1)
+    mini_portile (0.6.2)
     momentjs-rails (2.5.1)
       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)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    offsite_payments (2.0.1)
-      active_utils (~> 2.2.0)
-      activesupport (>= 3.2.14, < 5.0.0)
-      builder (>= 2.1.2, < 4.0.0)
-      i18n (~> 0.5)
-      json (~> 1.7)
-      money (< 7.0.0)
-      nokogiri (~> 1.4)
     oj (2.1.2)
     orm_adapter (0.5.0)
     paperclip (3.5.4)
@@ -387,28 +393,28 @@ GEM
       rack
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
+    rails (3.2.21)
+      actionmailer (= 3.2.21)
+      actionpack (= 3.2.21)
+      activerecord (= 3.2.21)
+      activeresource (= 3.2.21)
+      activesupport (= 3.2.21)
       bundler (~> 1.0)
-      railties (= 3.2.19)
+      railties (= 3.2.21)
     rails-i18n (3.0.1)
       i18n (~> 0.5)
       rails (>= 3.0.0, < 4.0.0)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
+    railties (3.2.21)
+      actionpack (= 3.2.21)
+      activesupport (= 3.2.21)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.9.0)
-    rake (10.3.2)
+    rake (10.4.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -449,8 +455,9 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     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)
@@ -489,7 +496,7 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.42)
+    tzinfo (0.3.44)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -517,7 +524,7 @@ GEM
     xml-simple (1.1.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    zeus (0.13.3)
+    zeus (0.15.4)
       method_source (>= 0.6.7)
 
 PLATFORMS
@@ -528,7 +535,7 @@ DEPENDENCIES
   andand
   angular-rails-templates
   angularjs-file-upload-rails (~> 1.1.0)
-  angularjs-rails
+  angularjs-rails (= 1.2.13)
   awesome_print
   aws-sdk
   bugsnag
@@ -537,17 +544,20 @@ 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
   foundation-icons-sass-rails
   foundation-rails
   foundation_rails_helper!
+  fuubar
   geocoder
   gmaps4rails
   guard
@@ -556,6 +566,7 @@ DEPENDENCIES
   guard-rspec
   guard-zeus
   haml
+  i18n (~> 0.6.11)
   immigrant
   jquery-rails
   json_spec
@@ -570,12 +581,12 @@ DEPENDENCIES
   rabl
   rack-livereload
   rack-ssl
-  rails (= 3.2.19)
+  rails (= 3.2.21)
   rails-i18n (~> 3.0.0)
   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
@@ -53,14 +52,10 @@ Configure the site:
     cp config/application.yml.example config/application.yml
     edit config/application.yml
 
-Create the development and test databases, using the settings specified in `config/database.yml`:
+Create the development and test databases, using the settings specified in `config/database.yml`, and populate them with a schema and seed data:
 
     rake db:setup
 
-Then load the schema and some seed data with the following command:
-
-    rake db:schema:load db:seed
-
 Load some default data for your environment:
 
     rake openfoodnetwork:dev:load_sample_data
@@ -99,4 +94,4 @@ usage instructions.
 
 ## Licence
 
-Copyright (c) 2012 - 2013 Open Food Foundation, released under the AGPL licence.
+Copyright (c) 2012 - 2015 Open Food Foundation, released under the AGPL licence.

app/assets/images/spinning-circles.svg

@@ -0,0 +1,55 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="58" height="58" viewBox="0 0 58 58" xmlns="http://www.w3.org/2000/svg">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(2 1)" stroke="#0096ad" stroke-width="1.5">
+            <circle cx="42.601" cy="11.462" r="5" fill-opacity="1" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="1;0;0;0;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="49.063" cy="27.063" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;1;0;0;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="42.601" cy="42.663" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;1;0;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="27" cy="49.125" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;1;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="11.399" cy="42.663" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;1;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="4.938" cy="27.063" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;0;1;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="11.399" cy="11.462" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;0;0;1;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="27" cy="5" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;0;0;0;1" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+        </g>
+    </g>
+</svg>

app/assets/javascripts/admin/all.js

@@ -19,6 +19,7 @@
 //= require ../shared/ng-infinite-scroll.min.js
 //= require ./admin
 //= require ./enterprises/enterprises
+//= require ./enterprise_groups/enterprise_groups
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods

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"
+  ($scope, $http, $filter, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer, SpreeApiKey) ->
     $scope.loading = true
 
     $scope.initialiseVariables = ->
@@ -42,13 +42,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 +62,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("/api/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 +164,11 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       $scope.supplierFilter = $scope.suppliers[0].id
       $scope.orderCycleFilter = $scope.orderCycles[0].id
       $scope.quickSearch = ""
+
+    $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

@@ -4,13 +4,15 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $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}
+      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}
+      category:             {name: "Category",              visible: false}
+      inherits_properties:  {name: "Inherits Properties?",  visible: false}
+      available_on:         {name: "Available On",          visible: false}
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
@@ -285,6 +287,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
@@ -307,6 +312,9 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("category_id")
           filteredProduct.primary_taxon_id = product.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

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

@@ -17,7 +17,7 @@ angular.module("ofn.admin").controller "AdminVariantOverridesCtrl", ($scope, $ti
 
 
   $scope.fetchProducts = ->
-    url = "/api/products/distributable?page=::page::;per_page=100"
+    url = "/api/products/overridable?page=::page::;per_page=100"
     PagedFetcher.fetch url, (data) => $scope.addProducts data.products
 
 

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

@@ -0,0 +1,3 @@
+angular.module("admin.enterprise_groups")
+  .controller "enterpriseGroupCtrl", ($scope, SideMenu) ->
+    $scope.menu = SideMenu

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

@@ -0,0 +1,15 @@
+angular.module("admin.enterprise_groups")
+  .controller "sideMenuCtrl", ($scope, SideMenu) ->
+    $scope.menu = SideMenu
+    $scope.select = SideMenu.select
+
+    $scope.menu.setItems [
+      { name: 'Primary Details', icon_class: "icon-user" }
+      { name: 'Users', icon_class: "icon-user" }
+      { name: 'About', icon_class: "icon-pencil" }
+      { name: 'Images', icon_class: "icon-picture" }
+      { name: 'Contact', icon_class: "icon-phone" }
+      { name: 'Web', icon_class: "icon-globe" }
+    ]
+
+    $scope.select(0)

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

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

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

@@ -1,68 +1,34 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, NavigationCheck, Enterprise, PaymentMethods, ShippingMethods, SideMenu) ->
+  .controller "enterpriseCtrl", ($scope, NavigationCheck, Enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu) ->
     $scope.Enterprise = Enterprise.enterprise
-    $scope.PaymentMethods = PaymentMethods.paymentMethods
-    $scope.ShippingMethods = ShippingMethods.shippingMethods
+    $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
+    $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
     $scope.navClear = NavigationCheck.clear
-    # htmlVariable is used by textAngular wysiwyg for the long descrtiption.
     $scope.pristineEmail = $scope.Enterprise.email
     $scope.menu = SideMenu
+    $scope.newManager = { id: '', email: 'Add a manager...' }
 
     # Provide a callback for generating warning messages displayed before leaving the page. This is passed in
     # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
     # and on all new uses of this contoller, and we might not want that .
-    $scope.enterpriseNavCallback = ->
-      if $scope.enterprise.$dirty
+    enterpriseNavCallback = ->
+      if $scope.Enterprise.$dirty
         "Your changes to the enterprise are not saved yet."
 
-    for payment_method in $scope.PaymentMethods
-      payment_method.selected = payment_method.id in $scope.Enterprise.payment_method_ids
+    # Register the NavigationCheck callback
+    NavigationCheck.register(enterpriseNavCallback)
 
-    $scope.paymentMethodsColor = ->
-      if $scope.PaymentMethods.length > 0
-        if $scope.selectedPaymentMethodsCount() > 0 then "blue" else "red"
-      else
-        "red"
+    $scope.removeManager = (manager) ->
+      if manager.id?
+        for i, user of $scope.Enterprise.users when user.id == manager.id
+          $scope.Enterprise.users.splice i, 1
 
-    $scope.selectedPaymentMethodsCount = ->
-      $scope.PaymentMethods.reduce (count, payment_method) ->
-        count++ if payment_method.selected
-        count
-      , 0
-
-    for shipping_method in $scope.ShippingMethods
-      shipping_method.selected = shipping_method.id in $scope.Enterprise.shipping_method_ids
-
-    $scope.shippingMethodsColor = ->
-      if $scope.ShippingMethods.length > 0
-        if $scope.selectedShippingMethodsCount() > 0 then "blue" else "red"
-      else
-        "red"
-
-    $scope.selectedShippingMethodsCount = ->
-      $scope.ShippingMethods.reduce (count, shipping_method) ->
-        count++ if shipping_method.selected
-        count
-      , 0
-
-    $scope.$watch "Enterprise.is_primary_producer", (newValue, oldValue) ->
-      if !newValue && $scope.Enterprise.sells == "none"
-        $scope.menu.hide_item_by_name('Enterprise Fees')
-      else
-        $scope.menu.show_item_by_name('Enterprise Fees')
-
-
-    $scope.$watch "Enterprise.sells", (newValue, oldValue) ->
-      if newValue == "none"
-        $scope.menu.hide_item_by_name('Shipping Methods')
-        $scope.menu.hide_item_by_name('Payment Methods')
-        $scope.menu.hide_item_by_name('Shop Preferences')
-        if $scope.Enterprise.is_primary_producer
-          $scope.menu.show_item_by_name('Enterprise Fees')
+    $scope.addManager = (manager) ->
+      if manager.id? and manager.email?
+        manager =
+          id: manager.id
+          email: manager.email
+        if (user for user in $scope.Enterprise.users when user.id == manager.id).length == 0
+          $scope.Enterprise.users.push manager
         else
-          $scope.menu.hide_item_by_name('Enterprise Fees')
-      else
-        $scope.menu.show_item_by_name('Shipping Methods')
-        $scope.menu.show_item_by_name('Payment Methods')
-        $scope.menu.show_item_by_name('Shop Preferences')
-        $scope.menu.show_item_by_name('Enterprise Fees')
+          alert "#{manager.email} is already a manager!"

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

@@ -0,0 +1,23 @@
+angular.module("admin.enterprises")
+  .controller "permalinkCtrl", ($scope, PermalinkChecker) ->
+    # locals
+    initialPermalink = $scope.Enterprise.permalink
+    pendingRequest = null
+
+    # variables on $scope
+    $scope.availablility = ""
+    $scope.checking = false
+
+    $scope.$watch "Enterprise.permalink", (newValue, oldValue) ->
+      $scope.checking = true
+      pendingRequest = PermalinkChecker.check(newValue)
+
+      pendingRequest.then (data) ->
+        if data.permalink == initialPermalink
+          $scope.availability = ""
+        else
+          $scope.availability = data.available
+        $scope.Enterprise.permalink = data.permalink
+        $scope.checking = false
+      , (data) ->
+        # Do nothing (this is hopefully an aborted request)

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

@@ -1,21 +1,45 @@
 angular.module("admin.enterprises")
-  .controller "sideMenuCtrl", ($scope, Enterprise, SideMenu) ->
+  .controller "sideMenuCtrl", ($scope, $parse, Enterprise, SideMenu, enterprisePermissions) ->
     $scope.Enterprise = Enterprise.enterprise
     $scope.menu = SideMenu
     $scope.select = SideMenu.select
 
     $scope.menu.setItems [
-      { name: 'Primary Details', icon_class: "icon-user" }
+      { name: 'Primary Details', icon_class: "icon-home" }
+      { name: 'Users', icon_class: "icon-user" }
       { name: 'Address', icon_class: "icon-map-marker" }
       { name: 'Contact', icon_class: "icon-phone" }
       { name: 'Social', icon_class: "icon-twitter" }
       { name: 'About', icon_class: "icon-pencil" }
       { name: 'Business Details', icon_class: "icon-briefcase" }
       { name: 'Images', icon_class: "icon-picture" }
-      { name: "Shipping Methods", icon_class: "icon-truck" }
-      { name: "Payment Methods", icon_class: "icon-money" }
-      { name: "Enterprise Fees", icon_class: "icon-tasks" }
-      { name: "Shop Preferences", icon_class: "icon-shopping-cart" }
+      { 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()" }
+      { name: "Shop Preferences", icon_class: "icon-shopping-cart", show: "showShopPreferences()" }
     ]
 
     $scope.select(0)
+
+
+    $scope.showItem = (item) ->
+      if item.show?
+        $parse(item.show)($scope)
+      else
+        true
+
+    $scope.showProperties = ->
+      !!$scope.Enterprise.is_primary_producer
+
+    $scope.showShippingMethods = ->
+      enterprisePermissions.can_manage_shipping_methods && $scope.Enterprise.sells != "none"
+
+    $scope.showPaymentMethods = ->
+      enterprisePermissions.can_manage_payment_methods && $scope.Enterprise.sells != "none"
+
+    $scope.showEnterpriseFees = ->
+      enterprisePermissions.can_manage_enterprise_fees && ($scope.Enterprise.sells != "none" || $scope.Enterprise.is_primary_producer)
+
+    $scope.showShopPreferences = ->
+      $scope.Enterprise.sells != "none"

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

@@ -0,0 +1,20 @@
+angular.module("admin.enterprises")
+  .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
+
+      displayColor: ->
+        if @paymentMethods.length > 0 && @selectedCount() > 0
+          "blue"
+        else
+          "red"
+
+      selectedCount: ->
+        @paymentMethods.reduce (count, payment_method) ->
+          count++ if payment_method.selected
+          count
+        , 0

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

@@ -0,0 +1,20 @@
+angular.module("admin.enterprises")
+  .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
+
+      displayColor: ->
+        if @shippingMethods.length > 0 && @selectedCount() > 0
+          "blue"
+        else
+          "red"
+
+      selectedCount: ->
+        @shippingMethods.reduce (count, shipping_method) ->
+          count++ if shipping_method.selected
+          count
+        , 0

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

@@ -0,0 +1,36 @@
+angular.module("admin.enterprises").factory 'PermalinkChecker', ($q, $http) ->
+  new class PermalinkChecker
+    deferredRequest: null
+    deferredAbort: null
+
+    check: (permalink) =>
+      @abort(@deferredAbort) if @deferredRequest && @deferredRequest.promise
+      @deferredRequest = deferredRequest = $q.defer()
+      @deferredAbort = deferredAbort = $q.defer()
+      request = $http(
+        method:   "GET"
+        url:      "/enterprises/check_permalink?permalink=#{permalink}"
+        headers:
+          Accept: 'application/javascript'
+        timeout: deferredAbort.promise
+      )
+      .success( (data) =>
+        deferredRequest.resolve
+          permalink: data
+          available: "Available"
+      ).error (data,status) =>
+        if status == 409
+          deferredRequest.resolve
+            permalink: data
+            available: "Unavailable"
+        else
+          # Something went wrong or request was aborted
+          deferredRequest.reject()
+
+      deferredRequest.promise.finally ->
+        request = deferredRequest.promise = null;
+
+      deferredRequest.promise
+
+    abort: (deferredAbort) ->
+      deferredAbort.resolve()

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

@@ -1,10 +1,10 @@
 angular.module('admin.order_cycles', ['ngResource'])
-  .controller('AdminCreateOrderCycleCtrl', ['$scope', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
-    $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 = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
 
     $scope.loaded = ->
       Enterprise.loaded && EnterpriseFee.loaded
@@ -27,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()
@@ -74,16 +74,17 @@ angular.module('admin.order_cycles', ['ngResource'])
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)
 
-    $scope.submit = ->
+    $scope.submit = (event) ->
+      event.preventDefault()
       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 = ->
@@ -107,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()
@@ -154,7 +155,8 @@ angular.module('admin.order_cycles', ['ngResource'])
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)
 
-    $scope.submit = ->
+    $scope.submit = (event) ->
+      event.preventDefault()
       OrderCycle.update()
   ])
 

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]]
@@ -38,6 +39,7 @@ angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl
   $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
     EnterpriseFee.forEnterprise(parseInt(enterprise_id))
 
-  $scope.submit = ->
+  $scope.submit = (event) ->
+    event.preventDefault()
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.create()

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()
 
@@ -32,6 +32,7 @@ angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl",
     $event.preventDefault()
     OrderCycle.removeCoordinatorFee(index)
 
-  $scope.submit = ->
+  $scope.submit = (event) ->
+    event.preventDefault()
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update()

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,23 +84,38 @@ 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) ->
-    	  angular.extend(service.order_cycle, oc)
-    	  service.order_cycle.incoming_exchanges = []
-    	  service.order_cycle.outgoing_exchanges = []
-    	  for exchange in service.order_cycle.exchanges
-    	    if exchange.incoming
-    	      angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
-    	      delete(exchange.receiver_id)
-    	      service.order_cycle.incoming_exchanges.push(exchange)
-    
-    	    else
-    	      angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
-    	      delete(exchange.sender_id)
-    	      service.order_cycle.outgoing_exchanges.push(exchange)
-    
+        delete oc.$promise
+        delete oc.$resolved
+        angular.extend(service.order_cycle, oc)
+        service.order_cycle.incoming_exchanges = []
+        service.order_cycle.outgoing_exchanges = []
+        for exchange in service.order_cycle.exchanges
+          if exchange.incoming
+            angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
+            delete(exchange.receiver_id)
+            service.order_cycle.incoming_exchanges.push(exchange)
+          else
+            angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
+            delete(exchange.sender_id)
+            service.order_cycle.outgoing_exchanges.push(exchange)
+
         delete(service.order_cycle.exchanges)
         service.loaded = true
 
@@ -126,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)
@@ -146,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/payment_methods/services/payment_methods.js.coffee

@@ -2,7 +2,7 @@ angular.module("admin.payment_methods")
   .factory "PaymentMethods", (paymentMethods) ->
     new class PaymentMethods
       paymentMethods: paymentMethods
-      
+
       findByID: (id) ->
         for paymentMethod in @paymentMethods
           return paymentMethod if paymentMethod.id is id

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

@@ -4,6 +4,8 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
     all_permissions: [
       'add_to_order_cycle'
       'manage_products'
+      'edit_profile'
+      'create_variant_overrides'
     ]
 
     constructor: ->
@@ -26,3 +28,5 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
       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"

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

@@ -2,7 +2,7 @@ angular.module("admin.shipping_methods")
   .factory "ShippingMethods", (shippingMethods) ->
     new class ShippingMethods
       shippingMethods: shippingMethods
-      
+
       findByID: (id) ->
         for shippingMethod in @shippingMethods
           return shippingMethod if shippingMethod.id is id

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

@@ -13,7 +13,7 @@ angular.module("admin.taxons").factory "Taxons", (taxons, $filter) ->
 
     # For finding multiple Taxons represented by comma delimited string
     findByIDs: (ids) ->
-      @taxonsByID[taxon_id] for taxon_id in ids.split(",")
+      @taxonsByID[taxon_id] for taxon_id in ids.split(",") when @taxonsByID[taxon_id]
 
     findByTerm: (term) ->
       $filter('filter')(@taxons, term)

app/assets/javascripts/admin/users/directives/user_select.js.coffee

@@ -1,12 +1,15 @@
-angular.module("admin.users").directive "ofnUserAutocomplete", ($http) ->
+angular.module("admin.users").directive "userSelect", ->
+  scope:
+    user: '&userSelect'
+    model: '=ngModel'
   link: (scope,element,attrs) ->
     setTimeout ->
       element.select2
         multiple: false
         initSelection: (element, callback) ->
-          callback { id: element.val(), email: attrs.email }
+          callback {id: scope.user().id, email: scope.user().email}
         ajax:
-          url: Spree.routes.user_search
+          url: '/admin/search/known_users'
           datatype: 'json'
           data:(term, page) ->
             { q: term }
@@ -15,4 +18,6 @@ angular.module("admin.users").directive "ofnUserAutocomplete", ($http) ->
         formatResult: (user) ->
           user.email
         formatSelection: (user) ->
-          user.email
+          scope.$apply ->
+            scope.model = user if scope.model?
+          user.email

app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee

@@ -1,10 +0,0 @@
-angular.module("admin.utils").directive "navCheckCallback", (NavigationCheck)->
-  restrict: 'A'
-  scope:
-    navCheckCallback: '&'
-  link: (scope,element,attributes) ->
-    # Provide a callback, otherwise this default will be used:
-    callback = scope.navCheckCallback()
-    callback ||= ->
-      "You will lose any unsaved work!"
-    NavigationCheck.register(callback)

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/cart.js.coffee

@@ -11,9 +11,9 @@ $ ->
 
 # Temporarily handles the cart showing stuff
 $(document).ready ->
-  $('#cart_adjustments').hide()
+  $('.cart_adjustment').hide()
 
-  $('th.cart-adjustment-header a').click ->
-    $('#cart_adjustments').toggle()
+  $('td.cart-adjustments a').click ->
+    $('.cart_adjustment').toggle()
     $(this).html('Item Handling Fees (included in item totals)')
     false

app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee

@@ -4,7 +4,7 @@ Darkswarm.controller "CheckoutCtrl", ($scope, storage, Checkout, CurrentUser, Cu
 
   # Bind to local storage
   $scope.fieldsToBind = ["bill_address", "email", "payment_method_id", "shipping_method_id", "ship_address"]
-  prefix = "order_#{Checkout.order.id}#{CurrentUser?.id}#{CurrentHub.hub.id}"
+  prefix = "order_#{Checkout.order.id}#{CurrentUser.id or ""}#{CurrentHub.hub.id}"
 
   for field in $scope.fieldsToBind
     storage.bind $scope, "Checkout.order.#{field}",
@@ -16,7 +16,7 @@ Darkswarm.controller "CheckoutCtrl", ($scope, storage, Checkout, CurrentUser, Cu
   $scope.order = Checkout.order # Ordering is important
   $scope.secrets = Checkout.secrets
 
-  $scope.enabled = !!CurrentUser
+  $scope.enabled = !!CurrentUser.id?
 
   $scope.purchase = (event, form) ->
     event.preventDefault()

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

@@ -0,0 +1,12 @@
+Darkswarm.controller "GroupEnterpriseNodeCtrl", ($scope, CurrentHub) ->
+
+  $scope.active = false
+
+  $scope.toggle = ->
+    $scope.active = !$scope.active
+
+  $scope.open = ->
+    $scope.active
+
+  $scope.current = ->
+    $scope.hub.id is CurrentHub.hub.id

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

@@ -0,0 +1,12 @@
+Darkswarm.controller "GroupEnterprisesCtrl", ($scope, Search, FilterSelectorsService) ->
+  $scope.totalActive =  FilterSelectorsService.totalActive
+  $scope.clearAll =  FilterSelectorsService.clearAll
+  $scope.filterText =  FilterSelectorsService.filterText
+  $scope.FilterSelectorsService =  FilterSelectorsService
+  $scope.query = Search.search()
+  $scope.activeTaxons = []
+  $scope.show_profiles = false
+  $scope.filtersActive = false
+
+  $scope.$watch "query", (query)->
+    Search.search query

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/map_controller.js.coffee

@@ -1,3 +1,3 @@
 Darkswarm.controller "MapCtrl", ($scope, MapConfiguration, OfnMap)->
   $scope.OfnMap = OfnMap
-  $scope.map = MapConfiguration.options
+  $scope.map = angular.copy MapConfiguration.options

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/controllers/tabs_controller.js.coffee

@@ -1,10 +1,14 @@
-Darkswarm.controller "TabsCtrl", ($scope, $rootScope, $location, OrderCycle) ->
+Darkswarm.controller "TabsCtrl", ($scope, $rootScope, $location) ->
   # Return active if supplied path matches url hash path.
   $scope.active = (path)->
     $location.hash() == path
 
-  # Toggle tab selected status by setting the url hash path.
+  # Select tab by setting the url hash path.
   $scope.select = (path)->
+    $location.hash path
+
+  # Toggle tab selected status by setting the url hash path.
+  $scope.toggle = (path)->
     if $scope.active(path)
       $location.hash ""
     else

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/empties_cart.js.coffee

@@ -8,6 +8,6 @@ Darkswarm.directive "ofnEmptiesCart", (CurrentHub, Cart, Navigation, storage) ->
     if CurrentHub.hub?.id and CurrentHub.hub.id isnt scope.hub.id and !Cart.empty()
       elm.bind 'click', (ev)->
         ev.preventDefault()
-        if confirm "Are you sure? This will change your selected Hub and remove any items in you shopping cart."
+        if confirm "Are you sure? This will change your selected Hub and remove any items in your shopping cart."
           storage.clearAll() # One day this will have to be moar GRANULAR
           Navigation.go scope.hub.path 

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

@@ -0,0 +1,54 @@
+Darkswarm.directive "filterSelector",  (FilterSelectorsService)->
+  # Automatically builds activeSelectors for taxons
+  # Lots of magic here
+  restrict: 'E'
+  replace: true
+  scope:
+    objects: "&"
+    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.activeSelectors = selectors.filter (selector)->
+        selector.active
+      .map (selector)->
+        selector.object.id
+
+    # This can be called from a parent scope
+    # when data has been loaded, in order to pass
+    # selectors up
+    scope.$on 'loadFilterSelectors', ->
+      scope.allSelectors = scope.selectors() if attr.allSelectors?
+
+    scope.$watchCollection "selectors()", (newValue, oldValue) ->
+      scope.allSelectors = scope.selectors() if attr.allSelectors?
+
+    # Build a list of selectors
+    scope.selectors = ->
+      # 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
+      selectors = []
+      for id, object of scope.objects()
+        if selector = selectors_by_id[id]
+          selectors.push selector
+        else
+          selector = selectors_by_id[id] = FilterSelectorsService.new
+            object: object
+          selectors.push selector
+      selectors
+
+    scope.ifDefined = (value, if_undefined) ->
+      if angular.isDefined(value)
+        value
+      else
+        if_undefined

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

@@ -0,0 +1,8 @@
+Darkswarm.directive "linkToService", ->
+  restrict: 'E'
+  replace: true
+  scope: {
+    ref: '='
+    service: '='
+  }
+  template: '<a href="{{ref | ext_url: service}}" target="_blank" ng-show="ref"></a>'

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/directives/taxon_selector.js.coffee

@@ -1,43 +0,0 @@
-Darkswarm.directive "taxonSelector",  (FilterSelectorsService)->
-  # Automatically builds activeSelectors for taxons
-  # Lots of magic here
-  restrict: 'E'
-  replace: true
-  scope:
-    objects: "&"
-    results: "="
-  templateUrl: "taxon_selector.html"
-
-  link: (scope, elem, attr)->
-    selectors_by_id = {}
-    selectors = null  # To get scoping/closure right
-
-    scope.emit = ->
-      scope.results = selectors.filter (selector)->
-        selector.active
-      .map (selector)->
-        selector.taxon.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.
-      # 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
-        if selector = selectors_by_id[id]
-          selectors.push selector
-        else
-          selector = selectors_by_id[id] = FilterSelectorsService.new
-            taxon: taxon
-          selectors.push selector
-      selectors

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

@@ -0,0 +1,7 @@
+Darkswarm.filter "ext_url", ->
+  urlPattern = /^https?:\/\//
+  (url, prefix) ->
+    if !url || url.match(urlPattern)
+      url
+    else
+      prefix + url

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/shipping.js.coffee

@@ -1,9 +1,10 @@
-Darkswarm.filter 'shipping', ()-> 
+Darkswarm.filter 'shipping', ()->
   (objects, options)->
     objects ||= []
-    options ?= null
-    
-    if options.pickup and !options.delivery
+
+    if !options
+      objects
+    else if options.pickup and !options.delivery
       objects.filter (obj)->
         obj.pickup
     else if options.delivery and !options.pickup

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/cart.js.coffee

@@ -8,6 +8,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
       for line_item in @line_items
         line_item.variant.line_item = line_item
         Variants.register line_item.variant
+        line_item.variant.extended_name = @extendedVariantName(line_item.variant)
 
     orderChanged: =>
       @unsaved()
@@ -43,6 +44,11 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
       @line_items.filter (li)->
         li.quantity > 0
 
+    total_item_count: =>
+      @line_items_present().reduce (sum,li) ->
+        sum = sum + li.quantity
+      , 0
+
     empty: =>
       @line_items_present().length == 0
 
@@ -58,8 +64,17 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
       @create_line_item(variant) unless exists
 
     create_line_item: (variant)->
+      variant.extended_name = @extendedVariantName(variant)
       variant.line_item =
         variant: variant
         quantity: null
         max_quantity: null
       @line_items.push variant.line_item
+
+    extendedVariantName: (variant) =>
+      if variant.product_name == variant.name_to_display
+        variant.product_name
+      else
+        name =  "#{variant.product_name} - #{variant.name_to_display}"
+        name += " (#{variant.options_text})" if variant.options_text
+        name

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

@@ -1,7 +1,4 @@
 Darkswarm.factory 'CurrentUser', (user)-> # This is for the current user
-  if user and !$.isEmptyObject(user)
-    new class CurrentUser
-      constructor: ->
-        @[k] = v for k, v of user
-  else
-    undefined
+  new class CurrentUser
+    constructor: ->
+      @[k] = v for k, v of user if user and !$.isEmptyObject(user)

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

@@ -1,9 +1,14 @@
 Darkswarm.factory 'HashNavigation', ($location) ->
   new class HashNavigation
-    hash: null 
+    hash: null
+
+    constructor: ->
+      # Make sure we have a path as hashes
+      # dont seem to work so well without them
+      $location.path("") if !$location.path()
 
     active: (hash)->
-      $location.hash() == hash 
+      $location.hash() == hash
 
     navigate: (hash)->
       @hash = hash

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/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: ->
@@ -45,7 +48,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/filter_selector.html.haml

@@ -0,0 +1,4 @@
+%div{bindonce:true, style: "display: inline-block" }
+  %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

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

@@ -12,22 +12,22 @@
         %li.cost
           .right {{ variant.price | localizeCurrency }}
           Item cost
-        %li{"bo-if" => "variant.fees.admin"}
+        %li.admin-fee{"bo-if" => "variant.fees.admin"}
           .right {{ variant.fees.admin | localizeCurrency }}
           Admin fee
-        %li{"bo-if" => "variant.fees.sales"}
+        %li.sales-fee{"bo-if" => "variant.fees.sales"}
           .right {{ variant.fees.sales | localizeCurrency }}
           Sales fee
-        %li{"bo-if" => "variant.fees.packing"}
+        %li.packing-fee{"bo-if" => "variant.fees.packing"}
           .right {{ variant.fees.packing | localizeCurrency }}
           Packing fee
-        %li{"bo-if" => "variant.fees.transport"}
+        %li.transport-fee{"bo-if" => "variant.fees.transport"}
           .right {{ variant.fees.transport | localizeCurrency }}
           Transport fee
-        %li{"bo-if" => "variant.fees.fundraising"}
+        %li.fundraising-fee{"bo-if" => "variant.fees.fundraising"}
           .right {{ variant.fees.fundraising | localizeCurrency }}
           Fundraising fee
-        %li
+        %li.total
           %strong
             .right = {{ variant.price_with_fees | localizeCurrency }}
              

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

@@ -1,2 +1,2 @@
 %button.graph-button{"ng-class" => "{open: tt_isOpen}"}
-  %i.ofn-i_058-graph
+  / %i.ofn-i_058-graph

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

@@ -1,9 +1,28 @@
-.row
-  .columns.small-12.large-6
-    %img.product-img{"ng-src" => "{{product.largeImage}}", "ng-if" => "product.largeImage"}
+.row{bindonce: true}
+
   .columns.small-12.large-6.product-header
-    %h2 
-      / %render-svg{path: "{{product.primary_taxon.icon}}"}
-      {{product.name}}
-    %p {{product.description}}
+    %h3{"bo-text" => "product.name"}
+    %span
+      %em from
+      %span.avenir{"bo-text" => "enterprise.name"}
+
+    %br
+
+    .filter-shopfront.taxon-selectors.inline-block
+      %ul
+        %filter-selector{ objects: "[product] | taxonsOf" }
+
+    .filter-shopfront.property-selectors.inline-block
+      %ul
+        %filter-selector{ objects: "[product] | propertiesWithValuesOf" }
+
+    %div{"ng-if" => "product.description"}
+      %hr
+      %p.text-small{"bo-text" => "product.description"}
+      %hr
+
+  .columns.small-12.large-6
+    %img.product-img{"bo-src" => "product.largeImage", "bo-if" => "product.largeImage"}
+    %img.product-img.placeholder{"bo-src" => "'/assets/noimage/large.png'", "bo-if" => "!product.largeImage"}
+
 %ng-include{src: "'partials/close.html'"}

app/assets/javascripts/templates/registration/about.html.haml

@@ -40,6 +40,16 @@
             .field
               %label{ for: 'enterprise_acn' } ACN:
               %input.chunky{ id: 'enterprise_acn', placeholder: "eg. 123 456 789", ng: { model: 'enterprise.acn' } }
+        .row
+          .small-12.columns
+            .field
+              %label{ for: 'enterprise_charges_sales_tax' }= t(:charges_sales_tax)
+              %input{ id: 'enterprise_charges_sales_tax_true', type: 'radio', name: 'charges_sales_tax', value: 'true', required: true, ng: { model: 'enterprise.charges_sales_tax' } }
+              %label{ for: 'enterprise_charges_sales_tax_true' } Yes
+              %input{ id: 'enterprise_charges_sales_tax_false', type: 'radio', name: 'charges_sales_tax', value: 'false', required: true, ng: { model: 'enterprise.charges_sales_tax' } }
+              %label{ for: 'enterprise_charges_sales_tax_false' } No
+              %span.error.small-12.columns{ ng: { show: "about.charges_sales_tax.$error.required && submitted" } }
+                You need to make a selection.
 
     .row.buttons.pad-top
       .small-12.columns

app/assets/javascripts/templates/registration/images/logo.html.haml

@@ -40,6 +40,6 @@
             .message{ ng: { hide: "imageSrc() || imageUploader.isUploading" } }
               Your logo will appear here for review once uploaded
             .loading{ ng: { hide: "!imageUploader.isUploading" } }
-              %img.spinner{ src: "/assets/loading.gif" }
+              %img.spinner{ src: "/assets/spinning-circles.svg" }
               %br/
               Uploading...

app/assets/javascripts/templates/registration/images/promo.html.haml

@@ -38,6 +38,6 @@
             .message{ ng: { hide: "imageSrc() || imageUploader.isUploading" } }
               Your logo will appear here for review once uploaded
             .loading{ ng: { hide: "!imageUploader.isUploading" } }
-              %img.spinner{ src: "/assets/loading.gif" }
+              %img.spinner{ src: "/assets/spinning-circles.svg" }
               %br/
               Uploading...

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

@@ -58,5 +58,5 @@
 
   .small-12.medium-2.large-2.columns.total-price.text-right
     .table-cell
-      %strong
+      %strong{"ng-class" => "{filled: variant.totalPrice()}"}
         {{ variant.totalPrice() | localizeCurrency }} 

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

@@ -0,0 +1,14 @@
+%ul
+  -# In order for the single-line-selector scope to have access to the available selectors,
+  %filter-selector{objects: "objects()", "active-selectors" => "activeSelectors", "all-selectors" => "allSelectors" }
+
+  %li.more{ ng: { show: "overFlowSelectors().length > 0 || fitting" } }
+    %a.dropdown{ data: { dropdown: "{{ 'show-more-' + selectorName }}" }, ng: { class: "{active: selectedOverFlowSelectors().length > 0}" } }
+      %span
+        + {{ overFlowSelectors().length }} more
+      %i.ofn-i_052-point-down
+    .f-dropdown.text-right.content{ ng: { attr: { id: "{{ 'show-more-' + selectorName }}" } } }
+      %ul
+        %active-selector{ ng: { repeat: "selector in overFlowSelectors()", hide: "selector.fits" } }
+          %render-svg{path: "{{selector.object.icon}}", ng: { if: "selector.object.icon"}}
+          %span {{ selector.object.name }}

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

@@ -1,3 +0,0 @@
-%active-selector{"ng-repeat" => "selector in selectors()"}
-  %render-svg{path: "{{selector.taxon.icon}}"} 
-  %span {{ selector.taxon.name }}

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

@@ -0,0 +1,14 @@
+span.unavailable, span.available {
+  font-weight: bold;
+  i {
+    font-size: 150%;
+  }
+}
+
+span.available {
+  color: #9fc820;
+}
+
+span.unavailable {
+  color: #DA5354;
+}

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

@@ -0,0 +1,3 @@
+@import 'plugins/font-awesome';
+
+.icon-refund:before { @extend .icon-ok:before }

app/assets/stylesheets/admin/side_menu.css.sass

@@ -7,9 +7,9 @@
     font-size: 120%
     cursor: pointer
     text-transform: uppercase
-    &.odd
+    &:nth-child(odd)
       background-color: #ebf3fb
-    &.even
+    &:nth-child(even)
       background-color: #ffffff
     &:hover
       background-color: #eaf0f5

app/assets/stylesheets/admin/variant_overrides.css.sass

@@ -0,0 +1,3 @@
+.variant-override-unit
+  float: right
+  font-style: italic

app/assets/stylesheets/darkswarm/_shop-filters.css.sass

@@ -0,0 +1,120 @@
+@import mixins
+@import branding
+@import big-input
+@import animations
+
+@mixin filter-selector($base-clr, $border-clr, $hover-clr)
+  &.inline-block, ul.inline-block
+    display: inline-block
+
+  li
+    display: inline-block
+    @include border-radius(0)
+    padding: 0
+    margin: 0 0 0.25rem 0.25rem
+    &:hover, &:focus
+      background: transparent
+    &.active
+      box-shadow: none
+
+    a, a.button
+      display: block
+      padding-top: 0.5rem
+      @include border-radius(0.5em)
+      border: 1px solid $border-clr
+      padding: 0.5em 0.625em
+      font-size: 0.875em
+      color: $base-clr
+      font-size: 0.75em
+      background: white
+      margin: 0
+      i
+        padding-left: 0.25rem
+
+      render-svg
+        &, & svg
+          width: 1rem
+          height: 1rem
+          float: left
+          padding-right: 0.25rem
+          path
+            @include csstrans
+            fill: $base-clr
+
+      &:hover, &:focus
+        border-color: $hover-clr
+        color: $hover-clr
+        render-svg
+          svg
+            path
+              fill: $hover-clr
+
+      &.disabled
+        opacity: 0.6
+
+        &:hover, &:focus
+          border-color: $border-clr
+          color:  $base-clr
+          render-svg
+            svg
+              path
+                fill: $base-clr
+
+
+      &.active, &.active:hover, &.active:focus
+        border: 1px solid $base-clr
+        background: $base-clr
+        color: white
+        render-svg
+          svg
+            path
+              fill: white
+
+
+// Alert when search, taxon, filter is triggered
+
+.alert-box.search-alert
+  background-color: $clr-yellow-light
+  border-color: $clr-yellow-light
+  color: #777
+  font-size: 0.75rem
+  padding: 0.5rem 0.75rem
+
+  span.applied-properties
+    color: #333
+
+  span.applied-taxons
+    color: $clr-blue
+
+  span.applied-search
+    color: $clr-brick
+
+  span.filter-label
+    opacity: 0.75
+
+.filter-shopfront.taxon-selectors, .filter-shopfront.property-selectors
+  background: transparent
+
+  single-line-selectors
+    overflow-x: hidden
+    white-space: nowrap
+
+    .f-dropdown
+      overflow-x: auto
+      white-space: normal
+
+  ul
+    margin: 0
+  ul, ul li
+    list-style: none
+
+
+.filter-shopfront
+
+  // Shopfront taxons
+  &.taxon-selectors
+    @include filter-selector($clr-blue, $clr-blue-light, $clr-blue-bright)
+
+  // Shopfront properties
+  &.property-selectors
+    @include filter-selector(#666, #ccc, #777)

app/assets/stylesheets/darkswarm/_shop-inputs.css.sass

@@ -9,8 +9,7 @@
   @include placeholder(rgba(0,0,0,0.4), #777)
   
   input#search
-    @include big-input(rgba(0,0,0,0.3), #777, $clr-brick)
-    @include big-input-static
+    @include medium-input(rgba(0,0,0,0.3), #777, $clr-brick)
 
   // ordering
   product

app/assets/stylesheets/darkswarm/_shop-modals.css.sass

@@ -0,0 +1,6 @@
+
+.product-header
+	h1, h2, h3, h4, h5, h6
+		margin: 0
+	hr
+		margin: 0.5em 0

app/assets/stylesheets/darkswarm/_shop-popovers.css.sass

@@ -75,46 +75,38 @@ ordercycle
 
 
 button.graph-button
-  z-index: 9999999
+  // z-index: 9999999
   border: 1px solid transparent
-  @include box-shadow(none)
   padding: 0
   margin: 0
-  @include border-radius(999rem)
   display: inline
   background-color: rgba(255,255,255,0.5)
-  padding: 5px   
-  @media all and (max-width: 768px) 
-    display: none
-    // Hide for small
-
-  &:hover, &:active, &:focus
-    background-color: rgba(255,255,255,1)
-    i.ofn-i_058-graph
-      color: $clr-brick-bright
-
-  i.ofn-i_058-graph
+  padding: 4px 
+  @include box-shadow(none)
+  @include border-radius(999rem)
+  &:before
+    @include icon-font
+    content: '\e639'
     color: #999
-    margin: 0
-    padding: 0
-    font-size: 1rem
-
-  @media all and (max-width: 640px) 
-    padding: 3px
-    i.ofn-i_058-graph
-      font-size: 0.75rem 
+  &:focus
+    border: 1px solid #e0e0e0
+    background-color: rgba(255,255,255,1)
+    &:before
+      color: #666
+  &:hover, &:active
+    background-color: rgba(255,255,255,1)
+    border: 1px solid transparent
+    &:before
+      color: $clr-brick-bright
+  @media all and (max-width: 768px) 
+    // Hide for small
+    display: none
 
 button.graph-button.open
-  @include box-shadow(inset 0 1px 1px 0 rgba(0,0,0,0.35))
-  border: 1px solid #999
-  
-  &:hover, &:active, &:focus
-    background-color: rgba(255,255,255,1)
-    i.ofn-i_058-graph
-      color: $clr-brick-bright
-
-  i.ofn-i_058-graph
-    color: $clr-brick
-
+  border: 1px solid transparent
+  background-color:  $clr-brick-bright
+  &:before
+    content: '\e608'
+    color: white
 
 

app/assets/stylesheets/darkswarm/_shop-product-rows.css.sass

@@ -1,4 +1,5 @@
 @import branding.css.sass
+@import animations.sass
 
 .darkswarm
   products
@@ -71,9 +72,14 @@
         // Total price
         .total-price
           padding-left: 0rem
+          color: $disabled-med
+          .filled
+            color: $med-drk-grey
           @media all and (max-width: 640px)
             background: #777
-            color: white
+            color: $disabled-med
+            .filled
+              color: white
             .table-cell
               height: 27px
 
@@ -97,17 +103,19 @@
           @media all and (max-width: 768px)
             padding-left: 4.9375rem
           @media all and (max-width: 640px)
-            padding-left: 4.5rem
-          @media all and (max-width:480px)
             padding-left: 0.9375rem
+          small
+            font-size: 80%
           h3
             font-size: 1.5rem
             margin: 0
           h3 a
             color: #222
+            i
+              @include csstrans
+              font-size: 0.6em
             &:hover, &:focus, &:active
-              color: black
-
-
-
+              color: $clr-brick
+              i
+                font-size: 0.8em
 

app/assets/stylesheets/darkswarm/_shop-product-thumb.css.sass

@@ -1,26 +1,59 @@
 @import branding
+@import animations.sass
 
 .darkswarm
   products
     product
       .product-thumb
+        @include csstrans
         position: absolute
-        top: 3px
+        top: 2px
         left: 0px
         width: 7rem
         height: 7rem
-        outline: 1px solid $disabled-bright
         float: left
         display: block
         z-index: 999999
         background-color: white
         overflow: hidden
-      
+        i
+          @include csstrans
+          transition-delay: 150ms
+          position: absolute
+          left: 45%
+          top: 45%
+          z-index: 99999
+          color: white
+          font-size: 1rem
+          opacity: 0
+        img
+          @include csstrans
+          opacity: 1
+          @include transform-scale(scale(1))
+        
+        &:hover, &:focus, &:active
+          background-color: $clr-brick
+          i
+            left: 32%
+            top: 30%
+            font-size: 3rem
+            opacity: 1
+          img
+            opacity: 0.5
+            @include transform-scale(scale(1.1))
+
         @media all and (max-width: 768px)
+          top: 2px
           width: 4rem
           height: 4rem
-
-        @media all and (max-width: 480px)
+          &:hover, &:focus, &:active
+            i
+              left: 30%
+              top: 30%
+              font-size: 2rem
+        @media all and (max-width: 640px)
           display: none
           width: 0rem
-          height: 0rem
+          height: 0rem
+
+          

app/assets/stylesheets/darkswarm/_shop-taxon-flag.css.sass

@@ -9,9 +9,10 @@
         margin-top: -1.1rem
         padding-top: 0.25rem
         z-index: 999999
-
-        @media all and (max-width: 768px)
-          margin-top: -0.85rem
+        @media all and (max-width: 480px)
+          background-size: 28px 32px
+          min-height: 32px
+          width: 28px
 
         render-svg
           svg
@@ -19,3 +20,12 @@
             height: 24px
             path
               fill: #999
+
+        @media all and (max-width: 768px)
+          margin-top: -0.85rem
+
+        @media all and (max-width: 480px)
+          render-svg
+            svg
+              width: 18px
+              height: 18px

app/assets/stylesheets/darkswarm/active_table.css.sass

@@ -30,20 +30,20 @@
       text-decoration: underline
 
   span.margin-top
-    margin-top: 0.5rem    
+    margin-top: 0.5rem
     display: inline-block
 
   // Generic text resize
-  @media all and (max-width: 640px) 
+  @media all and (max-width: 640px)
     &, & *
-      font-size: 0.875rem    
+      font-size: 0.875rem
     fat > div label
-      &, & *    
-        font-size: 0.75rem 
+      &, & *
+        font-size: 0.75rem
 
-
-  .active_table_row // Inherits from active_table
-    border: 1px solid transparent 
+  // Inherits from active_table
+  .active_table_row
+    border: 1px solid transparent
     @include border-radius(0.5em)
 
     // Foundation overrides
@@ -76,15 +76,15 @@
     .active_table_row:last-child
       border-bottom: 1px solid $disabled-bright
       @include border-radius-mixed(0, 0, 0.5em, 0.5em)
-      
-      
+
+
     //Open row sections
     .fat > div
       border-top: 1px solid #aaa
-      @media all and (max-width: 640px) 
+      @media all and (max-width: 640px)
         margin-top: 1em
 
-      ul, ol 
+      ul, ol
         font-size: 0.875rem
 
       [class*="block-grid-"] > li
@@ -96,10 +96,10 @@
         margin-top: 0.25rem
         margin-bottom: 0.25rem
         color: #777
-    
+
     p.trans-sentence
       text-transform: capitalize
-  
+
   &.closed
     &:hover, &:active, &:focus
       .active_table_row.closed
@@ -112,7 +112,3 @@
     &.open
       .active_table_row:first-child
         color: $dark-grey
-
-
-
-

app/assets/stylesheets/darkswarm/active_table_search.css.sass

@@ -8,7 +8,7 @@
   margin-left: 0
   margin-right: 0
 
-.row.filter-box:first-child, .row.filter-box.filter-box-shopfront
+.row.filter-box:first-child
   border: 1px solid $clr-blue-light
   @include border-radius(0.25em)
   margin-top: 2px
@@ -19,13 +19,9 @@
   background: transparent
   margin-top: 1em
 
-.row.filter-box.filter-box-shopfront
-  margin-top: 0
-
 products .filter-box
   background: #f7f7f7
 
-
 .filter-box
   background: rgba(245,245,245,0.6)
   .tdhead
@@ -40,7 +36,6 @@ products .filter-box
   [class*="block-grid-"] > li
     padding-bottom: 0.5rem !important
 
-
   li
     @include border-radius(12px)
     padding-top: 0.5rem
@@ -66,10 +61,8 @@ products .filter-box
     table-layout: fixed
     text-transform: capitalize
     overflow: visible
-    // width: 100%
-    // height: 2rem
     line-height: 1
-    color: #444
+    color: $med-drk-grey
     font-size: 0.875rem
     span
       display: table-cell
@@ -107,16 +100,6 @@ products .filter-box
         path
           fill: #666
 
-.filter-box.filter-box-shopfront
-  .tdhead
-    margin-top: 0rem
-    margin-bottom: 0.75rem
-    padding: 0.5rem 0
-    h5
-      color: $clr-blue
-    .button.tiny 
-      margin-bottom: 0rem
-
 .button.filterbtn
   margin-bottom: 0 !important
   min-width: 160px