Run karma task only in test environment

and fails otherwise, as it needs the defaults defined in test environment

.codeclimate.yml

@@ -1,6 +1,9 @@
 engines:
   rubocop:
     enabled: true
+    exclude_fingerprints:
+    - ac41db8d4ec4cbf508c353d9b65a024f
+    - 8e3b6322aef5be9f38700b3fd0cd347e
   scss-lint:
     enabled: true
 ratings:

.gitignore

@@ -39,3 +39,4 @@ NERD_tree*
 coverage
 libpeerconnection.log
 /config/application.yml
+node_modules

.travis.yml

@@ -26,23 +26,26 @@ before_script:
   - cp config/database.travis.yml config/database.yml
   - cp config/application.yml.example config/application.yml
   - RAILS_ENV=test bundle exec rake db:create db:schema:load
+
+  # Only install PhantomJS if it is not already present (ie. cached)
+  - npm list -g phantomjs-prebuilt@~2.1.7 --depth=0 || npm install -g phantomjs-prebuilt@~2.1.7
+  - export PATH=`npm bin -g`:$PATH
+
   - >
     if [ "$KARMA" = "true" ]; then
-      npm install karma@0.12.31
-      npm install karma-jasmine@0.1.5
-      npm install karma-phantomjs-launcher@0.1.4
-      npm install karma-coffee-preprocessor@0.2.1
-      npm install -g karma-cli@0.0.4
+      npm install -g npm@'3.8.8'
+      npm install
+      npm install -g karma-cli@0.1.2
     fi
 
 script:
   - 'if [ "$KARMA" = "true" ]; then bundle exec rake karma:run; else echo "Skipping karma run"; fi'
   #- "KNAPSACK_GENERATE_REPORT=true bundle exec rspec spec"
-  - "bundle exec rake knapsack:rspec"
+  - "bundle exec rake 'knapsack:rspec[--tag ~performance]'"
 
 after_success:
   - >
-    if [ "$GITHUB_DEPLOY" = "true" -a "$TRAVIS_PULL_REQUEST" = "false" -a -n "$TRAVIS_BRANCH" -a -n "$GITHUB_API_SECRET" ]; then
+    if [ "$GITHUB_DEPLOY" = "true" -a "$TRAVIS_PULL_REQUEST" = "false" -a -n "$TRAVIS_BRANCH" -a "$TRAVIS_BRANCH" != "transifex" -a -n "$GITHUB_API_SECRET" ]; then
       description="`git show "$TRAVIS_BRANCH" -s --oneline --no-color`"
       data="{
         \"ref\":\"$TRAVIS_BRANCH\",

Gemfile

@@ -5,28 +5,29 @@ gem 'rails', '3.2.21'
 gem 'rails-i18n', '~> 3.0.0'
 gem 'i18n', '~> 0.6.11'
 
-gem 'nokogiri'
+# Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
+gem 'nokogiri', '>= 1.6.7.1'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: '1-3-stable'
+gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step1c'
 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
-# https://github.com/spree-contrib/better_spree_paypal_express/pull/117
-gem 'spree_paypal_express', :github => "openfoodfoundation/better_spree_paypal_express", :branch => "1-3-stable"
+# Our branch contains two changes
+# - Pass customer email and phone number to PayPal (merged to upstream master)
+# - Change type of password from string to password to hide it in the form
+gem 'spree_paypal_express', :github => "openfoodfoundation/better_spree_paypal_express", :branch => "hide-password"
 #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
 # When merged, revert to upstream gem
 gem 'simple_form', :github => 'RohanM/simple_form'
 
 gem 'unicorn'
-gem 'angularjs-rails', '1.2.13'
+gem 'angularjs-rails', '1.5.5'
 gem 'bugsnag'
 gem 'newrelic_rpm'
 gem 'haml'
@@ -49,18 +50,20 @@ gem 'gmaps4rails'
 gem 'spinjs-rails'
 gem 'rack-ssl', :require => 'rack/ssl'
 gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
-gem 'angularjs-file-upload-rails', '~> 1.1.0'
+gem 'angularjs-file-upload-rails', '~> 1.1.6'
 gem 'roadie-rails', '~> 1.0.3'
 gem 'figaro'
 gem 'blockenspiel'
 gem 'acts-as-taggable-on', '~> 3.4'
 gem 'paper_trail', '~> 3.0.8'
+gem 'diffy'
 
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
 
 gem 'foreigner'
 gem 'immigrant'
+gem 'roo', '~> 2.7.0'
 
 gem 'whenever', require: false
 
@@ -85,8 +88,10 @@ gem "foundation-rails"
 gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
 
 gem 'jquery-rails'
+gem 'jquery-migrate-rails'
 gem 'css_splitter'
 
+gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz'
 
 group :test, :development do
   # Pretty printed test output

Gemfile.lock

@@ -14,54 +14,64 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: cdd61161ccd27cd8d183f9321422c7be113796b8
-  branch: 1-3-stable
+  revision: 840d973cd5bd3250b17674a624dad494aeb09eb3
+  branch: hide-password
   specs:
     spree_paypal_express (2.0.3)
       paypal-sdk-merchant (= 1.106.1)
       spree_core (~> 1.3.4)
 
 GIT
-  remote: git://github.com/openfoodfoundation/spree.git
-  revision: 6e3edfe40a5de8eba0095b2c5f3db9ea54c3afda
-  branch: 1-3-stable
+  remote: git://github.com/openfoodfoundation/ofn-qz.git
+  revision: 024680ccea429b2e5428d7b964fa67c52add34ec
   specs:
-    spree (1.3.6.beta)
-      spree_api (= 1.3.6.beta)
-      spree_cmd (= 1.3.6.beta)
-      spree_core (= 1.3.6.beta)
-      spree_promo (= 1.3.6.beta)
-      spree_sample (= 1.3.6.beta)
-    spree_api (1.3.6.beta)
-      spree_core (= 1.3.6.beta)
+    ofn-qz (0.1.0)
+      railties (~> 3.1)
+
+GIT
+  remote: git://github.com/openfoodfoundation/spree.git
+  revision: a4c439570b77afa50f9e36299811f293232bd281
+  branch: spree-upgrade-step1c
+  specs:
+    spree (1.3.99)
+      spree_api (= 1.3.99)
+      spree_cmd (= 1.3.99)
+      spree_core (= 1.3.99)
+      spree_dash (= 1.3.99)
+      spree_promo (= 1.3.99)
+      spree_sample (= 1.3.99)
+    spree_api (1.3.99)
+      spree_core (= 1.3.99)
       versioncake (= 0.4.0)
-    spree_cmd (1.3.6.beta)
+    spree_cmd (1.3.99)
       thor (>= 0.14.6)
-    spree_core (1.3.6.beta)
-      activemerchant (~> 1.34)
+    spree_core (1.3.99)
+      activemerchant (~> 1.50.0)
       acts_as_list (= 0.1.4)
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (= 1.6.8)
       deface (>= 0.9.0)
       ffaker (~> 1.15.0)
-      highline (= 1.6.18)
-      jquery-rails (~> 2.2.0)
+      highline (= 1.6.11)
+      jquery-rails (~> 2.0)
       json (>= 1.5.5)
-      kaminari (= 0.14.1)
-      money (= 5.1.1)
+      kaminari (= 0.13.0)
+      money (= 5.0.0)
       paperclip (~> 3.0)
       rabl (= 0.7.2)
-      rails (~> 3.2.16)
+      rails (~> 3.2.13)
       ransack (= 0.7.2)
-      select2-rails (= 3.5.9.3)
-      state_machine (= 1.1.2)
+      select2-rails (~> 3.2)
+      state_machine (= 1.2.0)
       stringex (~> 1.3.2)
-      truncate_html (~> 0.5.5)
-    spree_promo (1.3.6.beta)
-      spree_core (= 1.3.6.beta)
-    spree_sample (1.3.6.beta)
-      spree_core (= 1.3.6.beta)
+    spree_dash (1.3.99)
+      httparty (~> 0.8.1)
+      spree_core (= 1.3.99)
+    spree_promo (1.3.99)
+      spree_core (= 1.3.99)
+    spree_sample (1.3.99)
+      spree_core (= 1.3.99)
 
 GIT
   remote: git://github.com/spree/deface.git
@@ -121,11 +131,10 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    active_link_to (1.0.0)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activemerchant (1.57.0)
-      activesupport (>= 3.2.14, < 5.1)
+    activemerchant (1.50.0)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
@@ -152,8 +161,8 @@ GEM
       railties (>= 3.1)
       sprockets (~> 2)
       tilt
-    angularjs-file-upload-rails (1.1.0)
-    angularjs-rails (1.2.13)
+    angularjs-file-upload-rails (1.1.6)
+    angularjs-rails (1.5.5)
     ansi (1.4.2)
     arel (3.0.3)
     atomic (1.1.99)
@@ -168,15 +177,14 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.4.5)
-    bugsnag (1.5.2)
-      httparty (>= 0.6, < 1.0)
-      multi_json (~> 1.0)
+    bugsnag (4.1.0)
     builder (3.0.4)
     byebug (2.7.0)
       columnize (~> 0.3)
       debugger-linecache (~> 1.2)
     cancan (1.6.8)
-    capybara (2.5.0)
+    capybara (2.7.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -189,7 +197,7 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
     coffee-rails (3.2.2)
@@ -201,10 +209,6 @@ GEM
     coffee-script-source (1.10.0)
     colorize (0.7.7)
     columnize (0.9.0)
-    comfortable_mexican_sofa (1.6.24)
-      active_link_to (~> 1.0.0)
-      paperclip (>= 2.3.0)
-      rails (>= 3.0.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -225,7 +229,7 @@ GEM
       safe_yaml (~> 0.9.0)
     css_parser (1.3.5)
       addressable
-    css_splitter (0.4.1)
+    css_splitter (0.4.5)
       sprockets (>= 2.0.0)
     daemons (1.2.2)
     dalli (2.7.2)
@@ -248,6 +252,7 @@ GEM
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
     diff-lcs (1.2.4)
+    diffy (3.1.0)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
@@ -407,12 +412,12 @@ GEM
       zeus
     haml (4.0.4)
       tilt
-    highline (1.6.18)
+    highline (1.6.11)
     hike (1.2.3)
     http_parser.rb (0.5.3)
-    httparty (0.13.1)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
+      multi_xml
     i18n (0.6.11)
     immigrant (0.1.6)
       activerecord (>= 3.0)
@@ -420,16 +425,18 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.0)
     journey (1.0.4)
-    jquery-rails (2.2.2)
+    jquery-migrate-rails (1.2.1)
+    jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     json_spec (1.1.1)
       multi_json (~> 1.0)
       rspec (~> 2.0)
-    kaminari (0.14.1)
+    kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     kgio (2.9.3)
     knapsack (1.5.1)
       rake
@@ -449,16 +456,17 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
-    money (5.1.1)
-      i18n (~> 0.6.0)
-    multi_json (1.11.2)
+    money (5.0.0)
+      i18n (~> 0.4)
+      json
+    multi_json (1.12.1)
     multi_xml (0.5.5)
     newrelic_rpm (3.12.0.288)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     oj (2.1.2)
     orm_adapter (0.5.0)
     paper_trail (3.0.8)
@@ -478,7 +486,7 @@ GEM
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.13.2)
-    poltergeist (1.7.0)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -497,7 +505,7 @@ GEM
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
     rack (1.4.7)
-    rack-cache (1.2)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-livereload (0.3.15)
       rack
@@ -524,7 +532,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.13.0)
-    rake (10.4.2)
+    rake (11.1.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -550,6 +558,9 @@ GEM
     roadie-rails (1.0.3)
       rails (>= 3.0, < 4.2)
       roadie (~> 3.0)
+    roo (2.7.1)
+      nokogiri (~> 1)
+      rubyzip (~> 1.1, < 2.0.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -568,13 +579,14 @@ GEM
     rspec-retry (0.4.2)
       rspec-core
     ruby-progressbar (1.7.1)
+    rubyzip (1.2.0)
     safe_yaml (0.9.5)
     sass (3.3.14)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.5.9.3)
+    select2-rails (3.5.10)
       thor (~> 0.14)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
@@ -586,14 +598,14 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    state_machine (1.1.2)
+    state_machine (1.2.0)
     stringex (1.3.3)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     tilt (1.4.1)
-    timecop (0.6.2.2)
+    timecop (0.8.1)
     timers (1.1.0)
     treetop (1.4.15)
       polyglot
@@ -604,7 +616,7 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.44)
+    tzinfo (0.3.49)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -625,15 +637,14 @@ GEM
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     whenever (0.9.2)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)
-    wicked_pdf (0.11.0)
-      rails
-    wkhtmltopdf-binary (0.9.9.3)
+    wicked_pdf (1.1.0)
+    wkhtmltopdf-binary (0.12.3.1)
     xml-simple (1.1.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -648,8 +659,8 @@ DEPENDENCIES
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.2.0)
-  angularjs-file-upload-rails (~> 1.1.0)
-  angularjs-rails (= 1.2.13)
+  angularjs-file-upload-rails (~> 1.1.6)
+  angularjs-rails (= 1.5.5)
   atomic
   awesome_print
   aws-sdk
@@ -657,7 +668,6 @@ DEPENDENCIES
   bugsnag
   capybara
   coffee-rails (~> 3.2.1)
-  comfortable_mexican_sofa
   compass-rails
   css_splitter
   custom_error_message!
@@ -668,6 +678,7 @@ DEPENDENCIES
   debugger-linecache
   deface!
   delayed_job_active_record
+  diffy
   factory_girl_rails
   figaro
   foreigner
@@ -685,13 +696,15 @@ DEPENDENCIES
   haml
   i18n (~> 0.6.11)
   immigrant
+  jquery-migrate-rails
   jquery-rails
   json_spec
   knapsack
   letter_opener
   momentjs-rails
   newrelic_rpm
-  nokogiri
+  nokogiri (>= 1.6.7.1)
+  ofn-qz!
   oj
   paper_trail (~> 3.0.8)
   paperclip
@@ -707,6 +720,7 @@ DEPENDENCIES
   redcarpet
   representative_view
   roadie-rails (~> 1.0.3)
+  roo (~> 2.7.0)
   rspec-rails
   rspec-retry
   sass (~> 3.3)
@@ -730,3 +744,9 @@ DEPENDENCIES
   whenever
   wicked_pdf
   wkhtmltopdf-binary
+
+RUBY VERSION
+   ruby 2.1.5p273
+
+BUNDLED WITH
+   1.14.3

README.md

@@ -98,6 +98,14 @@ The site is configured to use
 startup time while Rails loads. See the Zeus github page for
 usage instructions.
 
+Once [npm dependencies are
+installed](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma), AngularJS tests can be run with:
+
+    ./script/karma run
+
+If you want karma to automatically rerun the tests on file modification, use:
+
+    ./script/karma start
 
 ## Credits
 

Rakefile

@@ -2,7 +2,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Openfoodnetwork::Application.load_tasks
 

app/assets/images/ofn-logo-mobile.svg

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 300 104"
+   enable-background="new 0 0 300 104"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="logo-black.svg"
+   width="100%"
+   height="100%">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="741"
+     id="namedview20"
+     showgrid="false"
+     inkscape:zoom="1.8101934"
+     inkscape:cx="126.57728"
+     inkscape:cy="62.030566"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4" />
+  <g
+     id="g4"
+     fill="#fff">
+    <path
+       d="M142.7 15.6c.4 3.2.4 7.5 0 10.7-.5 4.6-3.8 8.4-9.1 8.4s-8.5-3.8-9.1-8.4c-.4-3.2-.4-7.5 0-10.7.5-4.6 3.8-8.4 9.1-8.4s8.6 3.8 9.1 8.4m-5.3 10.7c.4-3.2.4-7.5 0-10.7-.2-1.7-1.4-3-3.7-3-2.3 0-3.5 1.4-3.7 3-.4 3.2-.4 7.5 0 10.7.2 1.7 1.4 3 3.7 3 2.3 0 3.5-1.3 3.7-3"
+       id="path6"
+       style="fill:#000000" />
+    <path
+       d="M156.4 7.6c4.4 0 8 3.6 8 8s-3.6 8-8 8H153c-.2 0-.4.2-.4.4v9.5c0 .4-.3.8-.8.8H148c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h8.4zm-3.5 5.3c-.2 0-.4.2-.4.4v4.6c0 .2.2.4.4.4h3.4c1.4 0 2.7-1.2 2.7-2.7 0-1.4-1.2-2.7-2.7-2.7h-3.4zM172.9 28.6c0 .2.2.4.4.4h9c.4 0 .8.3.8.8v3.8c0 .4-.3.8-.8.8h-14c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h13.8c.4 0 .8.3.8.8v3.8c0 .4-.3.8-.8.8h-8.9c-.2 0-.4.2-.4.4V18c0 .2.2.4.4.4h8.6c.4 0 .8.3.8.8V23c0 .4-.3.8-.8.8h-8.6c-.2 0-.4.2-.4.4v4.4zM199.4 34.3c-.6 0-.9-.3-1-.6l-5.2-13.4c-.1-.2-.3-.2-.3.1v13.2c0 .4-.3.8-.8.8h-3.8c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h4.5c.6 0 .8.3 1 .7l5.2 14.5c.1.2.3.2.3-.1V8.4c0-.4.3-.8.8-.8h3.8c.4 0 .8.3.8.8v25.1c0 .4-.3.8-.8.8h-4.5zM224.4 24v9.5c0 .4-.3.8-.8.8h-3.8c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h13.3c.4 0 .8.3.8.8v3.8c0 .4-.3.8-.8.8h-8.4c-.2 0-.4.2-.4.4V18c0 .2.2.4.4.4h8c.4 0 .8.3.8.8V23c0 .4-.3.8-.8.8h-8c-.1-.2-.3 0-.3.2M255.6 15.6c.4 3.2.4 7.5 0 10.7-.5 4.6-3.8 8.4-9.1 8.4s-8.5-3.8-9.1-8.4c-.4-3.2-.4-7.5 0-10.7.5-4.6 3.8-8.4 9.1-8.4s8.6 3.8 9.1 8.4m-5.3 10.7c.4-3.2.4-7.5 0-10.7-.2-1.7-1.4-3-3.7-3-2.3 0-3.5 1.4-3.7 3-.4 3.2-.4 7.5 0 10.7.2 1.7 1.4 3 3.7 3 2.3 0 3.5-1.3 3.7-3M278 15.6c.4 3.2.4 7.5 0 10.7-.5 4.6-3.8 8.4-9.1 8.4s-8.5-3.8-9.1-8.4c-.4-3.2-.4-7.5 0-10.7.5-4.6 3.8-8.4 9.1-8.4s8.5 3.8 9.1 8.4m-5.4 10.7c.4-3.2.4-7.5 0-10.7-.2-1.7-1.4-3-3.7-3-2.3 0-3.5 1.4-3.7 3-.4 3.2-.4 7.5 0 10.7.2 1.7 1.4 3 3.7 3 2.3 0 3.5-1.3 3.7-3"
+       id="path8"
+       style="fill:#000000" />
+    <path
+       d="M291.2 7.6c4.7 0 8 3.8 8.5 8.4.4 3.2.4 6.6 0 9.8-.5 4.6-3.8 8.4-8.5 8.4h-8c-.4 0-.8-.3-.8-.8v-25c0-.4.3-.8.8-.8h8zm-3 5.3c-.2 0-.4.2-.4.4v15.2c0 .2.2.4.4.4h3c1.8 0 2.9-1.4 3.1-3.1.4-3.2.4-6.6 0-9.8-.2-1.7-1.4-3.1-3.1-3.1h-3zM137.5 67.9c-.4 0-.6-.1-.8-.6l-9.1-20.8c-.1-.1-.3-.1-.3.1v20.6c0 .4-.3.7-.8.7h-.8c-.4 0-.8-.3-.8-.7V43.3c0-.4.3-.7.8-.7h2c.4 0 .6.1.8.6l9.1 20.6c.1.1.3.1.3-.1V43.3c0-.4.3-.7.8-.7h.8c.4 0 .8.3.8.7v23.9c0 .4-.3.7-.8.7h-2zM146.7 65.3c0 .2.2.4.4.4h9.9c.4 0 .8.3.8.7v.9c0 .4-.3.7-.8.7h-12c-.4 0-.8-.3-.8-.7v-24c0-.4.3-.7.8-.7h12c.4 0 .8.3.8.7v.9c0 .4-.3.7-.8.7h-9.9c-.2 0-.4.1-.4.4v8.2c0 .2.2.4.4.4h9.4c.4 0 .8.3.8.7v.8c0 .4-.3.7-.8.7h-9.4c-.2 0-.4.1-.4.4v8.8zM170 45.3v21.9c0 .4-.3.7-.8.7h-1c-.4 0-.8-.3-.8-.7V45.3c0-.2-.2-.4-.4-.4h-5.6c-.4 0-.8-.3-.8-.7v-.9c0-.4.3-.7.8-.7H176c.4 0 .8.3.8.7v.9c0 .4-.3.7-.8.7h-5.6c-.2 0-.4.2-.4.4M187 67.9h-2.1c-.3 0-.6-.2-.7-.5L179 43.3c-.1-.4.2-.7.8-.7h.9c.3 0 .6.1.7.5l4.3 20.7c0 .1.1.2.2.2h.1c.1 0 .2-.1.2-.2l4-20.7c.1-.4.4-.5.7-.5h1.3c.3 0 .6.2.7.5l4.3 20.7c0 .1.1.2.2.2h.1c.1 0 .2-.1.2-.2l4.6-20.7c.1-.4.4-.5.7-.5h.9c.6 0 .8.4.8.7l-5.5 24.1c-.1.4-.4.5-.7.5h-2.1c-.3 0-.6-.2-.7-.5l-4-19.3c0-.2-.3-.2-.3 0l-3.8 19.3c0 .4-.3.5-.6.5M223.9 49.8c.4 2.9.4 7.9 0 10.9-.6 4.7-3.9 7.5-8.5 7.5s-7.8-2.9-8.5-7.5c-.4-2.9-.4-8 0-10.9.6-3.9 3.5-7.5 8.5-7.5s7.9 3.6 8.5 7.5m-2.6 10.9c.5-3 .5-7.9 0-10.9-.4-2.6-2.3-5.2-5.9-5.2-3.6 0-5.5 2.6-5.9 5.2-.5 3-.5 7.9 0 10.9.3 2.1 1.8 5.2 5.9 5.2 4.1 0 5.6-3.1 5.9-5.2"
+       id="path10"
+       style="fill:#000000" />
+    <path
+       d="m 230.9,57.8 c -0.2,0 -0.4,0.1 -0.4,0.4 l 0,9 c 0,0.4 -0.3,0.7 -0.8,0.7 l -0.9,0 c -0.4,0 -0.8,-0.3 -0.8,-0.7 l 0,-23.9 c 0,-0.4 0.3,-0.7 0.8,-0.7 l 6.5,0 c 4.4,0 8,3.4 8,7.6 0,3.3 -1.8,5.2 -4.5,6.9 -0.5,0.3 -0.6,0.6 -0.3,1.2 l 4.8,8.6 c 0.3,0.5 0,1.1 -0.7,1.1 l -0.8,0 c -0.6,0 -0.9,-0.3 -1.1,-0.7 l -4.9,-9 c -0.1,-0.2 -0.3,-0.4 -0.7,-0.4 l -4.2,0 z m 0,-12.9 c -0.2,0 -0.4,0.1 -0.4,0.4 l 0,9.8 c 0,0.2 0.2,0.4 0.4,0.4 l 4.4,0 c 3,0 5.6,-2.4 5.6,-5.3 0,-2.9 -2.5,-5.3 -5.6,-5.3 z m 18.4,12.2 C 249.2,57 249,57 249,57.2 l 0,10 c 0,0.4 -0.3,0.7 -0.8,0.7 l -0.9,0 c -0.4,0 -0.8,-0.3 -0.8,-0.7 l 0,-23.9 c 0,-0.4 0.3,-0.7 0.8,-0.7 l 0.9,0 c 0.4,0 0.8,0.3 0.8,0.7 l 0,9.6 c 0,0.2 0.2,0.2 0.3,0.1 l 8.8,-10 c 0.1,-0.1 0.4,-0.4 1,-0.4 l 0.6,0 c 0.9,0 1.1,0.8 0.6,1.3 l -9.4,10.5 c -0.2,0.3 -0.3,0.5 0,0.9 L 261,66.6 c 0.4,0.5 0.3,1.3 -0.7,1.3 l -0.8,0 c -0.6,0 -0.8,-0.3 -1,-0.5 z"
+       id="path12"
+       style="fill:#000000"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssssssscccssccsccsssssssscssssssssssccssccccsscc" />
+    <path
+       d="m 3,44.3 0.5,0 c 1.2,0 2.2,-0.9 2.4,-2 0.5,-2.4 1.1,-4.7 2,-7 6.6,-18.2 23.5,-30.4 42,-30.4 18.5,0 35.4,12.2 42,30.3 0.8,2.2 1.5,4.6 2,6.9 0.3,1.3 1.6,2.2 2.9,1.9 1.3,-0.3 2.2,-1.6 1.9,-2.9 C 98.2,38.5 97.4,36 96.5,33.5 89.2,13.5 70.5,0 49.9,0 29.3,0 10.6,13.5 3.3,33.6 2.4,36.1 1.7,38.7 1.1,41.3 l 0,0.2 L 3.5,42 1.1,41.5 C 0.8,42.8 1.7,44.1 3,44.3 M 99.8,53 C 99.9,52 99.4,51 98.4,50.5 95,48.9 90.7,47.4 85.9,46.3 84.4,45.9 82.8,45.6 81.2,45.3 77.9,44.7 74.3,44.1 70.5,43.7 69.8,36.3 66.6,30.9 61,27.1 54.7,22.9 46.9,22.7 40.1,26.5 33.5,30.1 29.3,36.6 29,43.8 17.9,45.2 8.2,47.6 1.4,50.9 1.3,50.9 1.3,51 1.2,51 1.1,51 1.1,51.1 1,51.1 l -0.1,0.1 c -0.1,0.1 -0.2,0.1 -0.2,0.2 -0.4,0.4 -0.6,1 -0.6,1.6 0,1.4 0.1,2.7 0.2,4.1 0,0.4 0.1,0.7 0.1,1.1 0.3,2.6 0.8,5.2 1.5,7.7 0.2,0.7 0.3,1.4 0.5,2 0.3,0.9 0.6,1.7 0.9,2.6 0.7,1.8 1.4,3.6 2.2,5.2 0.8,1.6 1.7,3.1 2.6,4.6 0.7,1.2 1.5,2.3 2.4,3.5 1,1.3 2,2.6 3.2,3.8 1.5,1.7 3.1,3.2 4.8,4.6 1.4,1.2 2.9,2.3 4.4,3.3 1.9,1.3 3.8,2.4 5.9,3.4 2,0.9 4,1.8 6.1,2.4 2.1,0.7 4.3,1.2 6.5,1.6 2.8,0.5 5.7,0.8 8.7,0.8 l 0.1,0 c 13.6,0 26.5,-5.9 35.8,-15.9 1.8,-1.9 3.4,-3.9 4.9,-6.1 0.2,-0.2 0.3,-0.5 0.5,-0.7 1.5,-2.4 2.9,-4.8 4,-7.4 0.9,-2 1.6,-4 2.2,-6 1.3,-4.5 2.1,-9.5 2.2,-14.6 0,0.1 0,0.1 0,0 M 85.7,51.3 c 3.3,0.8 6.3,1.8 8.9,2.9 -3.4,1.6 -6.7,2.9 -9.9,4.1 -1.9,0.7 -3.7,1.2 -5.5,1.7 -3.5,1 -7.1,1.6 -10.7,2 1.3,-4.4 2,-8.8 2.2,-13.4 3.6,0.4 7,1 10.2,1.6 1.7,0.4 3.3,0.7 4.8,1.1 m -13,23.1 C 69.5,74.8 66.2,75 63,75 c 1.5,-2.5 2.7,-5.2 3.8,-7.8 3.6,-0.2 7,-0.7 10.4,-1.5 -1.3,2.9 -2.8,5.8 -4.5,8.7 m -9.8,12.5 c -2.8,0 -5.6,-0.1 -8.4,-0.5 1.9,-2.1 3.7,-4.3 5.4,-6.5 1.2,0.1 2.5,0.1 3.7,0.1 1.8,0 3.7,-0.1 5.5,-0.2 -1.9,2.4 -4,4.8 -6.2,7.1 M 40.2,82.4 c 1.6,-1.7 3,-3.4 4.4,-5.2 3.2,0.9 6.4,1.6 9.5,2 -1.7,2.1 -3.5,4.1 -5.4,6 -2.8,-0.7 -5.6,-1.6 -8.5,-2.8 M 6.6,65 C 6.1,63.1 5.7,61.2 5.4,59.2 c 7.2,-1.8 16.6,-1.4 26.2,1.3 -0.9,2 -2,3.9 -3.2,5.8 C 19.3,64 11.6,64.2 6.6,65 m 50.7,9.7 c -3.2,-0.3 -6.5,-0.9 -9.8,-1.7 1.4,-2.2 2.6,-4.5 3.7,-6.9 3.5,0.6 6.8,1 10.1,1.1 -1.1,2.5 -2.4,5.1 -4,7.5 M 42.7,71.4 c -1.5,-0.5 -3,-1.1 -4.5,-1.8 -1.7,-0.7 -3.3,-1.3 -4.9,-1.9 1.1,-1.9 2.2,-3.8 3.1,-5.8 3.5,1.2 6.8,2.2 10,3 -1.1,2.3 -2.4,4.5 -3.7,6.5 M 30.5,72 c 1.8,0.6 3.8,1.3 5.7,2.2 1.2,0.5 2.3,1 3.5,1.4 -1.3,1.7 -2.8,3.3 -4.3,4.8 -3.1,-1.2 -6.2,-2.3 -9.3,-3 1.5,-1.8 3,-3.6 4.4,-5.4 m 12,-41.3 c 5.2,-2.9 11.1,-2.7 15.8,0.4 4.2,2.8 6.5,6.7 7.3,12 -5,-0.4 -10.2,-0.6 -15.5,-0.6 -5.5,0 -10.9,0.3 -16,0.7 0.4,-5.1 3.5,-9.8 8.4,-12.5 m 7.5,16.8 2.1,0 c 1,0 2,0 3.1,0.1 3.6,0.1 7.2,0.3 10.6,0.6 -0.2,4.8 -1,9.5 -2.5,14.1 -3.2,0 -6.5,-0.3 -10,-0.9 -1.6,-0.3 -3.2,-0.6 -4.9,-1 -3.2,-0.7 -6.6,-1.7 -10.2,-3 -0.1,0 -0.2,-0.1 -0.3,-0.1 C 36.4,56.8 35,56.3 33.5,55.9 23.9,53.1 14.6,52.4 6.8,53.9 17.1,49.8 32.9,47.5 50,47.5 M 8.2,69.7 c 4.2,-0.5 10.1,-0.7 17.2,0.9 -1.5,1.9 -3.2,3.8 -5,5.5 -3.3,-0.5 -6.5,-0.8 -9.6,-0.7 -1,-1.8 -1.9,-3.7 -2.6,-5.7 m 9.5,15.2 c -1.1,-1.2 -2.2,-2.4 -3.2,-3.8 -0.2,-0.3 -0.4,-0.5 -0.6,-0.8 0.5,0 1,0 1.5,0.1 2,0.2 4.2,0.4 6.5,0.9 2.8,0.6 6,1.5 9.3,2.7 -2.5,2.1 -5.3,4.1 -8.2,5.8 -1.8,-1.4 -3.6,-3.1 -5.3,-4.9 m 9.9,8 c 3.2,-2 6.1,-4.3 8.8,-6.8 2.7,1.2 5.3,2.2 8,2.9 -3,2.6 -6.3,5.1 -10,7.1 -2.4,-0.8 -4.7,-1.9 -6.8,-3.2 m 13.1,5.2 c 3.5,-2.3 6.6,-5 9.4,-7.5 2.7,0.5 5.3,0.9 7.9,1.1 -3.2,3 -6.3,5.4 -9.4,7.4 -2.6,-0.2 -5.3,-0.5 -7.9,-1 m 17.1,0.2 c 2.4,-1.9 4.7,-4.1 7.2,-6.6 3.6,-0.1 7.2,-0.6 10.8,-1.3 -5.3,4 -11.5,6.7 -18,7.9 M 86.7,79.2 c -1.1,1.6 -2.3,3.1 -3.5,4.5 -4.4,1.2 -8.8,2.2 -13.2,2.7 2.1,-2.4 3.9,-4.9 5.6,-7.5 4.4,-0.7 8.8,-1.7 13.1,-3 -0.7,1.2 -1.3,2.2 -2,3.3 m -7.8,-5.9 c 1.6,-3.1 3,-6.2 4.1,-9.3 3.7,-1.2 7.4,-2.6 11.3,-4.3 -0.5,3.5 -1.5,6.9 -2.7,10.2 -4.2,1.4 -8.4,2.5 -12.7,3.4"
+       id="path18"
+       style="fill:#000000"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsccsccscccccccccccccccscscscccscsccccccccsscccccccccccccccccccccccsccccccccccccccccccccccccccccccccscccscccccccccccccccccccccccccccccccccccccccccccccccc" />
+  </g>
+</svg>

app/assets/javascripts/admin/all.js

@@ -6,6 +6,7 @@
 //
 
 //= require jquery
+//= require jquery-migrate-min
 //= require jquery_ujs
 //= require jquery-ui
 //= require shared/jquery-ui-timepicker-addon
@@ -36,14 +37,19 @@
 //= require ./order_cycles/order_cycles
 //= require ./payment_methods/payment_methods
 //= require ./products/products
+//= require ./resources/resources
 //= require ./shipping_methods/shipping_methods
 //= require ./side_menu/side_menu
+//= require ./tag_rules/tag_rules
 //= require ./taxons/taxons
 //= require ./utils/utils
 //= require ./users/users
 //= require ./variant_overrides/variant_overrides
-//= require textAngular.min.js
+//= require textAngular-rangy.min.js
 //= require textAngular-sanitize.min.js
-//= require ../shared/bindonce.min.js
+//= require textAngular.min.js
+//= require darkswarm/i18n.js
+//= require darkswarm/i18n.translate.js
+
 
 //= require_tree .

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

@@ -1,222 +0,0 @@
-angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
-  "$scope", "$http", "$filter", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer", "SpreeApiKey", "Columns"
-  ($scope, $http, $filter, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer, SpreeApiKey, Columns) ->
-    $scope.loading = true
-
-    $scope.initialiseVariables = ->
-      start = daysFromToday -7
-      end = daysFromToday 1
-      $scope.lineItems = []
-      $scope.filteredLineItems = []
-      $scope.confirmDelete = true
-      $scope.startDate = formatDate start
-      $scope.endDate = formatDate end
-      $scope.quickSearch = ""
-      $scope.bulkActions = [ { name: "Delete Selected", callback: $scope.deleteLineItems } ]
-      $scope.selectedBulkAction = $scope.bulkActions[0]
-      $scope.selectedUnitsProduct = {};
-      $scope.selectedUnitsVariant = {};
-      $scope.sharedResource = false
-      $scope.columns = Columns.setColumns
-        order_no:     { name: "Order No.",    visible: false }
-        full_name:    { name: "Name",         visible: true }
-        email:        { name: "Email",        visible: false }
-        phone:        { name: "Phone",        visible: false }
-        order_date:   { name: "Order Date",   visible: true }
-        producer:     { name: "Producer",     visible: true }
-        order_cycle:  { name: "Order Cycle",  visible: false }
-        hub:          { name: "Hub",          visible: false }
-        variant:      { name: "Variant",      visible: true }
-        quantity:     { name: "Quantity",     visible: true }
-        max:          { name: "Max",          visible: true }
-        final_weight_volume:   { name: "Weight/Volume", visible: false }
-        price:        { name: "Price",        visible: false }
-    $scope.initialise = ->
-      $scope.initialiseVariables()
-      authorise_api_reponse = ""
-      dataFetcher("/api/users/authorise_api?token=" + SpreeApiKey).then (data) ->
-        authorise_api_reponse = data
-        $scope.spree_api_key_ok = data.hasOwnProperty("success") and data["success"] == "Use of API Authorised"
-        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 = $filter('orderBy')(data, 'name')
-            $scope.suppliers.unshift blankOption()
-            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?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 ->
-                $scope.resetSelectFilters()
-        else if authorise_api_reponse.hasOwnProperty("error")
-          $scope.api_error_msg = authorise_api_reponse("error")
-        else
-          api_error_msg = "You don't have an API key yet. An attempt was made to generate one, but you are currently not authorised, please contact your site administrator for access."
-
-    $scope.fetchOrders = ->
-      $scope.loading = true
-      dataFetcher("/admin/orders/managed?template=bulk_index;page=1;per_page=500;q[state_not_eq]=canceled;q[completed_at_not_null]=true;q[completed_at_gt]=#{$scope.startDate};q[completed_at_lt]=#{$scope.endDate}").then (data) ->
-        $scope.resetOrders data
-        $scope.loading = false
-
-    $scope.resetOrders = (data) ->
-      $scope.orders = data
-      $scope.resetLineItems()
-      pendingChanges.removeAll()
-
-    $scope.resetLineItems = ->
-      $scope.lineItems = $scope.orders.reduce (lineItems,order) ->
-        orderWithoutLineItems = $scope.lineItemOrder order
-        for i,line_item of order.line_items
-          line_item.checked = false
-          line_item.supplier = $scope.matchObject $scope.suppliers, line_item.supplier, null
-          line_item.order = orderWithoutLineItems
-          line_item.original_final_weight_volume = line_item.final_weight_volume
-          line_item.original_quantity = line_item.quantity
-          line_item.original_price = line_item.price
-
-        lineItems.concat order.line_items
-      , []
-
-    $scope.lineItemOrder = (order) ->
-      lineItemOrder = angular.copy(order)
-      delete lineItemOrder.line_items
-      lineItemOrder.distributor = $scope.matchObject $scope.distributors, order.distributor, null
-      lineItemOrder.order_cycle = $scope.matchObject $scope.orderCycles, order.order_cycle, null
-      lineItemOrder
-
-    $scope.matchObject = (list, testObject, noMatch) ->
-      for i, object of list
-        if angular.equals(object, testObject)
-          return object
-      return noMatch
-
-    $scope.deleteLineItem = (lineItem) ->
-      if ($scope.confirmDelete && confirm("Are you sure?")) || !$scope.confirmDelete
-        $http(
-          method: "DELETE"
-          url: "/api/orders/" + lineItem.order.number + "/line_items/" + lineItem.id
-        ).success (data) ->
-          $scope.lineItems.splice $scope.lineItems.indexOf(lineItem), 1
-
-    $scope.deleteLineItems = (lineItems) ->
-      existingState = $scope.confirmDelete
-      $scope.confirmDelete = false
-      $scope.deleteLineItem lineItem for lineItem in lineItems when lineItem.checked
-      $scope.confirmDelete = existingState
-
-    $scope.submit = ->
-      if $scope.bulk_order_form.$valid
-        pendingChanges.submitAll()
-      else
-        alert "Some errors must be resolved be before you can update orders.\nAny fields with red borders contain errors."
-
-    $scope.allBoxesChecked = ->
-      checkedCount = $scope.filteredLineItems.reduce (count,lineItem) ->
-        count + (if lineItem.checked then 1 else 0 )
-      , 0
-      checkedCount == $scope.filteredLineItems.length
-
-    $scope.toggleAllCheckboxes = ->
-      changeTo = !$scope.allBoxesChecked()
-      lineItem.checked = changeTo for lineItem in $scope.filteredLineItems
-
-    $scope.setSelectedUnitsVariant = (unitsProduct,unitsVariant) ->
-      $scope.selectedUnitsProduct = unitsProduct
-      $scope.selectedUnitsVariant = unitsVariant
-
-    $scope.sumUnitValues = ->
-      sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-        sum = sum + lineItem.final_weight_volume
-      , 0
-
-    $scope.sumMaxUnitValues = ->
-      sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-        sum = sum + Math.max(lineItem.max_quantity,lineItem.original_quantity) * lineItem.units_variant.unit_value
-      , 0
-
-    $scope.allFinalWeightVolumesPresent = ->
-      for i,lineItem of $scope.filteredLineItems
-        return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
-      true
-
-    # How is this different to OptionValueNamer#name?
-    # Should it be extracted to that class or VariantUnitManager?
-    $scope.formattedValueWithUnitName = (value, unitsProduct, unitsVariant) ->
-      # A Units Variant is an API object which holds unit properies of a variant
-      if unitsProduct.hasOwnProperty("variant_unit") && (unitsProduct.variant_unit == "weight" || unitsProduct.variant_unit == "volume") && value > 0
-        scale = VariantUnitManager.getScale(value, unitsProduct.variant_unit)
-        Math.round(value/scale * 1000)/1000 + " " + VariantUnitManager.getUnitName(scale, unitsProduct.variant_unit)
-      else
-        ''
-
-    $scope.fulfilled = (sumOfUnitValues) ->
-      # A Units Variant is an API object which holds unit properies of a variant
-      if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
-        $scope.selectedUnitsProduct.hasOwnProperty("variant_unit") &&
-        ( $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume" )
-          Math.round( sumOfUnitValues / $scope.selectedUnitsProduct.group_buy_unit_size * 1000)/1000
-      else
-        ''
-
-    $scope.unitsVariantSelected = ->
-      !angular.equals($scope.selectedUnitsVariant,{})
-
-    $scope.resetSelectFilters = ->
-      $scope.distributorFilter = $scope.distributors[0].id
-      $scope.supplierFilter = $scope.suppliers[0].id
-      $scope.orderCycleFilter = $scope.orderCycles[0].id
-      $scope.quickSearch = ""
-
-    $scope.weightAdjustedPrice = (lineItem) ->
-      if lineItem.final_weight_volume > 0
-        unit_value = lineItem.final_weight_volume / lineItem.quantity
-        original_unit_value = lineItem.original_final_weight_volume / lineItem.original_quantity
-        lineItem.price = lineItem.original_price * (unit_value / original_unit_value)
-
-    $scope.unitValueLessThanZero = (lineItem) ->
-      if lineItem.units_variant.unit_value <= 0
-        true
-      else
-        false
-
-    $scope.updateOnQuantity = (lineItem) ->
-      if lineItem.quantity > 0
-        lineItem.final_weight_volume = lineItem.original_final_weight_volume * lineItem.quantity / lineItem.original_quantity
-        $scope.weightAdjustedPrice(lineItem)
-
-    $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) ->
-  now = new Date
-  now.setHours(0)
-  now.setMinutes(0)
-  now.setSeconds(0)
-  now.setDate( now.getDate() + days )
-  now
-
-formatDate = (date) ->
-  year = date.getFullYear()
-  month = twoDigitNumber date.getMonth() + 1
-  day = twoDigitNumber date.getDate()
-  return year + "-" + month + "-" + day
-
-formatTime = (date) ->
-  hours = twoDigitNumber date.getHours()
-  mins = twoDigitNumber date.getMinutes()
-  secs = twoDigitNumber date.getSeconds()
-  return hours + ":" + mins + ":" + secs
-
-twoDigitNumber = (number) ->
-  twoDigits =  "" + number
-  twoDigits = ("0" + number) if number < 10
-  twoDigits

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

@@ -1,39 +1,28 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth, Columns, tax_categories) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, $window, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth, Columns, tax_categories) ->
     $scope.loading = true
 
     $scope.StatusMessage = StatusMessage
 
-    $scope.columns = Columns.setColumns
-      producer:             {name: "Producer",              visible: true}
-      sku:                  {name: "SKU",                   visible: false}
-      name:                 {name: "Name",                  visible: true}
-      unit:                 {name: "Unit",                  visible: true}
-      price:                {name: "Price",                 visible: true}
-      on_hand:              {name: "On Hand",               visible: true}
-      on_demand:            {name: "On Demand",             visible: false}
-      category:             {name: "Category",              visible: false}
-      tax_category:         {name: "Tax Category",          visible: false}
-      inherits_properties:  {name: "Inherits Properties?",  visible: false}
-      available_on:         {name: "Available On",          visible: false}
+    $scope.columns = Columns.columns
 
     $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
     $scope.filterableColumns = [
-      { name: "Producer",       db_column: "producer_name" },
-      { name: "Name",           db_column: "name" }
+      { name: t("label_producers"),       db_column: "producer_name" },
+      { name: t("name"),           db_column: "name" }
     ]
 
     $scope.filterTypes = [
-      { name: "Equals",         predicate: "eq" },
-      { name: "Contains",       predicate: "cont" }
+      { name: t("equals"),         predicate: "eq" },
+      { name: t("contains"),       predicate: "cont" }
     ]
 
     $scope.optionTabs =
-      filters:        { title: "Filter Products",   visible: false }
+      filters:        { title: t("filter_products"),   visible: false }
 
 
     $scope.producers = producers
-    $scope.taxons = Taxons.taxons
+    $scope.taxons = Taxons.all
     $scope.tax_categories = tax_categories
     $scope.filterProducers = [{id: "0", name: ""}].concat $scope.producers
     $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons
@@ -105,7 +94,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       $scope.categoryFilter = "0"
 
     $scope.editWarn = (product, variant) ->
-      if (DirtyProducts.count() > 0 and confirm("Unsaved changes will be lost. Continue anyway?")) or (DirtyProducts.count() == 0)
+      if (DirtyProducts.count() > 0 and confirm(t("unsaved_changes_confirmation"))) or (DirtyProducts.count() == 0)
         window.location = "/admin/products/" + product.permalink_live + ((if variant then "/variants/" + variant.id else "")) + "/edit"
 
 
@@ -150,14 +139,14 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         if !$scope.variantSaved(variant)
           $scope.removeVariant(product, variant)
         else
-          if confirm("Are you sure?")
+          if confirm(t("are_you_sure"))
             $http(
               method: "DELETE"
               url: "/api/products/" + product.permalink_live + "/variants/" + variant.id + "/soft_delete"
             ).success (data) ->
               $scope.removeVariant(product, variant)
       else
-        alert("The last variant cannot be deleted!")
+        alert(t("delete_product_variant"))
 
     $scope.removeVariant = (product, variant) ->
       product.variants.splice product.variants.indexOf(variant), 1
@@ -194,7 +183,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       if productsToSubmit.length > 0
         $scope.updateProducts productsToSubmit # Don't submit an empty list
       else
-        StatusMessage.display 'alert', 'No changes to save.'
+        StatusMessage.display 'alert', t("products_change")
 
 
     $scope.updateProducts = (productsToSubmit) ->
@@ -212,11 +201,13 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       ).error (data, status) ->
         if status == 400 && data.errors? && data.errors.length > 0
           errors = error + "\n" for error in data.errors
-          alert "Saving failed with the following error(s):\n" + errors
-          $scope.displayFailure "Save failed due to invalid data"
+          alert t("products_update_error") + "\n" + errors
+          $scope.displayFailure t("products_update_error")
         else
-          $scope.displayFailure "Server returned with error status: " + status
+          $scope.displayFailure t("products_update_error_data") + status
 
+    $scope.cancel = (destination) ->
+      $window.location = destination
 
     $scope.packProduct = (product) ->
       if product.variant_unit_with_scale
@@ -253,23 +244,24 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
 
     $scope.displayUpdating = ->
-      StatusMessage.display 'progress', 'Saving...'
+      StatusMessage.display 'progress', t("saving")
 
 
     $scope.displaySuccess = ->
-      StatusMessage.display 'success', 'Changes saved.'
+      StatusMessage.display 'success',t("products_changes_saved")
+      $scope.bulk_product_form.$setPristine()
 
 
     $scope.displayFailure = (failMessage) ->
-      StatusMessage.display 'failure', "Saving failed. #{failMessage}"
+      StatusMessage.display  'failure', t("products_update_error_msg") + "#{failMessage}"
 
 
     $scope.displayDirtyProducts = ->
-      if DirtyProducts.count() > 0
-        message = if DirtyProducts.count() == 1 then "one product" else DirtyProducts.count() + " products"
-        StatusMessage.display 'notice', "Changes to #{message} remain unsaved."
-      else
-        StatusMessage.clear()
+      count = DirtyProducts.count()
+      switch count
+        when 0 then StatusMessage.clear()
+        when 1 then StatusMessage.display 'notice', t("one_product_unsaved")
+        else StatusMessage.display 'notice', t("products_unsaved", n: count)
 
 
 filterSubmitProducts = (productsToFilter) ->

app/assets/javascripts/admin/business_model_configuration/controllers/business_model_configuration_controller.js.coffee

@@ -9,6 +9,10 @@ angular.module("admin.businessModelConfiguration").controller "BusinessModelConf
     return $scope.bill() if !$scope.cap? || Number($scope.cap) == 0
     Math.min($scope.bill(), Number($scope.cap))
 
+  $scope.finalBill = ->
+    return 0 if Number($scope.turnover) < Number($scope.minBillableTurnover)
+    $scope.cappedBill()
+
   $scope.capReached = ->
     return "No" if !$scope.cap? || Number($scope.cap) == 0
     if $scope.bill() >= Number($scope.cap) then "Yes" else "No"
@@ -18,4 +22,4 @@ angular.module("admin.businessModelConfiguration").controller "BusinessModelConf
     ($scope.cappedBill() * Number($scope.taxRate))
 
   $scope.total = ->
-    $scope.cappedBill() + $scope.includedTax()
+    $scope.finalBill() + $scope.includedTax()

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

@@ -7,7 +7,7 @@ angular.module("ofn.admin").controller "AdminEnterpriseRelationshipsCtrl", ($sco
     $scope.EnterpriseRelationships.create($scope.parent_id, $scope.child_id, $scope.permissions)
 
   $scope.delete = (enterprise_relationship) ->
-    if confirm("Are you sure?")
+    if confirm(t("are_you_sure"))
       $scope.EnterpriseRelationships.delete enterprise_relationship
 
   $scope.toggleKeyword = (string, key) ->

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

@@ -7,5 +7,5 @@ angular.module("ofn.admin").controller "AdminEnterpriseRolesCtrl", ($scope, Ente
     $scope.EnterpriseRoles.create($scope.user_id, $scope.enterprise_id)
 
   $scope.delete = (enterprise_role) ->
-    if confirm("Are you sure?")
+    if confirm(t('are_you_sure'))
       $scope.EnterpriseRoles.delete enterprise_role

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

@@ -1,17 +1,48 @@
-angular.module("admin.customers").controller "customersCtrl", ($scope, Customers, Columns, pendingChanges, shops) ->
-  $scope.shop = null
+angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filter, Customers, TagRuleResource, CurrentShop, RequestMonitor, Columns, pendingChanges, shops, availableCountries) ->
   $scope.shops = shops
+  $scope.availableCountries = availableCountries
+  $scope.RequestMonitor = RequestMonitor
   $scope.submitAll = pendingChanges.submitAll
+  $scope.customerLimit = 20
+  $scope.customers = Customers.all
+  $scope.columns = Columns.columns
 
-  $scope.columns = Columns.setColumns
-    email:     { name: "Email",    visible: true }
-    code:      { name: "Code",     visible: true }
-    tags:      { name: "Tags",     visible: true }
+  $scope.confirmRefresh = (event) ->
+    event.preventDefault() unless pendingChanges.unsavedCount() == 0 || confirm(t("unsaved_changes_warning"))
 
-  $scope.$watch "shop", ->
-    if $scope.shop?
-      Customers.loaded = false
-      $scope.customers = Customers.index(enterprise_id: $scope.shop.id)
+  $scope.$watch "shop_id", ->
+    if $scope.shop_id?
+      CurrentShop.shop = $filter('filter')($scope.shops, {id: $scope.shop_id})[0]
+      Customers.index({enterprise_id: $scope.shop_id}).then (data) ->
+        pendingChanges.removeAll()
+        $scope.customers_form.$setPristine()
 
-  $scope.loaded = ->
-    Customers.loaded
+  $scope.shop_id = shops[0].id if shops.length == 1
+
+  $scope.deleteCustomer = (customer) ->
+    if confirm(t('admin.customers.index.confirm_delete'))
+      Customers.remove(customer)
+
+  $scope.checkForDuplicateCodes = ->
+    delete this.customer.code unless this.customer.code
+    this.duplicate = $scope.isDuplicateCode(this.customer.code)
+
+  $scope.isDuplicateCode = (code) ->
+    return false unless code
+    customers = $scope.findByCode(code)
+    customers.length > 1
+
+  $scope.findByCode = (code) ->
+    if $scope.customers
+      $scope.customers.filter (customer) ->
+        customer.code == code
+
+  $scope.findTags = (query) ->
+    defer = $q.defer()
+    params =
+      enterprise_id: $scope.shop_id
+    TagRuleResource.mapByTag params, (data) =>
+      filtered = data.filter (tag) ->
+        tag.text.toLowerCase().indexOf(query.toLowerCase()) != -1
+      defer.resolve filtered
+    defer.promise

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

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

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

@@ -0,0 +1,36 @@
+angular.module("admin.customers").directive 'editAddressDialog', ($compile, $templateCache, $filter, DialogDefaults, Customers, StatusMessage) ->
+  restrict: 'A'
+  scope: true
+  link: (scope, element, attr) ->
+    scope.errors = []
+
+    scope.$watch 'address.country_id', (newVal) ->
+      if newVal
+        scope.states = scope.filter_states(newVal)
+
+    scope.updateAddress = ->
+      scope.edit_address_form.$setPristine()
+      if scope.edit_address_form.$valid
+        Customers.update(scope.address, scope.customer, scope.addressType).$promise.then (data) ->
+          scope.customer = data
+          template.dialog('close')
+          StatusMessage.display('success', t('admin.customers.index.update_address_success'))
+      else
+        scope.errors.push(t('admin.customers.index.update_address_error'))
+
+
+    template = $compile($templateCache.get('admin/edit_address_dialog.html'))(scope)
+    template.dialog(DialogDefaults)
+
+    element.bind 'click', (e) ->
+      if e.target.id == 'bill-address-link'
+        scope.addressType = 'bill_address'
+      else
+        scope.addressType = 'ship_address'
+      scope.address = scope.customer[scope.addressType]
+
+      template.dialog('open')
+      scope.$apply()
+
+    scope.filter_states = (countryID) ->
+      $filter('filter')(scope.availableCountries, {id: countryID})[0].states

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

@@ -0,0 +1,38 @@
+angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $templateCache, DialogDefaults, CurrentShop, Customers) ->
+  restrict: 'A'
+  scope: true
+  link: (scope, element, attr) ->
+    scope.CurrentShop = CurrentShop
+    scope.submitted = false
+    scope.email = ""
+    scope.errors = []
+
+    scope.addCustomer = ->
+      scope.new_customer_form.$setPristine()
+      scope.submitted = true
+      scope.errors = []
+      if scope.new_customer_form.$valid
+        Customers.add(scope.email).$promise.then (data) ->
+          if data.id
+            scope.email = ""
+            scope.submitted = false
+            template.dialog('close')
+        , (response) ->
+          if response.data.errors
+            scope.errors.push(error) for error in response.data.errors
+          else
+            scope.errors.push("Sorry! Could not create '#{scope.email}'")
+      return
+
+    # Compile modal template
+    template = $compile($templateCache.get('admin/new_customer_dialog.html'))(scope)
+
+    # Set Dialog options
+    template.dialog(DialogDefaults)
+
+    # Link opening of dialog to click event on element
+    element.bind 'click', (e) ->
+      if CurrentShop.shop.id
+        template.dialog('open')
+      else
+        alert('Please select a shop first')

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

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

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

@@ -0,0 +1,3 @@
+angular.module("admin.customers").factory "CurrentShop", ->
+  new class CurrentShop
+    shop: {}

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

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

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

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

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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").directive "ofnTrackMaster", ["DirtyProducts", (DirtyProducts) ->
+angular.module("ofn.admin").directive "ofnTrackMaster", (DirtyProducts) ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     ngModel.$parsers.push (viewValue) ->
@@ -6,4 +6,3 @@ angular.module("ofn.admin").directive "ofnTrackMaster", ["DirtyProducts", (Dirty
         DirtyProducts.addMasterProperty scope.product.id, scope.product.master.id, attrs.ofnTrackMaster, viewValue
         scope.displayDirtyProducts()
       viewValue
-  ]

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

@@ -0,0 +1,10 @@
+angular.module("admin.dropdown").controller "ColumnsDropdownCtrl", ($scope, Columns) ->
+  $scope.columns = Columns.columns
+  $scope.toggle = Columns.toggleColumn
+  $scope.saved = Columns.preferencesSaved
+  $scope.saving = false
+
+  $scope.saveColumnPreferences = (action_name) ->
+    $scope.saving = true
+    Columns.savePreferences(action_name).then ->
+      $scope.saving = false

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

@@ -0,0 +1,6 @@
+angular.module("admin.dropdown").directive 'columnsDropdown', ->
+  restrict: 'E'
+  templateUrl: 'admin/columns_dropdown.html'
+  controller: 'ColumnsDropdownCtrl'
+  scope:
+    action: '@'

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

@@ -4,12 +4,12 @@ angular.module("admin.enterprise_groups")
     $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" }
+      { name: 'primary_details', label: t('primary_details'), icon_class: "icon-user" }
+      { name: 'users', label: t('users'), icon_class: "icon-user" }
+      { name: 'about', label: t('about'), icon_class: "icon-pencil" }
+      { name: 'images', label: t('images'), icon_class: "icon-picture" }
+      { name: 'contact', label: t('admin_entreprise_groups_contact'), icon_class: "icon-phone" }
+      { name: 'web', label: t('admin_entreprise_groups_web'), icon_class: "icon-globe" }
     ]
 
     $scope.select(0)

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

@@ -1,19 +1,35 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu) ->
+  .controller "enterpriseCtrl", ($scope, $window, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
     $scope.Enterprise = enterprise
     $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
     $scope.navClear = NavigationCheck.clear
     $scope.pristineEmail = $scope.Enterprise.email
     $scope.menu = SideMenu
-    $scope.newManager = { id: '', email: 'Add a manager...' }
+    $scope.newManager = { id: '', email: (t('add_manager')) }
+
+    $scope.StatusMessage = StatusMessage
+
+    $scope.$watch 'enterprise_form.$dirty', (newValue) ->
+      StatusMessage.display 'notice', t('admin.unsaved_changes') if newValue
+
+    $scope.setFormDirty = ->
+      $scope.$apply ->
+        $scope.enterprise_form.$setDirty()
+
+    $scope.cancel = (destination) ->
+      $window.location = destination
+
+    $scope.submit = ->
+      $scope.navClear()
+      enterprise_form.submit()
 
     # 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 .
+    # and on all new uses of this contoller, and we might not want that.
     enterpriseNavCallback = ->
-      if $scope.Enterprise.$dirty
-        "Your changes to the enterprise are not saved yet."
+      if $scope.enterprise_form.$dirty
+        t('admin.unsaved_confirm_leave')
 
     # Register the NavigationCheck callback
     NavigationCheck.register(enterpriseNavCallback)
@@ -22,6 +38,8 @@ angular.module("admin.enterprises")
       if manager.id?
         for i, user of $scope.Enterprise.users when user.id == manager.id
           $scope.Enterprise.users.splice i, 1
+        if $scope.enterprise_form?
+          $scope.enterprise_form.$setDirty()
 
     $scope.addManager = (manager) ->
       if manager.id? and manager.email?
@@ -31,4 +49,4 @@ angular.module("admin.enterprises")
         if (user for user in $scope.Enterprise.users when user.id == manager.id).length == 0
           $scope.Enterprise.users.push manager
         else
-          alert "#{manager.email} is already a manager!"
+          alert ("#{manager.email}" + " " + t("is_already_manager"))

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

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

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

@@ -3,11 +3,54 @@ angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, $q, E
     requests.push ($scope.allEnterprises = Enterprises.index(ams_prefix: "index")).$promise
 
     $q.all(requests).then ->
+      $scope.updateStaticFieldsFor(enterprise) for enterprise in $scope.allEnterprises
       $scope.loaded = true
 
-    $scope.columns = Columns.setColumns
-      name:     { name: "Name",     visible: true }
-      producer: { name: "Producer", visible: true }
-      package:  { name: "Package",  visible: true }
-      status:   { name: "Status",   visible: true }
-      manage:   { name: "Manage",   visible: true }
+    $scope.columns = Columns.columns
+
+    $scope.updateStaticFieldsFor = (enterprise) ->
+      enterprise.producer = $scope.producerTextFor(enterprise)
+      enterprise.package = $scope.packageTextFor(enterprise)
+      enterprise.producerError = (enterprise.producer == "Choose")
+      enterprise.packageError = (enterprise.package == "Choose")
+      enterprise.status = $scope.statusFor(enterprise)
+
+    $scope.$on "enterprise:updated", (event, enterprise) ->
+      $scope.updateStaticFieldsFor(enterprise)
+
+    $scope.statusFor = (enterprise) ->
+      if enterprise.issues.length > 0
+        "issue"
+      else if enterprise.warnings.length > 0
+        "warning"
+      else
+        "ok"
+
+
+    $scope.producerTextFor = (enterprise) ->
+      switch enterprise.is_primary_producer
+        when true
+          "Producer"
+        else
+          "Non-Producer"
+
+    $scope.packageTextFor = (enterprise) ->
+      switch enterprise.is_primary_producer
+        when true
+          switch enterprise.sells
+            when "none"
+              "Profile"
+            when "own"
+              "Shop"
+            when "any"
+              "Hub"
+            else
+              "Choose"
+        else
+          switch enterprise.sells
+            when "none"
+              "Profile"
+            when "any"
+              "Hub"
+            else
+              "Choose"

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

@@ -9,7 +9,7 @@ angular.module("admin.enterprises").controller 'indexPanelCtrl', ($scope, Enterp
     unless $scope.saved()
       $scope.saving = true
       Enterprises.save($scope.enterprise).then (data) ->
-        $scope.$emit("enterprise:updated")
+        $scope.$emit("enterprise:updated", $scope.enterprise)
         $scope.saving = false
       , (response) ->
         $scope.saving = false

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

@@ -5,25 +5,25 @@ angular.module("admin.enterprises")
     $scope.select = SideMenu.select
 
     $scope.menu.setItems [
-      { 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: "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: "Inventory Settings", icon_class: "icon-list-ol", show: "showInventorySettings()" }
-      { name: "Shop Preferences", icon_class: "icon-shopping-cart", show: "showShopPreferences()" }
+      { name: 'primary_details', label: t('primary_details'), icon_class: "icon-home" }
+      { name: 'address', label: t('address'), icon_class: "icon-map-marker" }
+      { name: 'contact', label: t('contact'), icon_class: "icon-phone" }
+      { name: 'social', label: t('social'), icon_class: "icon-twitter" }
+      { name: 'about', label: t('about'), icon_class: "icon-pencil" }
+      { name: 'business_details', label: t('business_details'), icon_class: "icon-briefcase" }
+      { name: 'images', label: t('images'), icon_class: "icon-picture" }
+      { name: 'properties', label: t('properties'), icon_class: "icon-tags", show: "showProperties()" }
+      { name: 'shipping_methods', label: t('shipping_methods'), icon_class: "icon-truck", show: "showShippingMethods()" }
+      { name: 'payment_methods', label: t('payment_methods'), icon_class: "icon-money", show: "showPaymentMethods()" }
+      { name: 'enterprise_fees', label: t('enterprise_fees'), icon_class: "icon-tasks", show: "showEnterpriseFees()" }
+      { name: 'inventory_settings', label: t('inventory_settings'), icon_class: "icon-list-ol", show: "enterpriseIsShop()" }
+      { name: 'tag_rules', label: t('tag_rules'), icon_class: "icon-random", show: "enterpriseIsShop()" }
+      { name: 'shop_preferences', label: t('shop_preferences'), icon_class: "icon-shopping-cart", show: "enterpriseIsShop()" }
+      { name: 'users', label: t('users'), icon_class: "icon-user" }
     ]
 
     $scope.select(0)
 
-
     $scope.showItem = (item) ->
       if item.show?
         $parse(item.show)($scope)
@@ -42,8 +42,5 @@ angular.module("admin.enterprises")
     $scope.showEnterpriseFees = ->
       enterprisePermissions.can_manage_enterprise_fees && ($scope.Enterprise.sells != "none" || $scope.Enterprise.is_primary_producer)
 
-    $scope.showInventorySettings = ->
-      $scope.Enterprise.sells != "none"
-
-    $scope.showShopPreferences = ->
+    $scope.enterpriseIsShop = ->
       $scope.Enterprise.sells != "none"

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

@@ -0,0 +1,16 @@
+angular.module('admin.enterprises').directive 'enterpriseSwitcher', (NavigationCheck) ->
+  restrict: 'A'
+  require: 'ngModel'
+  link: (scope, element, attr, ngModel) ->
+    initial = element[0].getAttribute('data-initial')
+
+    element.on 'change', ->
+      if not NavigationCheck.confirmLeave()
+        # Reset the current dropdown selection if staying on page
+        ngModel.$setViewValue initial
+        ngModel.$render()
+        element.select2 'val', initial
+        return
+
+      NavigationCheck.clear() # Don't ask twice if leaving
+      window.location = element[0].querySelector('option[selected]').getAttribute('data-url')

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

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

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

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

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

@@ -15,7 +15,7 @@ angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendi
           object: scope.object()
           type: scope.type
           attr: scope.attr
-          value: value
+          value: if value? then value else ""
           scope: scope
         scope.pending()
         pendingChanges.add(scope.object().id, scope.attr, change)
@@ -24,7 +24,7 @@ angular.module("admin.indexUtils").directive "objForUpdate", (switchClass, pendi
       scope.savedValue = value
 
     scope.success = ->
-      switchClass( element, "update-success", ["update-pending", "update-error"], 3000 )
+      switchClass( element, "update-success", ["update-pending", "update-error"], 5000 )
 
     scope.pending = ->
       switchClass( element, "update-pending", ["update-error", "update-success"], false )

app/assets/javascripts/admin/index_utils/directives/ofn-select2.js.coffee

@@ -1,26 +1,26 @@
-angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout) ->
+angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout, $filter) ->
   require: 'ngModel'
   restrict: 'C'
   scope:
     data: "="
-    minSearch: "@?"
-    text: "@?"
+    minSearch: "@"
+    text: "@"
     blank: "=?"
+    filter: "=?"
+    onSelecting: "=?"
+    multiple: '@'
   link: (scope, element, attrs, ngModel) ->
     $timeout ->
-      scope.text ||= 'name'
-      scope.data.unshift(scope.blank) if scope.blank? && typeof scope.blank is "object"
+      scope.text ?= 'name'
+      scope.multiple ?= false
+      scope.filter ?= -> true
 
-      item.name = $sanitize(item.name) for item in scope.data
-      element.select2
-        minimumResultsForSearch: scope.minSearch || 0
-        data: { results: scope.data, text: scope.text }
-        initSelection: (element, callback) ->
-          callback scope.data[0]
-        formatSelection: (item) ->
-          item[scope.text]
-        formatResult: (item) ->
-          item[scope.text]
+      if scope.data.$promise
+        scope.data.$promise.then -> init()
+      else
+        init()
+
+    element.on "select2-opening", scope.onSelecting || angular.noop
 
     attrs.$observe 'disabled', (value) ->
       element.select2('enable', !value)
@@ -28,3 +28,22 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout)
     ngModel.$formatters.push (value) ->
       element.select2('val', value)
       value
+
+    ngModel.$parsers.push (value) ->
+      return value.split(",") if scope.multiple
+      value
+
+    init = ->
+      scope.data.unshift(scope.blank) if scope.blank? && typeof scope.blank is "object"
+
+      item.name = $sanitize(item.name) for item in scope.data
+      element.select2
+        multiple: scope.multiple
+        minimumResultsForSearch: scope.minSearch || 0
+        data: ->
+          filtered = $filter('filter')(scope.data,scope.filter)
+          { results: filtered, text: scope.text }
+        formatSelection: (item) ->
+          item[scope.text]
+        formatResult: (item) ->
+          item[scope.text]

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

@@ -0,0 +1,21 @@
+angular.module("admin.indexUtils").directive "panelCtrl", (Panels) ->
+  restrict: "C"
+  scope:
+    object: "="
+    selected: "@?"
+  controller: ($scope, $element) ->
+    this.toggle = (name) ->
+      Panels.toggle($scope.object, name)
+
+    this.select = (selection) ->
+      $scope.$broadcast("selection:changed", selection)
+      $element.toggleClass("expanded", selection?)
+
+    this.registerSelectionListener = (callback) ->
+      $scope.$on "selection:changed", (event, selection) ->
+        callback(selection)
+
+    this
+
+  link: (scope, element, attrs, ctrl) ->
+    Panels.register(ctrl, scope.object, scope.selected)

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

@@ -1,37 +1,24 @@
 angular.module("admin.indexUtils").directive "panelRow", (Panels, Columns) ->
   restrict: "C"
+  require: "^^panelCtrl"
   templateUrl: "admin/panel.html"
   scope:
     object: "="
     panels: "="
-  link: (scope, element, attrs) ->
-    scope.template = ""
-    selected = null
-    scope.columnCount = Columns.visibleCount
+    colspan: "=?"
+    locals: '@?'
+  link: (scope, element, attrs, ctrl) ->
+    scope.template = null
+    scope.columnCount = (scope.colspan || Columns.visibleCount)
+
+    if scope.locals
+      scope[local] = scope.$parent.$eval(local.trim()) for local in scope.locals.split(',')
 
     scope.$on "columnCount:changed", (event, count) ->
       scope.columnCount = count
 
-    setTemplate = ->
-      if selected?
-        scope.template = 'admin/panels/' + scope.panels[selected] + '.html'
+    ctrl.registerSelectionListener (selection) ->
+      if selection?
+        scope.template = "admin/panels/#{scope.panels[selection]}.html"
       else
-        scope.template = ""
-
-    scope.getSelected = ->
-      selected
-
-    scope.setSelected = (name) ->
-      scope.$apply ->
-        selected = name
-        setTemplate()
-
-    scope.open = (name) ->
-      element.show 0, ->
-        scope.setSelected name
-
-    scope.close = ->
-      element.hide 0, ->
-        scope.setSelected null
-
-    Panels.register(scope.object.id, scope)
+        scope.template = null

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

@@ -2,11 +2,13 @@ angular.module("admin.indexUtils").directive "panelToggle", ->
   restrict: "C"
   transclude: true
   template: '<div ng-transclude></div><i class=\'icon-chevron\'></i>'
-  require: "^panelToggleRow"
+  require: "^^panelCtrl"
   scope:
     name: "@"
   link: (scope, element, attrs, ctrl) ->
-    scope.selected = ctrl.register(scope.name, element)
-
     element.on "click", ->
-      scope.selected = ctrl.select(scope.name)
+      scope.$apply ->
+        ctrl.toggle(scope.name)
+
+    ctrl.registerSelectionListener (selection) ->
+      element.toggleClass('selected', selection == scope.name)

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

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

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

@@ -0,0 +1,12 @@
+angular.module("admin.indexUtils").component 'showMore',
+  templateUrl: 'admin/show_more.html'
+  bindings:
+    data: "="
+    limit: "="
+    increment: "="
+
+# For now, this component is not being used.
+# Something about binding "data" to a variable on the parent scope that is continually refreshed by
+# being assigned within an ng-repeat means that we get $digest iteration errors. Seems to be solved
+# by using the new "as" syntax for ng-repeat to assign and alias the outcome of the filters, but this
+# has the limitation of not being able to be limited AFTER the assignment has been made, which we need

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

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

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

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

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

@@ -1,13 +1,21 @@
-angular.module("admin.indexUtils").factory 'Columns', ($rootScope) ->
+angular.module("admin.indexUtils").factory 'Columns', ($rootScope, $http, $injector) ->
   new class Columns
+    savedColumns: {}
     columns: {}
     visibleCount: 0
 
-    setColumns: (columns) =>
+    constructor: ->
       @columns = {}
-      @columns[name] = column for name, column of columns
+      for column in @injectColumns()
+        @columns[column.column_name] = column
+        @savedColumns[column.column_name] = angular.copy(column)
       @calculateVisibleCount()
-      @columns
+
+    injectColumns: ->
+      if $injector.has('columns')
+        $injector.get('columns')
+      else
+        []
 
     toggleColumn: (column) =>
       column.visible = !column.visible
@@ -16,3 +24,18 @@ angular.module("admin.indexUtils").factory 'Columns', ($rootScope) ->
     calculateVisibleCount: =>
       @visibleCount = (column for name, column of @columns when column.visible).length
       $rootScope.$broadcast "columnCount:changed", @visibleCount
+
+    preferencesSaved: =>
+      angular.equals(@columns, @savedColumns)
+
+    savePreferences: (action_name) =>
+      $http
+        method: "PUT"
+        url: "/admin/column_preferences/bulk_update"
+        data:
+          action_name: action_name
+          column_preferences: (preference for column_name, preference of @columns)
+      .success (data) =>
+        for column in data
+          angular.extend(@columns[column.column_name], column)
+          angular.extend(@savedColumns[column.column_name], column)

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

@@ -3,7 +3,8 @@ angular.module("admin.indexUtils").factory 'Dereferencer', ->
     dereference: (array, data)->
       if array
         for object, i in array
-          array[i] = data[object.id]
+          match = data[object.id]
+          array[i] = match if match?
 
     dereferenceAttr: (array, attr, data)->
       if array

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

@@ -1,19 +1,22 @@
 angular.module("admin.indexUtils").factory 'Panels', ->
   new class Panels
-    panels: {}
+    panels: []
 
-    register: (id, scope) ->
-      if id? && scope?
-        @panels[id] = scope
+    register: (ctrl, object, selected=null) ->
+      if ctrl? && object?
+        @panels.push { ctrl: ctrl, object: object, selected: selected }
+        ctrl.select(selected) if selected?
 
-    toggle: (id, name) ->
-      scope = @panels[id]
-      selected = scope.getSelected()
-      switch selected
-        when name
-          scope.close()
-        when null
-          scope.open(name)
-        else
-          scope.setSelected(name)
-      scope.getSelected()
+    toggle: (object, name, state=null) ->
+      panel = @findPanelByObject(object)
+      if panel.selected == name
+        @select(panel, null) unless state == "open"
+      else
+        @select(panel, name) unless state == "closed"
+
+    select: (panel, name) ->
+      panel.selected = name
+      panel.ctrl.select(name)
+
+    findPanelByObject: (object) ->
+      (panel for panel in @panels when panel.object == object)[0]

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

@@ -1,24 +1,36 @@
-angular.module("admin.indexUtils").factory "pendingChanges", (resources) ->
+angular.module("admin.indexUtils").factory "pendingChanges", ($q, resources, StatusMessage) ->
   new class pendingChanges
     pendingChanges: {}
+    errors: []
 
     add: (id, attr, change) =>
       @pendingChanges["#{id}"] = {} unless @pendingChanges.hasOwnProperty("#{id}")
       @pendingChanges["#{id}"]["#{attr}"] = change
+      StatusMessage.display('notice', "You have made #{@changeCount(@pendingChanges)} unsaved changes")
 
     removeAll: =>
       @pendingChanges = {}
+      StatusMessage.clear()
+
 
     remove: (id, attr) =>
       if @pendingChanges.hasOwnProperty("#{id}")
         delete @pendingChanges["#{id}"]["#{attr}"]
         delete @pendingChanges["#{id}"] if @changeCount( @pendingChanges["#{id}"] ) < 1
 
-    submitAll: =>
+    submitAll: (form=null) =>
       all = []
+      @errors = []
+      StatusMessage.display('progress', "Saving...")
       for id, objectChanges of @pendingChanges
         for attrName, change of objectChanges
           all.push @submit(change)
+      $q.all(all).then =>
+        if @errors.length == 0
+          StatusMessage.display('success', "All changes saved successfully")
+          form.$setPristine() if form?
+        else
+          StatusMessage.display('failure', "Oh no! I was unable to save your changes")
       all
 
     submit: (change) ->
@@ -26,8 +38,12 @@ angular.module("admin.indexUtils").factory "pendingChanges", (resources) ->
         @remove change.object.id, change.attr
         change.scope.reset( data["#{change.attr}"] )
         change.scope.success()
-      , (error) ->
+      , (error) =>
+        @errors.push error
         change.scope.error()
 
+    unsavedCount: ->
+      Object.keys(@pendingChanges).length
+
     changeCount: (objectChanges) ->
       Object.keys(objectChanges).length