Merge remote-tracking branch 'origin/master' into uk/trial-length

Conflicts:
	config/locales/en.yml

.codeclimate.yml

@@ -0,0 +1,16 @@
+engines:
+  rubocop:
+    enabled: true
+    exclude_fingerprints:
+    - ac41db8d4ec4cbf508c353d9b65a024f
+    - 8e3b6322aef5be9f38700b3fd0cd347e
+  scss-lint:
+    enabled: true
+ratings:
+  paths:
+  - app/**
+  - lib/**
+  - "**.rb"
+exclude_paths:
+- spec/**/*
+- vendor/**/*

.gitignore

@@ -34,7 +34,9 @@ config/abr.yml
 config/heroku_env.rb
 config/newrelic.yml
 config/initializers/feature_toggle.rb
+config/initializers/db2fog.rb
 NERD_tree*
 coverage
 libpeerconnection.log
 /config/application.yml
+node_modules

.rubocop.yml

@@ -0,0 +1,29 @@
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+  Exclude:
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'script/**/*'
+    - 'spec/**/*'
+    - !ruby/regexp /old_and_unused\.rb$/
+
+Documentation:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+  
+Metrics/LineLength:
+  Enabled: false
+  Max: 120
+
+MethodLength:
+  Enabled: false
+
+StringLiterals:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+2.1.5

.scss-lint.yml

@@ -0,0 +1,3 @@
+scss_files: 'app/assets/stylesheets/**/*.css.scss'
+
+exclude: 'app/assets/stylesheets/shared/**'

.travis.yml

@@ -1,15 +1,61 @@
 language: ruby
+sudo: false
+cache: bundler
 bundler_args: --without development
 rvm:
-  - "1.9.3"
-services: postgresql
-before_install:
+  - "2.1.5"
+
+# Set the timezone for phantomjs with TZ
+# Set the timezone for karma with TIMEZONE
+#
+# The test cases are roughly split according to their test times.
+# It would be better to use https://github.com/ArturT/knapsack.
+env:
+  global:
+    - TZ="Australia/Melbourne"
+    - TIMEZONE="Australia/Melbourne"
+    - CI_NODE_TOTAL=5
+  matrix:
+    - CI_NODE_INDEX=0
+    - CI_NODE_INDEX=1
+    - CI_NODE_INDEX=2
+    - CI_NODE_INDEX=3
+    - CI_NODE_INDEX=4 KARMA="true" GITHUB_DEPLOY="true"
+
 before_script:
   - cp config/database.travis.yml config/database.yml
-  - psql -c 'create database open_food_network_test;' -U postgres
   - 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 -g npm@'3.8.8'
+      npm install
+      npm install -g karma-cli@0.1.2
+    fi
+
 script:
-  - RAILS_ENV=test bundle exec rake db:migrate --trace
-  - bundle exec rake spec
+  - '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[--tag ~performance]'"
+
+after_success:
+  - >
+    if [ "$GITHUB_DEPLOY" = "true" -a "$TRAVIS_PULL_REQUEST" = "false" -a -n "$TRAVIS_BRANCH" -a -n "$GITHUB_API_SECRET" ]; then
+      description="`git show "$TRAVIS_BRANCH" -s --oneline --no-color`"
+      data="{
+        \"ref\":\"$TRAVIS_BRANCH\",
+        \"description\":\"$description\",
+        \"environment\":\"staging\",
+        \"required_contexts\":[]}"
+      curl -u "$GITHUB_API_SECRET" -d "$data" "https://api.github.com/repos/$TRAVIS_REPO_SLUG/deployments"
+    else
+      echo "Not deploying on this build."
+    fi
+
 notifications:
   email: false

.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[open-food-network.enyml]
+file_filter = config/locales/<lang>.yml
+source_lang = en
+type = YML
+

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing
+
+We love pull requests from everyone. Here are some instructions for
+contributing code to Open Food Network. See the [developer wiki](https://github.com/openfoodfoundation/openfoodnetwork/wiki) for more information.
+
+Fork, then clone the repo:
+
+    git clone git@github.com:your-username/openfoodnetwork.git
+
+Follow the instructions in README.markdown to set up your machine.
+
+Make sure the tests pass:
+
+    rspec spec
+
+Make your change. Add tests for your change. Make the tests pass:
+
+    rspec spec
+
+Push to your fork and [submit a pull request][pr].
+
+[pr]: https://github.com/openfoodfoundation/openfoodnetwork/compare/
+
+At this point you're waiting on us. We may suggest some changes or
+improvements or alternatives.
+
+To increase the chance that your pull request is swiftly accepted:
+
+* Write tests
+* Use a style consistent with the rest of the codebase
+* Before submitting, [rebase your work][rebase] on the current master branch
+
+[rebase]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough

Gemfile

@@ -1,18 +1,22 @@
 source 'https://rubygems.org'
-ruby "1.9.3"
+ruby "2.1.5"
 
 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', :branch => '1-3-stable'
-gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-stable'
+# Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
+gem 'nokogiri', '>= 1.6.7.1'
 
-# 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"
+gem 'pg'
+gem 'spree', github: 'openfoodfoundation/spree', branch: '1-3-stable'
+gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', 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'
@@ -24,7 +28,7 @@ gem 'comfortable_mexican_sofa'
 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'
@@ -52,6 +56,11 @@ 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'
@@ -91,7 +100,6 @@ group :test, :development do
   gem 'factory_girl_rails', :require => false
   gem 'capybara'
   gem 'database_cleaner', '0.7.1', :require => false
-  gem 'simplecov', :require => false
   gem 'awesome_print'
   gem 'letter_opener'
   gem 'timecop'
@@ -99,6 +107,8 @@ group :test, :development do
   gem 'rspec-retry'
   gem 'json_spec'
   gem 'unicorn-rails'
+  gem 'atomic'
+  gem 'knapsack'
 end
 
 group :test do
@@ -109,7 +119,7 @@ group :test do
 end
 
 group :development do
-  gem 'pry-debugger'
+  gem 'pry-byebug'
   gem 'debugger-linecache'
   gem 'guard'
   gem 'guard-livereload'

Gemfile.lock

@@ -14,8 +14,8 @@ 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)
@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: afcc23e489eb604a3e2651598a7c8364e2acc7b3
+  revision: 6e3edfe40a5de8eba0095b2c5f3db9ea54c3afda
   branch: 1-3-stable
   specs:
     spree (1.3.6.beta)
@@ -54,7 +54,7 @@ GIT
       rabl (= 0.7.2)
       rails (~> 3.2.16)
       ransack (= 0.7.2)
-      select2-rails (= 3.2.1)
+      select2-rails (= 3.5.9.3)
       state_machine (= 1.1.2)
       stringex (~> 1.3.2)
       truncate_html (~> 0.5.5)
@@ -107,6 +107,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.2)
     actionmailer (3.2.21)
       actionpack (= 3.2.21)
       mail (~> 2.5.4)
@@ -121,10 +122,10 @@ GEM
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
     active_link_to (1.0.0)
-    active_model_serializers (0.8.1)
+    active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activemerchant (1.48.0)
-      activesupport (>= 3.2.14, < 5.0.0)
+    activemerchant (1.57.0)
+      activesupport (>= 3.2.14, < 5.1)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
@@ -152,9 +153,10 @@ GEM
       sprockets (~> 2)
       tilt
     angularjs-file-upload-rails (1.1.0)
-    angularjs-rails (1.2.13)
+    angularjs-rails (1.5.5)
     ansi (1.4.2)
     arel (3.0.3)
+    atomic (1.1.99)
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
     awesome_print (1.0.2)
@@ -170,8 +172,12 @@ GEM
       httparty (>= 0.6, < 1.0)
       multi_json (~> 1.0)
     builder (3.0.4)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
     cancan (1.6.8)
-    capybara (2.2.1)
+    capybara (2.7.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -190,12 +196,12 @@ GEM
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.10.0)
     colorize (0.7.7)
-    columnize (0.3.6)
+    columnize (0.9.0)
     comfortable_mexican_sofa (1.6.24)
       active_link_to (~> 1.0.0)
       paperclip (>= 2.3.0)
@@ -229,12 +235,7 @@ GEM
       activerecord (~> 3.0)
       fog (~> 1.0)
       rails (~> 3.0)
-    debugger (1.6.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      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)
@@ -248,13 +249,14 @@ 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)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    excon (0.25.3)
-    execjs (2.5.2)
+    eventmachine (1.0.8)
+    excon (0.45.4)
+    execjs (2.6.0)
     factory_girl (3.3.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (3.3.0)
@@ -265,19 +267,117 @@ GEM
     figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
-    fog (1.14.0)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.36.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.32)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xenserver
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-aliyun (0.1.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.7.6)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.9.0)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.35.0)
       builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
+      excon (~> 0.45)
+      formatador (~> 0.2)
+    fog-dynect (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
+      fog-core (~> 1.0)
+      multi_json (~> 1.10)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.5)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.4.0)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.0.2)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xenserver (0.2.2)
+      fog-core
+      fog-xml
+    fog-xml (0.1.2)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
     foreigner (1.6.1)
       activerecord (>= 3.0.0)
-    formatador (0.2.4)
+    formatador (0.2.5)
     foundation-icons-sass-rails (3.0.0)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
@@ -319,6 +419,8 @@ GEM
     immigrant (0.1.6)
       activerecord (>= 3.0)
       foreigner (>= 1.2.1)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     journey (1.0.4)
     jquery-rails (2.2.2)
       railties (>= 3.0, < 5.0)
@@ -331,11 +433,14 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.9.3)
+    knapsack (1.5.1)
+      rake
+      timecop (>= 0.1.0)
     launchy (2.1.2)
       addressable (~> 2.3)
     letter_opener (1.0.0)
       launchy (>= 2.0.4)
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.11)
     listen (2.2.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -346,21 +451,21 @@ 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.0)
+    multi_json (1.12.0)
     multi_xml (0.5.5)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
     newrelic_rpm (3.12.0.288)
-    nokogiri (1.6.6.2)
-      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)
+      activerecord (>= 3.0, < 5.0)
+      activesupport (>= 3.0, < 5.0)
     paperclip (3.5.4)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -375,7 +480,7 @@ GEM
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.13.2)
-    poltergeist (1.5.0)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -387,13 +492,13 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
+    pry-byebug (1.3.2)
+      byebug (~> 2.7)
+      pry (~> 0.9.12)
     rabl (0.7.2)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
-    rack (1.4.5)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-livereload (0.3.15)
@@ -464,7 +569,6 @@ GEM
       rspec-mocks (~> 2.14.0)
     rspec-retry (0.4.2)
       rspec-core
-    ruby-hmac (0.4.0)
     ruby-progressbar (1.7.1)
     safe_yaml (0.9.5)
     sass (3.3.14)
@@ -472,14 +576,10 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.2.1)
+    select2-rails (3.5.9.3)
       thor (~> 0.14)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
     slop (3.4.5)
     spinjs-rails (1.3)
       rails (>= 3.1)
@@ -527,10 +627,15 @@ GEM
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.3.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)
     xml-simple (1.1.4)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -546,7 +651,8 @@ DEPENDENCIES
   andand
   angular-rails-templates (~> 0.2.0)
   angularjs-file-upload-rails (~> 1.1.0)
-  angularjs-rails (= 1.2.13)
+  angularjs-rails (= 1.5.5)
+  atomic
   awesome_print
   aws-sdk
   blockenspiel
@@ -564,6 +670,7 @@ DEPENDENCIES
   debugger-linecache
   deface!
   delayed_job_active_record
+  diffy
   factory_girl_rails
   figaro
   foreigner
@@ -583,15 +690,18 @@ DEPENDENCIES
   immigrant
   jquery-rails
   json_spec
+  knapsack
   letter_opener
   momentjs-rails
   newrelic_rpm
+  nokogiri (>= 1.6.7.1)
   oj
+  paper_trail (~> 3.0.8)
   paperclip
   parallel_tests
   pg
   poltergeist
-  pry-debugger
+  pry-byebug
   rabl
   rack-livereload
   rack-ssl
@@ -606,7 +716,6 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   shoulda-matchers
   simple_form!
-  simplecov
   spinjs-rails
   spree!
   spree_auth_devise!
@@ -622,3 +731,8 @@ DEPENDENCIES
   unicorn-rails
   webmock
   whenever
+  wicked_pdf
+  wkhtmltopdf-binary
+
+BUNDLED WITH
+   1.11.2

README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/openfoodfoundation/openfoodnetwork.svg?branch=master)](https://travis-ci.org/openfoodfoundation/openfoodnetwork)
 [![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
 
 # Open Food Network
@@ -14,19 +15,21 @@ We're part of global movement - get involved!
 
 ## Getting started
 
-Below are instructions for setting up a development environment for Open Food Network. If you're interested in provisioning a server, see [the project's Ansible playbooks](https://github.com/openfoodfoundation/ofn_deployment).
+Below are instructions for setting up a development environment for Open Food Network. More information is in the [developer wiki](https://github.com/openfoodfoundation/openfoodnetwork/wiki).
+
+If you're interested in provisioning a server, see [the project's Ansible playbooks](https://github.com/openfoodfoundation/ofn_deployment).
 
 
-## Dependencies
+### Dependencies
 
 * Rails 3.2.x
-* Ruby 1.9.3
+* Ruby 2.1.5
 * PostgreSQL database
 * PhantomJS (for testing)
 * See Gemfile for a list of gems required
 
 
-## Get it
+### Get it
 
 The source code is managed with Git (a version control system) and
 hosted at GitHub.
@@ -40,11 +43,11 @@ You can download the source with the command:
     git clone https://github.com/openfoodfoundation/openfoodnetwork.git
 
 
-## Get it running
+### Get it running
 
 For those new to Rails, the following tutorial will help get you up to speed with configuring a Rails environment: http://guides.rubyonrails.org/getting_started.html .
 
-First, check your dependencies: Ensure that you have Ruby >= 1.9.3 installed:
+First, check your dependencies: Ensure that you have Ruby 2.1.5 installed:
 
     ruby --version
 
@@ -58,6 +61,15 @@ Configure the site:
     cp config/application.yml.example config/application.yml
     edit config/application.yml
 
+Create a PostgreSQL user:
+
+* Login as your system postrgresql priviledged user: `sudo -i -u postgres` (this may vary on your OS). Now your prompt looks like: `[postgres@your_host ~]$`
+* Create the `ofn` database superuser and give it the password `f00d`:
+
+```
+createuser -s -P ofn
+```
+
 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
@@ -71,7 +83,7 @@ At long last, your dreams of spinning up a development server can be realised:
     rails server
 
 
-## Testing
+### Testing
 
 Tests, both unit and integration, are based on RSpec. To run the test suite, first prepare the test database:
 
@@ -97,6 +109,10 @@ usage instructions.
 * Will Marshall (http://soundcloud.com/willmarshall)
 * Laura Summers (https://github.com/summerscope)
 * Maikel Linke (https://github.com/mkllnk)
+* Lynne Davis (https://github.com/lin-d-hop)
+* Paul Mackay (https://github.com/pmackay)
+* Steve Petitt (https://github.com/stveep)
+
 
 ## Licence
 

Rakefile

@@ -5,3 +5,5 @@
 require File.expand_path('../config/application', __FILE__)
 
 Openfoodnetwork::Application.load_tasks
+
+Knapsack.load_tasks if defined?(Knapsack)

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

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

app/assets/javascripts/admin/accounts_and_billing_settings/directives/method_settings.js.coffee

@@ -0,0 +1,14 @@
+angular.module("admin.accounts_and_billing_settings").directive "methodSettingsFor", ->
+  template: "<div ng-include='include_html'></div>"
+  restrict: 'A'
+  scope: {
+    enterprise_id: '=methodSettingsFor'
+  }
+  link: (scope, element, attrs) ->
+    scope.include_html = ""
+
+    scope.$watch "enterprise_id", (newVal, oldVal)->
+      if !newVal? || newVal == ""
+        scope.include_html = ""
+      else
+        scope.include_html = "/admin/accounts_and_billing_settings/show_methods?enterprise_id=#{newVal};"

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

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

app/assets/javascripts/admin/all.js

@@ -21,21 +21,33 @@
 //= require ../shared/ng-tags-input.min.js
 //= require angular-rails-templates
 //= require_tree ../templates/admin
-//= require ./admin
+//= require ./admin_ofn
+//= require ./accounts_and_billing_settings/accounts_and_billing_settings
+//= require ./business_model_configuration/business_model_configuration
 //= require ./customers/customers
 //= require ./dropdown/dropdown
 //= require ./enterprises/enterprises
+//= require ./enterprise_fees/enterprise_fees
 //= require ./enterprise_groups/enterprise_groups
 //= require ./index_utils/index_utils
+//= require ./inventory_items/inventory_items
+//= require ./line_items/line_items
+//= require ./orders/orders
+//= require ./order_cycles/order_cycles
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= 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 textAngular.min.js
+//= require ./variant_overrides/variant_overrides
+//= 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,217 +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.pendingChanges = pendingChanges
-      $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
-        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.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.quantity * lineItem.units_variant.unit_value
-      , 0
-
-    $scope.sumMaxUnitValues = ->
-      sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-        sum = sum + Math.max(lineItem.max_quantity,lineItem.quantity) * lineItem.units_variant.unit_value
-      , 0
-
-    $scope.allUnitValuesPresent = ->
-      for i,lineItem of $scope.filteredLineItems
-        return false if !lineItem.units_variant.hasOwnProperty('unit_value') || !(lineItem.units_variant.unit_value > 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, oldValue) ->
-      if oldValue <= 0
-        oldValue = lineItem.units_variant.unit_value * line_item.quantity
-      if lineItem.final_weight_volume <= 0
-        lineItem.final_weight_volume = lineItem.units_variant.unit_value * lineItem.quantity
-      lineItem.price = lineItem.price * lineItem.final_weight_volume / oldValue
-      #$scope.bulk_order_form.line_item.price.$setViewValue($scope.bulk_order_form.line_item.price.$viewValue)
-
-    $scope.unitValueLessThanZero = (lineItem) ->
-      if lineItem.units_variant.unit_value <= 0
-        true
-      else
-        false
-
-    $scope.updateOnQuantity = (lineItem, oldQuantity) ->
-      if lineItem.quantity <= 0
-        lineItem.quantity = 1
-      # reset price to original unit value
-      lineItem.price = lineItem.price * (oldQuantity * lineItem.units_variant.unit_value) / lineItem.final_weight_volume
-      lineItem.final_weight_volume = lineItem.units_variant.unit_value * lineItem.quantity
-
-    $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,35 +1,24 @@
-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
@@ -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) ->
@@ -352,6 +344,9 @@ filterSubmitVariant = (variant) ->
   filteredVariant = {}
   if not variant.deleted_at? and variant.hasOwnProperty("id")
     filteredVariant.id = variant.id unless variant.id <= 0
+    if variant.hasOwnProperty("sku")
+      filteredVariant.sku = variant.sku
+      hasUpdatableProperty = true
     if variant.hasOwnProperty("on_hand")
       filteredVariant.on_hand = variant.on_hand
       hasUpdatableProperty = true

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

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

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

@@ -0,0 +1,25 @@
+angular.module("admin.businessModelConfiguration").controller "BusinessModelConfigCtrl", ($scope, $filter) ->
+  $scope.turnover = 1000
+
+  $scope.bill = ->
+    return $filter('currency')(0) unless $scope.fixed || $scope.rate
+    Number($scope.fixed) + Number($scope.turnover) * Number($scope.rate)
+
+  $scope.cappedBill = ->
+    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"
+
+  $scope.includedTax = ->
+    return 0 if !$scope.taxRate? || Number($scope.taxRate) == 0
+    ($scope.cappedBill() * Number($scope.taxRate))
+
+  $scope.total = ->
+    $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/controllers/enterprises_dashboard_controller.js.coffee

@@ -1,5 +1,2 @@
-angular.module("ofn.admin").controller "enterprisesDashboardCtrl", [
-  "$scope"
-  ($scope) ->
-    $scope.activeTab = "hubs"
-]
+angular.module("ofn.admin").controller "enterprisesDashboardCtrl", ($scope) ->
+  $scope.activeTab = "hubs"

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

@@ -1,67 +0,0 @@
-angular.module("ofn.admin").controller "AdminVariantOverridesCtrl", ($scope, $timeout, Indexer, SpreeApiAuth, PagedFetcher, StatusMessage, hubs, producers, hubPermissions, VariantOverrides, DirtyVariantOverrides) ->
-  $scope.hubs = hubs
-  $scope.hub = null
-  $scope.products = []
-  $scope.producers = Indexer.index producers
-  $scope.hubPermissions = hubPermissions
-  $scope.variantOverrides = VariantOverrides.variantOverrides
-  $scope.StatusMessage = StatusMessage
-
-  $scope.initialise = ->
-    SpreeApiAuth.authorise()
-    .then ->
-      $scope.spree_api_key_ok = true
-      $scope.fetchProducts()
-    .catch (message) ->
-      $scope.api_error_msg = message
-
-
-  $scope.fetchProducts = ->
-    url = "/api/products/overridable?page=::page::;per_page=100"
-    PagedFetcher.fetch url, (data) => $scope.addProducts data.products
-
-
-  $scope.addProducts = (products) ->
-    $scope.products = $scope.products.concat products
-    VariantOverrides.ensureDataFor hubs, products
-
-
-  $scope.selectHub = ->
-    $scope.hub = (hub for hub in hubs when hub.id == $scope.hub_id)[0]
-
-
-  $scope.displayDirty = ->
-    if DirtyVariantOverrides.count() > 0
-      num = if DirtyVariantOverrides.count() == 1 then "one override" else "#{DirtyVariantOverrides.count()} overrides"
-      StatusMessage.display 'notice', "Changes to #{num} remain unsaved."
-    else
-      StatusMessage.clear()
-
-
-  $scope.update = ->
-    if DirtyVariantOverrides.count() == 0
-      StatusMessage.display 'alert', 'No changes to save.'
-    else
-      StatusMessage.display 'progress', 'Saving...'
-      DirtyVariantOverrides.save()
-      .success (updatedVos) ->
-        DirtyVariantOverrides.clear()
-        VariantOverrides.updateIds updatedVos
-        $timeout -> StatusMessage.display 'success', 'Changes saved.'
-      .error (data, status) ->
-        $timeout -> StatusMessage.display 'failure', $scope.updateError(data, status)
-
-
-  $scope.updateError = (data, status) ->
-    if status == 401
-      "I couldn't get authorisation to save those changes, so they remain unsaved."
-
-    else if status == 400 && data.errors?
-      errors = []
-      for field, field_errors of data.errors
-        errors = errors.concat field_errors
-      errors = errors.join ', '
-      "I had some trouble saving: #{errors}"
-
-    else
-      "Oh no! I was unable to save your changes."

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

@@ -1,17 +1,45 @@
-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) ->
   $scope.shops = shops
+  $scope.RequestMonitor = RequestMonitor
   $scope.submitAll = pendingChanges.submitAll
+  $scope.add = Customers.add
+  $scope.deleteCustomer = Customers.remove
+  $scope.customerLimit = 20
+  $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.customers = data
 
-  $scope.loaded = ->
-    Customers.loaded
+  $scope.shop_id = shops[0].id if shops.length == 1
+
+  $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/new_customer_dialog.js.coffee

@@ -0,0 +1,38 @@
+angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $injector, $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 +1,17 @@
 angular.module("admin.customers").factory 'CustomerResource', ($resource) ->
-  $resource('/admin/customers.json', {}, {
+  $resource('/admin/customers/:id.json', {}, {
     'index':
       method: 'GET'
       isArray: true
       params:
         enterprise_id: '@enterprise_id'
+    'create':
+      method: 'POST'
+      params:
+        enterprise_id: '@enterprise_id'
+        email: '@email'
+    'destroy':
+      method: 'DELETE'
+      params:
+        id: '@id'
   })

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

@@ -1,16 +1,27 @@
-angular.module("admin.customers").factory 'Customers', (CustomerResource) ->
+angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestMonitor, CustomerResource, CurrentShop) ->
   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
+    add: (email) ->
+      params =
+        enterprise_id: CurrentShop.shop.id
+        email: email
+      CustomerResource.create params, (customer) =>
+        @customers.unshift customer if customer.id
 
-        @loaded = true
-        (callback || angular.noop)(@customers)
+    remove: (customer) ->
+      params = id: customer.id
+      CustomerResource.destroy params, =>
+        i = @customers.indexOf customer
+        @customers.splice i, 1 unless i < 0
+      , (response) =>
+        errors = response.data.errors
+        if errors?
+          InfoDialog.open 'error', errors[0]
+        else
+          InfoDialog.open 'error', "Could not delete customer: #{customer.email}"
 
-    	@customers
+    index: (params) ->
+      request = CustomerResource.index(params, (data) => @customers = data)
+      RequestMonitor.load(request.$promise)
+      request.$promise

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

@@ -1,7 +0,0 @@
-angular.module("ofn.admin").directive "ofnConfirmLinkPath", (ofnConfirmHandler) ->
-  restrict: "A"
-  scope:
-    path: "@ofnConfirmLinkPath"
-  link: (scope, element, attrs) ->
-    element.click ofnConfirmHandler scope, ->
-      window.location = scope.path

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

@@ -1,6 +0,0 @@
-angular.module("ofn.admin").directive "ofnConfirmModelChange", (ofnConfirmHandler,$timeout) ->
-  restrict: "A"
-  link: (scope, element, attrs) ->
-    handler = ofnConfirmHandler scope, -> scope.fetchOrders()
-    scope.$watch attrs.ngModel, (oldValue,newValue) ->
-      handler() unless oldValue == undefined || newValue == oldValue

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

@@ -1,9 +0,0 @@
-angular.module("ofn.admin").directive "ofnTrackVariantOverride", (DirtyVariantOverrides) ->
-  require: "ngModel"
-  link: (scope, element, attrs, ngModel) ->
-    ngModel.$parsers.push (viewValue) ->
-      if ngModel.$dirty
-        variantOverride = scope.variantOverrides[scope.hub.id][scope.variant.id]
-        DirtyVariantOverrides.add variantOverride
-        scope.displayDirty()
-      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/controllers/dropdown_controller.js.coffee

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

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

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

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

@@ -1,8 +1,12 @@
  angular.module("admin.dropdown").directive "ofnDropDown", ($document) ->
+  restrict: 'C'
+  scope: true
   link: (scope, element, attrs) ->
+    scope.expanded = false
+
     outsideClickListener = (event) ->
-      unless $(event.target).is("div.ofn_drop_down##{attrs.id} div.menu") ||
-        $(event.target).parents("div.ofn_drop_down##{attrs.id} div.menu").length > 0
+      unless $(event.target).is("div.ofn-drop-down##{attrs.id} div.menu") ||
+        $(event.target).parents("div.ofn-drop-down##{attrs.id} div.menu").length > 0
           scope.$emit "offClick"
 
     element.click (event) ->

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

@@ -0,0 +1,5 @@
+ angular.module("admin.dropdown").directive "linksDropdown", ($window)->
+  restrict: "C"
+  scope:
+    links: "="
+  templateUrl: "admin/links_dropdown.html"

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

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

app/assets/javascripts/admin/enterprise_fees.js

@@ -1,69 +0,0 @@
-angular.module('enterprise_fees', [])
-  .controller('AdminEnterpriseFeesCtrl', ['$scope', '$http', '$window', function($scope, $http, $window) {
-    $scope.enterpriseFeesUrl = function() {
-      var url = '/admin/enterprise_fees.json?include_calculators=1';
-
-      var match = $window.location.search.match(/enterprise_id=(\d+)/);
-      if(match) {
-	url += "&"+match[0];
-      }
-
-      return url;
-    };
-
-    $http.get($scope.enterpriseFeesUrl()).success(function(data) {
-      $scope.enterprise_fees = data;
-
-      // TODO: Angular 1.1.0 will have a means to reset a form to its pristine state, which
-      //       would avoid the need to save off original calculator types for comparison.
-      for(i in $scope.enterprise_fees) {
-	$scope.enterprise_fees[i].orig_calculator_type = $scope.enterprise_fees[i].calculator_type;
-      }
-    });
-  }])
-
-  .directive('ngBindHtmlUnsafeCompiled', ['$compile', function($compile) {
-    return function(scope, element, attrs) {
-      scope.$watch(attrs.ngBindHtmlUnsafeCompiled, function(value) {
-	element.html($compile(value)(scope));
-      });
-    }
-  }])
-
-  .directive('spreeDeleteResource', function() {
-    return function(scope, element, attrs) {
-      if(scope.enterprise_fee.id) {
-	var url = "/admin/enterprise_fees/" + scope.enterprise_fee.id
-	var html = '<a href="'+url+'" class="delete-resource icon_link with-tip icon-trash no-text" data-action="remove" data-confirm="Are you sure?" url="'+url+'"></a>';
-	//var html = '<a href="'+url+'" class="delete-resource" data-confirm="Are you sure?"><img alt="Delete" src="/assets/admin/icons/delete.png" /> Delete</a>';
-	element.append(html);
-      }
-    }
-  })
-
-  .directive('spreeEnsureCalculatorPreferencesMatchType', function() {
-    // Hide calculator preference fields when calculator type changed
-    // Fixes 'Enterprise fee is not found' error when changing calculator type
-    // See spree/core/app/assets/javascripts/admin/calculator.js
-
-    // Note: For some reason, DOM --> model bindings aren't working here, so
-    // we use element.val() instead of querying the model itself.
-
-    return function(scope, element, attrs) {
-      scope.$watch(function(scope) {
-	//return scope.enterprise_fee.calculator_type;
-	return element.val();
-      }, function(value) {
-	var settings = element.parent().parent().find("div.calculator-settings");
-
-	// scope.enterprise_fee.calculator_type == scope.enterprise_fee.orig_calculator_type
-	if(element.val() == scope.enterprise_fee.orig_calculator_type) {
-	  settings.show();
-	  settings.find("input").prop("disabled", false);
-	} else {
-	  settings.hide();
-	  settings.find("input").prop("disabled", true);
-	}
-      });
-    }
-  });

app/assets/javascripts/admin/enterprise_fees/controllers/enterprise_fees_controller.js.coffee

@@ -0,0 +1,14 @@
+angular.module('admin.enterpriseFees').controller 'enterpriseFeesCtrl', ($scope, $http, $window, enterprises, tax_categories, calculators) ->
+  $scope.enterprises = enterprises
+  $scope.tax_categories =  [{id: -1, name: "Inherit From Product"}].concat tax_categories
+  $scope.calculators = calculators
+
+  $scope.enterpriseFeesUrl = ->
+    url = '/admin/enterprise_fees.json?include_calculators=1'
+    match = $window.location.search.match(/enterprise_id=(\d+)/)
+    if match
+      url += '&' + match[0]
+    url
+
+  $http.get($scope.enterpriseFeesUrl()).success (data) ->
+    $scope.enterprise_fees = data

app/assets/javascripts/admin/enterprise_fees/directives/bind_html_unsafe_compiled.js.coffee

@@ -0,0 +1,6 @@
+angular.module("admin.enterpriseFees").directive 'ngBindHtmlUnsafeCompiled', ($compile) ->
+  (scope, element, attrs) ->
+    scope.$watch attrs.ngBindHtmlUnsafeCompiled, (value) ->
+      element.html $compile(value)(scope)
+      return
+    return

app/assets/javascripts/admin/enterprise_fees/directives/delete_resource.js.coffee

@@ -0,0 +1,8 @@
+angular.module('admin.enterpriseFees').directive 'spreeDeleteResource', ->
+  (scope, element, attrs) ->
+    if scope.enterprise_fee.id
+      url = '/admin/enterprise_fees/' + scope.enterprise_fee.id
+      html = '<a href="' + url + '" class="delete-resource icon_link icon-trash no-text" data-action="remove" data-confirm="Are you sure?" url="' + url + '"></a>'
+      #var html = '<a href="'+url+'" class="delete-resource" data-confirm="Are you sure?"><img alt="Delete" src="/assets/admin/icons/delete.png" /> Delete</a>';
+      element.append html
+    return