Removing unrequired Spree::Order#with_payment_method_name scope

Also switched to using id rather than name to filter

.codeclimate.yml

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

.gitignore

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

.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,58 @@
 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
+  - >
+    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
+    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'
@@ -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)
@@ -155,6 +156,7 @@ GEM
     angularjs-rails (1.2.13)
     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,11 @@ 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.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -190,12 +195,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 +234,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 +248,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 +266,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 +418,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 +432,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 +450,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.11.2)
     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 +479,7 @@ GEM
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.13.2)
-    poltergeist (1.5.0)
+    poltergeist (1.7.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -387,13 +491,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 +568,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 +575,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 +626,15 @@ GEM
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.3.2)
+    websocket-driver (0.6.2)
+      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)
@@ -547,6 +651,7 @@ DEPENDENCIES
   angular-rails-templates (~> 0.2.0)
   angularjs-file-upload-rails (~> 1.1.0)
   angularjs-rails (= 1.2.13)
+  atomic
   awesome_print
   aws-sdk
   blockenspiel
@@ -564,6 +669,7 @@ DEPENDENCIES
   debugger-linecache
   deface!
   delayed_job_active_record
+  diffy
   factory_girl_rails
   figaro
   foreigner
@@ -583,15 +689,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 +715,6 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   shoulda-matchers
   simple_form!
-  simplecov
   spinjs-rails
   spree!
   spree_auth_devise!
@@ -622,3 +730,8 @@ DEPENDENCIES
   unicorn-rails
   webmock
   whenever
+  wicked_pdf
+  wkhtmltopdf-binary
+
+BUNDLED WITH
+   1.10.6

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/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 ./variant_overrides/variant_overrides
 //= require textAngular.min.js
 //= require textAngular-sanitize.min.js
 //= require ../shared/bindonce.min.js
+//= require darkswarm/i18n.js
+//= require darkswarm/i18n.translate.js
+
 
 //= require_tree .

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

@@ -11,27 +11,26 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       $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.bulkActions = [ { name: t("bom_actions_delete"), 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 }
+        order_no:     { name: t("bom_no"), visible: false }
+        full_name:    { name: t("name"),         visible: true }
+        email:        { name: t("email"),     visible: false }
+        phone:        { name: t("phone"),        visible: false }
+        order_date:   { name: t("bom_date"),   visible: true }
+        producer:     { name: t("producer"),     visible: true }
+        order_cycle:  { name: t("bom_cycle"),  visible: false }
+        hub:          { name: t("bom_hub"),          visible: false }
+        variant:      { name: t("bom_variant"),      visible: true }
+        quantity:     { name: t("bom_quantity"),     visible: true }
+        max:          { name: t("bom_max"),          visible: true }
+        final_weight_volume:   { name: t("bom_final_weigth_volume"), visible: false }
+        price:        { name: t("price"),            visible: false }
     $scope.initialise = ->
       $scope.initialiseVariables()
       authorise_api_reponse = ""
@@ -77,6 +76,10 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
           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
       , []
 
@@ -107,6 +110,12 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       $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 )
@@ -123,17 +132,17 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
 
     $scope.sumUnitValues = ->
       sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-        sum = sum + lineItem.quantity * lineItem.units_variant.unit_value
+        sum = sum + lineItem.final_weight_volume
       , 0
 
     $scope.sumMaxUnitValues = ->
       sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
-        sum = sum + Math.max(lineItem.max_quantity,lineItem.quantity) * lineItem.units_variant.unit_value
+        sum = sum + Math.max(lineItem.max_quantity,lineItem.original_quantity) * lineItem.units_variant.unit_value
       , 0
 
-    $scope.allUnitValuesPresent = ->
+    $scope.allFinalWeightVolumesPresent = ->
       for i,lineItem of $scope.filteredLineItems
-        return false if !lineItem.units_variant.hasOwnProperty('unit_value') || !(lineItem.units_variant.unit_value > 0)
+        return false if !lineItem.hasOwnProperty('final_weight_volume') || !(lineItem.final_weight_volume > 0)
       true
 
     # How is this different to OptionValueNamer#name?
@@ -164,13 +173,11 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       $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.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
@@ -178,12 +185,10 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
       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.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)

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

@@ -4,32 +4,32 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $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}
+      producer:             {name: t("products_producer"),              visible: true}
+      sku:                  {name: t("products_sku"),                   visible: false}
+      name:                 {name: t("products_name"),                  visible: true}
+      unit:                 {name: t("products_unit"),                  visible: true}
+      price:                {name: t("products_price"),                 visible: true}
+      on_hand:              {name: t("products_on_hand"),               visible: true}
+      on_demand:            {name: t("products_on_demand"),             visible: false}
+      category:             {name: t("products_category"),              visible: false}
+      tax_category:         {name: t("products_tax_category"),          visible: false}
+      inherits_properties:  {name: t("products_inherits_properties"),   visible: false}
+      available_on:         {name: t("products_available_on"),          visible: false}
 
     $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 +105,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 +150,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 +194,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,10 +212,10 @@ 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.packProduct = (product) ->
@@ -253,23 +253,23 @@ 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.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 +352,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,21 @@
+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.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.cappedBill() + $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/customers.js.coffee

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

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/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/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/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

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

@@ -0,0 +1,17 @@
+angular.module("admin.enterpriseFees").directive 'spreeEnsureCalculatorPreferencesMatchType', ->
+  # 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
+  (scope, element, attrs) ->
+    orig_calculator_type = scope.enterprise_fee.calculator_type
+
+    scope.$watch "enterprise_fee.calculator_type", (value) ->
+      settings = element.parent().parent().find('div.calculator-settings')
+      if value == orig_calculator_type
+        settings.show()
+        settings.find('input').prop 'disabled', false
+      else
+        settings.hide()
+        settings.find('input').prop 'disabled', true
+      return
+    return

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

@@ -0,0 +1,15 @@
+angular.module("admin.enterpriseFees").directive 'watchTaxCategory', ->
+  # In order to have a nice user experience on this page, we're modelling tax_category
+  # inheritance using tax_category_id = -1.
+  # This directive acts as a parser for tax_category_id, storing the value the form as "" when
+  # tax_category is to be inherited and setting inherits_tax_category as appropriate.
+  (scope, element, attrs) ->
+    scope.$watch 'enterprise_fee.tax_category_id', (value) ->
+      if value == -1
+        scope.enterprise_fee.inherits_tax_category = true
+        element.val("")
+      else
+        scope.enterprise_fee.inherits_tax_category = false
+        element.val(value)
+
+    scope.enterprise_fee.tax_category_id = -1 if scope.enterprise_fee.inherits_tax_category

app/assets/javascripts/admin/enterprise_fees/enterprise_fees.js

@@ -0,0 +1 @@
+angular.module("admin.enterpriseFees", ['admin.indexUtils'])

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

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

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

@@ -6,7 +6,7 @@ angular.module("admin.enterprises")
     $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')) }
 
     # 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,
@@ -31,4 +31,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/enterprises_controller.js.coffee

@@ -1,9 +1,9 @@
-angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, Enterprises, Columns) ->
-    Enterprises.loaded = false
-    $scope.allEnterprises = Enterprises.index()
+angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, $q, Enterprises, Columns) ->
+    requests = []
+    requests.push ($scope.allEnterprises = Enterprises.index(ams_prefix: "index")).$promise
 
-    $scope.loaded = ->
-      Enterprises.loaded
+    $q.all(requests).then ->
+      $scope.loaded = true
 
     $scope.columns = Columns.setColumns
       name:     { name: "Name",     visible: true }

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

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

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

@@ -0,0 +1,8 @@
+angular.module("admin.enterprises").directive "monthlyPricingDescription", (monthlyBillDescription) ->
+  restrict: 'E'
+  scope:
+    joiner: "@"
+  template: "<span ng-bind-html='billDescription'></span>"
+  link: (scope, element, attrs) ->
+    joiners = { comma: ", ", newline: "<br>" }
+    scope.billDescription = monthlyBillDescription.replace("{joiner}", joiners[scope.joiner])

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,5 +1,5 @@
 angular.module("admin.enterprises").factory 'EnterpriseResource', ($resource) ->
-  $resource('/admin/enterprises/:id.json', {}, {
+  $resource('/admin/enterprises/:id/:action.json', {}, {
     'index':
       method: 'GET'
       isArray: true

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

@@ -1,26 +1,27 @@
-angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource) ->
+angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource, blankOption) ->
   new class Enterprises
-    enterprises: []
-    enterprises_by_id: {}
-    pristine_by_id: {}
-    loaded: false
+    enterprisesByID: {}
+    pristineByID: {}
 
     index: (params={}, callback=null) ->
-    	EnterpriseResource.index params, (data) =>
+      includeBlank = !!params['includeBlank']
+      delete params['includeBlank']
+      EnterpriseResource.index(params, (data) =>
         for enterprise in data
-          @enterprises.push enterprise
-          @pristine_by_id[enterprise.id] = angular.copy(enterprise)
+          @enterprisesByID[enterprise.id] = enterprise
+          @pristineByID[enterprise.id] = angular.copy(enterprise)
 
-        @loaded = true
-        (callback || angular.noop)(@enterprises)
+        (callback || angular.noop)(data)
 
-    	@enterprises
+        data.unshift(blankOption()) if includeBlank
+        data
+      )
 
     save: (enterprise) ->
       deferred = $q.defer()
       enterprise.$update({id: enterprise.permalink})
       .then( (data) =>
-        @pristine_by_id[enterprise.id] = angular.copy(enterprise)
+        @pristineByID[enterprise.id] = angular.copy(enterprise)
         deferred.resolve(data)
       ).catch (response) ->
         deferred.reject(response)
@@ -31,9 +32,9 @@ angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResour
 
     diff: (enterprise) ->
       changed = []
-      for attr, value of enterprise when not angular.equals(value, @pristine_by_id[enterprise.id][attr])
+      for attr, value of enterprise when not angular.equals(value, @pristineByID[enterprise.id][attr])
         changed.push attr unless attr is "$$hashKey"
       changed
 
     resetAttribute: (enterprise, attribute) ->
-      enterprise[attribute] = @pristine_by_id[enterprise.id][attribute]
+      enterprise[attribute] = @pristineByID[enterprise.id][attribute]

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

@@ -1,7 +0,0 @@
-angular.module("ofn.admin").filter "selectFilter", (blankOption) ->
-    return (lineItems,selectedSupplier,selectedDistributor,selectedOrderCycle) ->
-      filtered = []
-      filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,"0") || lineItem.supplier.id == selectedSupplier) &&
-        (angular.equals(selectedDistributor,"0") || lineItem.order.distributor.id == selectedDistributor) &&
-        (angular.equals(selectedOrderCycle,"0") || lineItem.order.order_cycle.id == selectedOrderCycle)
-      filtered

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

@@ -0,0 +1,7 @@
+angular.module('ofn.admin').filter "translate", ->
+  (key, options) ->
+    t(key, options)
+
+angular.module('ofn.admin').filter "t", ->
+  (key, options) ->
+    t(key, options)

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

@@ -0,0 +1,9 @@
+angular.module("admin.indexUtils").directive "datepicker", ->
+  require: "ngModel"
+  link: (scope, element, attrs, ngModel) ->
+    element.datepicker
+      dateFormat: "yy-mm-dd"
+      onSelect: (dateText, inst) ->
+        scope.$apply (scope) ->
+          # Fires ngModel.$parsers
+          ngModel.$setViewValue dateText

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

@@ -0,0 +1,6 @@
+angular.module("admin.indexUtils").directive "ignoreDirty", ->
+  restrict: 'A'
+  require: 'ngModel'
+  link: (scope, element, attrs, ngModel) ->
+    #TODO: This is broken, requires AngularJS > 1.3
+    ngModel.$setDirty = angular.noop

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

@@ -0,0 +1,13 @@
+# Mainly useful for adding a blank option that works with AngularJS
+# Angular doesn't seem to understand the blank option generated by rails
+# using the include_blank flag on select helper.
+angular.module("admin.indexUtils").directive "ofnSelect", ->
+  restrict: 'E'
+  scope:
+    data: "="
+  replace: true
+  template: (element, attrs) ->
+    valueAttr = attrs.valueAttr || 'id'
+    textAttr = attrs.textAttr || 'name'
+    blank = if attrs.includeBlank? then "<option value=''>#{attrs.includeBlank}</option>" else ""
+    return "<select ng-options='e.#{valueAttr} as e.#{textAttr} for e in data'>#{blank}</select>"

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

@@ -0,0 +1,28 @@
+angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout) ->
+  require: 'ngModel'
+  restrict: 'C'
+  scope:
+    data: "="
+    minSearch: "@?"
+    text: "@?"
+    blank: "=?"
+  link: (scope, element, attrs, ngModel) ->
+    $timeout ->
+      scope.text ||= 'name'
+      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
+        minimumResultsForSearch: scope.minSearch || 0
+        data: { results: scope.data, text: scope.text }
+        formatSelection: (item) ->
+          item[scope.text]
+        formatResult: (item) ->
+          item[scope.text]
+
+    attrs.$observe 'disabled', (value) ->
+      element.select2('enable', !value)
+
+    ngModel.$formatters.push (value) ->
+      element.select2('val', value)
+      value

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

@@ -0,0 +1,9 @@
+angular.module("admin.indexUtils").directive "select2MinSearch", ($timeout) ->
+  require: 'ngModel'
+  link: (scope, element, attrs, ngModel) ->
+    element.select2
+      minimumResultsForSearch: attrs.select2MinSearch
+
+    ngModel.$formatters.push (value) ->
+      element.select2('val', value)
+      value

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

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

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

@@ -0,0 +1,11 @@
+angular.module("admin.indexUtils").directive "toggleView", (Views) ->
+  link: (scope, element, attrs) ->
+    Views.register
+    element.addClass "selected" if scope.view.visible
+
+    element.click "click", ->
+      scope.$apply ->
+        Views.selectView(scope.viewKey)
+
+    scope.$watch "view.visible", (newValue, oldValue) ->
+      element.toggleClass "selected", scope.view.visible

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

@@ -0,0 +1,12 @@
+# Used like a regular angular filter where an object is passed
+# Adds the additional special case that a value of 0 for the filter
+# acts as a bypass for that particular attribute
+angular.module("admin.indexUtils").filter "attrFilter", ($filter) ->
+  return (objects, filters) ->
+    Object.keys(filters).reduce (filtered, attr) ->
+      filter = filters[attr]
+      return filtered if !filter? || filter == 0
+      return $filter('filter')(filtered, (object) ->
+        object[attr] == filter
+      )
+    , objects

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

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

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

@@ -0,0 +1,9 @@
+angular.module("admin.indexUtils").factory "dataFetcher", ($http, $q, RequestMonitor) ->
+  return (dataLocation) ->
+    deferred = $q.defer()
+    RequestMonitor.load $http.get(dataLocation).success((data) ->
+      deferred.resolve data
+    ).error ->
+      deferred.reject()
+
+    deferred.promise

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

@@ -0,0 +1,11 @@
+angular.module("admin.indexUtils").factory 'Dereferencer', ->
+  new class Dereferencer
+    dereference: (array, data)->
+      if array
+        for object, i in array
+          array[i] = data[object.id]
+
+    dereferenceAttr: (array, attr, data)->
+      if array
+        for object in array
+          object[attr] = data[object[attr].id] unless object[attr] == null

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

@@ -4,7 +4,7 @@
 # Indexer.index producers
 # -> {1: {id: 1, name: 'one'}, 2: {id: 2, name: 'two'}}
 
-angular.module("ofn.admin").factory 'Indexer', ->
+angular.module("admin.indexUtils").factory 'Indexer', ->
   new class Indexer
     index: (data, key='id') ->
       index = {}

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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "PagedFetcher", (dataFetcher) ->
+angular.module("admin.indexUtils").factory "PagedFetcher", (dataFetcher) ->
   new class PagedFetcher
     # Given a URL like http://example.com/foo?page=::page::&per_page=20
     # And the response includes an attribute pages with the number of pages to fetch
@@ -13,4 +13,4 @@ angular.module("ofn.admin").factory "PagedFetcher", (dataFetcher) ->
               processData data
 
     urlForPage: (url, page) ->
-      url.replace("::page::", page)
+      url.replace("::page::", page)

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

@@ -0,0 +1,11 @@
+angular.module("admin.indexUtils").factory 'RequestMonitor', ($q) ->
+  new class RequestMonitor
+    loadQueue: $q.when([])
+    loadId: 0
+    loading: false
+
+    load: (promise) ->
+      loadId = (@loadId += 1)
+      @loading = true
+      @loadQueue = $q.all([@loadQueue, promise]).then =>
+        @loading = false if @loadId == loadId

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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "SpreeApiAuth", ($q, $http, SpreeApiKey) ->
+angular.module("admin.indexUtils").factory "SpreeApiAuth", ($q, $http, SpreeApiKey) ->
   new class SpreeApiAuth
     authorise: ->
       deferred = $q.defer()

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

@@ -0,0 +1,16 @@
+angular.module("admin.indexUtils").factory 'Views', ($rootScope) ->
+  new class Views
+    views: {}
+    currentView: null
+
+    setViews: (views) =>
+      @views = {}
+      for key, view of views
+        @views[key] = view
+        @selectView(key) if view.visible
+      @views
+
+    selectView: (selectedKey) =>
+      @currentView = @views[selectedKey]
+      for key, view of @views
+        view.visible = (key == selectedKey)

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

@@ -0,0 +1 @@
+angular.module("admin.inventoryItems", ['ngResource'])

app/assets/javascripts/admin/inventory_items/services/inventory_item_resource.js.coffee

@@ -0,0 +1,5 @@
+angular.module("admin.inventoryItems").factory 'InventoryItemResource', ($resource) ->
+  $resource('/admin/inventory_items/:id/:action.json', {}, {
+    'update':
+      method: 'PUT'
+  })

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

@@ -0,0 +1,25 @@
+angular.module("admin.inventoryItems").factory "InventoryItems", (inventoryItems, InventoryItemResource) ->
+  new class InventoryItems
+    inventoryItems: {}
+    errors: {}
+
+    constructor: ->
+      for ii in inventoryItems
+        @inventoryItems[ii.enterprise_id] ||= {}
+        @inventoryItems[ii.enterprise_id][ii.variant_id] = new InventoryItemResource(ii)
+
+    setVisibility: (hub_id, variant_id, visible) ->
+      if @inventoryItems[hub_id] && @inventoryItems[hub_id][variant_id]
+        inventory_item = angular.extend(angular.copy(@inventoryItems[hub_id][variant_id]), {visible: visible})
+        InventoryItemResource.update {id: inventory_item.id}, inventory_item, (data) =>
+          @inventoryItems[hub_id][variant_id] = data
+        , (response) =>
+          @errors[hub_id] ||= {}
+          @errors[hub_id][variant_id] = response.data.errors
+      else
+        InventoryItemResource.save {enterprise_id: hub_id, variant_id: variant_id, visible: visible}, (data) =>
+          @inventoryItems[hub_id] ||= {}
+          @inventoryItems[hub_id][variant_id] = data
+        , (response) =>
+          @errors[hub_id] ||= {}
+          @errors[hub_id][variant_id] = response.data.errors

app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee

@@ -0,0 +1,185 @@
+angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, blankOption, VariantUnitManager, RequestMonitor) ->
+  $scope.initialized = false
+  $scope.RequestMonitor = RequestMonitor
+  $scope.filteredLineItems = []
+  $scope.confirmDelete = true
+  $scope.startDate = formatDate daysFromToday -7
+  $scope.endDate = formatDate daysFromToday 1
+  $scope.bulkActions = [ { name: t("bom_actions_delete"), callback: 'deleteLineItems' } ]
+  $scope.selectedUnitsProduct = {}
+  $scope.selectedUnitsVariant = {}
+  $scope.sharedResource = false
+  $scope.columns = Columns.setColumns
+    order_no:     { name: t("bom_no"), visible: false }
+    full_name:    { name: t("name"),         visible: true }
+    email:        { name: t("email"),     visible: false }
+    phone:        { name: t("phone"),        visible: false }
+    order_date:   { name: t("bom_date"),   visible: true }
+    producer:     { name: t("producer"),     visible: true }
+    order_cycle:  { name: t("bom_cycle"),  visible: false }
+    hub:          { name: t("bom_hub"),          visible: false }
+    variant:      { name: t("bom_variant"),      visible: true }
+    quantity:     { name: t("bom_quantity"),     visible: true }
+    max:          { name: t("bom_max"),          visible: true }
+    final_weight_volume:   { name: t("bom_final_weigth_volume"), visible: false }
+    price:        { name: t("price"),            visible: false }
+
+  $scope.confirmRefresh = ->
+    LineItems.allSaved() || confirm(t "unsaved_changes_warning")
+
+  $scope.resetSelectFilters = ->
+    $scope.distributorFilter = blankOption().id
+    $scope.supplierFilter = blankOption().id
+    $scope.orderCycleFilter = blankOption().id
+    $scope.quickSearch = ""
+
+  $scope.refreshData = ->
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == "0"
+      $scope.startDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].first_order
+      $scope.endDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].last_order
+
+    RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gt]": "#{parseDate($scope.startDate)}", "q[completed_at_lt]": "#{parseDate($scope.endDate)}")
+    RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gt]": "#{parseDate($scope.startDate)}", "q[order][completed_at_lt]": "#{parseDate($scope.endDate)}")
+
+    unless $scope.initialized
+      RequestMonitor.load $scope.distributors = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+      RequestMonitor.load $scope.orderCycles = OrderCycles.index(includeBlank: true, ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{daysFromToday(-90)}")
+      RequestMonitor.load $scope.suppliers = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise]).then ->
+      Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.enterprisesByID
+      Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.orderCyclesByID
+
+    RequestMonitor.load $q.all([$scope.orders.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
+      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.enterprisesByID
+      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.ordersByID
+      $scope.bulk_order_form.$setPristine()
+      StatusMessage.clear()
+      unless $scope.initialized
+        $scope.initialized = true
+        $timeout ->
+          $scope.resetSelectFilters()
+
+  $scope.refreshData()
+
+  $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
+    if newVal == true
+      StatusMessage.display 'notice', "You have unsaved changes"
+
+  $scope.submit = ->
+    if $scope.bulk_order_form.$valid
+      StatusMessage.display 'progress', "Saving..."
+      $q.all(LineItems.saveAll()).then(->
+        StatusMessage.display 'success', "All changes saved"
+        $scope.bulk_order_form.$setPristine()
+      ).catch ->
+        StatusMessage.display 'failure', t "unsaved_changes_error"
+    else
+      StatusMessage.display 'failure', t "unsaved_changes_error"
+
+  $scope.deleteLineItem = (lineItem) ->
+    if ($scope.confirmDelete && confirm(t "are_you_sure")) || !$scope.confirmDelete
+      LineItems.delete lineItem, =>
+        $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 + lineItem.final_weight_volume
+    , 0
+
+  $scope.sumMaxUnitValues = ->
+    sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
+        sum + lineItem.max_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.weightAdjustedPrice = (lineItem) ->
+    if lineItem.final_weight_volume > 0
+      unit_value = lineItem.final_weight_volume / lineItem.quantity
+      pristine_unit_value = LineItems.pristineByID[lineItem.id].final_weight_volume / LineItems.pristineByID[lineItem.id].quantity
+      lineItem.price = LineItems.pristineByID[lineItem.id].price * (unit_value / pristine_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 = LineItems.pristineByID[lineItem.id].final_weight_volume * lineItem.quantity / LineItems.pristineByID[lineItem.id].quantity
+      $scope.weightAdjustedPrice(lineItem)
+
+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
+
+parseDate = (dateString) ->
+  new Date(Date.parse(dateString))
+
+twoDigitNumber = (number) ->
+  twoDigits =  "" + number
+  twoDigits = ("0" + number) if number < 10
+  twoDigits

app/assets/javascripts/admin/line_items/directives/confirm_change.js.coffee

@@ -0,0 +1,19 @@
+# Used with the ngChange directive to prevent updates to the relevant model unless a callback returns true
+angular.module("admin.lineItems").directive "confirmChange", ->
+  restrict: "A"
+  require: 'ngModel'
+  scope:
+    confirmChange: "&"
+  link: (scope, element, attrs, ngModel) ->
+    valid = null
+
+    ngModel.$parsers.push (val) =>
+      return val if val == valid
+      if scope.confirmChange()
+        # ngModel is changed, triggers ngChange callback
+        return valid = val
+      else
+        valid = ngModel.$modelValue
+        ngModel.$setViewValue(valid)
+        ngModel.$render()
+        return valid

app/assets/javascripts/admin/line_items/directives/confirm_link_click.js.coffee

@@ -0,0 +1,9 @@
+# Used on a link to prevent link clicks unless a callback returns true (probably asking for user confirmation)
+angular.module("admin.lineItems").directive "confirmLinkClick", ->
+  restrict: "A"
+  scope:
+    confirmLinkClick: "&"
+  link: (scope, element, attrs) ->
+    element.bind "click", (event) ->
+      unless scope.confirmLinkClick()
+        event.preventDefault()

app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee

@@ -0,0 +1,8 @@
+angular.module("admin.lineItems").filter "selectFilter", (blankOption, RequestMonitor) ->
+    return (lineItems,selectedSupplier,selectedDistributor,selectedOrderCycle) ->
+      filtered = []
+      unless RequestMonitor.loading
+        filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,"0") || lineItem.supplier.id == selectedSupplier) &&
+          (angular.equals(selectedDistributor,"0") || lineItem.order.distributor.id == selectedDistributor) &&
+          (angular.equals(selectedOrderCycle,"0") || lineItem.order.order_cycle.id == selectedOrderCycle)
+      filtered

app/assets/javascripts/admin/line_items/filters/variant_filter.js.coffee

@@ -1,6 +1,6 @@
-angular.module("ofn.admin").filter "variantFilter", ->
+angular.module("admin.lineItems").filter "variantFilter", ->
     return (lineItems,selectedUnitsProduct,selectedUnitsVariant,sharedResource) ->
       filtered = []
       filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedUnitsProduct,{}) ||
         (lineItem.units_product.id == selectedUnitsProduct.id && (sharedResource || lineItem.units_variant.id == selectedUnitsVariant.id ) ) )
-      filtered
+      filtered

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

@@ -0,0 +1 @@
+angular.module("admin.lineItems", ["admin.indexUtils", "admin.utils", "admin.products", "admin.orders", "admin.enterprises", "admin.orderCycles"])

app/assets/javascripts/admin/line_items/services/line_item_resource.js.coffee

@@ -0,0 +1,12 @@
+angular.module("admin.lineItems").factory 'LineItemResource', ($resource) ->
+  $resource('/admin/:orders/:order_number/line_items/:id.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+    'update':
+      method: 'PUT'
+      transformRequest: (data, headersGetter) =>
+        line_item = {}
+        line_item[attr] = data[attr] for attr in ["price", "quantity", "final_weight_volume"]
+        angular.toJson(line_item: line_item)
+  })

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

@@ -0,0 +1,63 @@
+angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
+  new class LineItems
+    lineItemsByID: {}
+    pristineByID: {}
+
+    index: (params={}, callback=null) ->
+    	LineItemResource.index params, (data) =>
+        @resetData()
+        for lineItem in data
+          @lineItemsByID[lineItem.id] = lineItem
+          @pristineByID[lineItem.id] = angular.copy(lineItem)
+
+        (callback || angular.noop)(data)
+
+    resetData: ->
+      @lineItemsByID = {}
+      @pristineByID = {}
+
+    saveAll: ->
+      for id, lineItem of @lineItemsByID
+        lineItem.errors = {} # removes errors when line_item has been returned to original state
+        @save(lineItem) if !@isSaved(lineItem)
+
+    save: (lineItem) ->
+      deferred = $q.defer()
+      lineItem.errors = {}
+      lineItem.$update({id: lineItem.id, orders: "orders", order_number: lineItem.order.number})
+      .then( (data) =>
+        @pristineByID[lineItem.id] = angular.copy(lineItem)
+        deferred.resolve(data)
+      ).catch (response) ->
+        lineItem.errors = response.data.errors if response.data.errors?
+        deferred.reject(response)
+      deferred.promise
+
+    allSaved: ->
+      for id, lineItem of @lineItemsByID
+        return false unless @isSaved(lineItem)
+      true
+
+    isSaved: (lineItem) ->
+      @diff(lineItem).length == 0
+
+    diff: (lineItem) ->
+      changed = []
+      for attr, value of lineItem when not angular.equals(value, @pristineByID[lineItem.id][attr])
+        changed.push attr if attr in ["price", "quantity", "final_weight_volume"]
+      changed
+
+    resetAttribute: (lineItem, attribute) ->
+      lineItem[attribute] = @pristineByID[lineItem.id][attribute]
+
+    delete: (lineItem, callback=null) ->
+      deferred = $q.defer()
+      lineItem.$delete({id: lineItem.id, orders: "orders", order_number: lineItem.order.number})
+      .then( (data) =>
+        delete @lineItemsByID[lineItem.id]
+        delete @pristineByID[lineItem.id]
+        (callback || angular.noop)(data)
+        deferred.resolve(data)
+      ).catch (response) ->
+        deferred.reject(response)
+      deferred.promise

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

@@ -1,196 +0,0 @@
-angular.module('admin.order_cycles', ['ngResource'])
-  .controller('AdminCreateOrderCycleCtrl', ['$scope', '$filter', 'OrderCycle', 'Enterprise', 'EnterpriseFee', 'ocInstance', ($scope, $filter, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
-    $scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id)
-    $scope.supplied_products = Enterprise.supplied_products
-    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
-
-    $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
-
-    $scope.loaded = ->
-      Enterprise.loaded && EnterpriseFee.loaded
-
-    $scope.suppliedVariants = (enterprise_id) ->
-      Enterprise.suppliedVariants(enterprise_id)
-
-    $scope.exchangeSelectedVariants = (exchange) ->
-      OrderCycle.exchangeSelectedVariants(exchange)
-
-    $scope.setExchangeVariants = (exchange, variants, selected) ->
-      OrderCycle.setExchangeVariants(exchange, variants, selected)
-
-    $scope.enterpriseTotalVariants = (enterprise) ->
-      Enterprise.totalVariants(enterprise)
-
-    $scope.productSuppliedToOrderCycle = (product) ->
-      OrderCycle.productSuppliedToOrderCycle(product)
-
-    $scope.variantSuppliedToOrderCycle = (variant) ->
-      OrderCycle.variantSuppliedToOrderCycle(variant)
-
-    $scope.incomingExchangeVariantsFor = (enterprise_id) ->
-      $filter('filterExchangeVariants')(OrderCycle.incomingExchangesVariants(), $scope.order_cycle.visible_variants_for_outgoing_exchanges[enterprise_id])
-
-    $scope.exchangeDirection = (exchange) ->
-      OrderCycle.exchangeDirection(exchange)
-
-    $scope.enterprisesWithFees = ->
-      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
-
-    $scope.toggleProducts = ($event, exchange) ->
-      $event.preventDefault()
-      OrderCycle.toggleProducts(exchange)
-
-    $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
-      EnterpriseFee.forEnterprise(parseInt(enterprise_id))
-
-    $scope.addSupplier = ($event) ->
-      $event.preventDefault()
-      OrderCycle.addSupplier($scope.new_supplier_id)
-
-    $scope.addDistributor = ($event) ->
-      $event.preventDefault()
-      OrderCycle.addDistributor($scope.new_distributor_id)
-
-    $scope.removeExchange = ($event, exchange) ->
-      $event.preventDefault()
-      OrderCycle.removeExchange(exchange)
-
-    $scope.addCoordinatorFee = ($event) ->
-      $event.preventDefault()
-      OrderCycle.addCoordinatorFee()
-
-    $scope.removeCoordinatorFee = ($event, index) ->
-      $event.preventDefault()
-      OrderCycle.removeCoordinatorFee(index)
-
-    $scope.addExchangeFee = ($event, exchange) ->
-      $event.preventDefault()
-      OrderCycle.addExchangeFee(exchange)
-
-    $scope.removeExchangeFee = ($event, exchange, index) ->
-      $event.preventDefault()
-      OrderCycle.removeExchangeFee(exchange, index)
-
-    $scope.removeDistributionOfVariant = (variant_id) ->
-      OrderCycle.removeDistributionOfVariant(variant_id)
-
-    $scope.submit = (event) ->
-      event.preventDefault()
-      OrderCycle.create()
-  ])
-
-  .controller('AdminEditOrderCycleCtrl', ['$scope', '$filter', '$location', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, $filter, $location, OrderCycle, Enterprise, EnterpriseFee) ->
-    order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
-    $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
-    $scope.supplied_products = Enterprise.supplied_products
-    $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
-
-    $scope.order_cycle = OrderCycle.load(order_cycle_id)
-
-    $scope.loaded = ->
-      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
-
-    $scope.suppliedVariants = (enterprise_id) ->
-      Enterprise.suppliedVariants(enterprise_id)
-
-    $scope.exchangeSelectedVariants = (exchange) ->
-      OrderCycle.exchangeSelectedVariants(exchange)
-
-    $scope.setExchangeVariants = (exchange, variants, selected) ->
-      OrderCycle.setExchangeVariants(exchange, variants, selected)
-
-    $scope.enterpriseTotalVariants = (enterprise) ->
-      Enterprise.totalVariants(enterprise)
-
-    $scope.productSuppliedToOrderCycle = (product) ->
-      OrderCycle.productSuppliedToOrderCycle(product)
-
-    $scope.variantSuppliedToOrderCycle = (variant) ->
-      OrderCycle.variantSuppliedToOrderCycle(variant)
-
-    $scope.incomingExchangeVariantsFor = (enterprise_id) ->
-      $filter('filterExchangeVariants')(OrderCycle.incomingExchangesVariants(), $scope.order_cycle.visible_variants_for_outgoing_exchanges[enterprise_id])
-
-    $scope.exchangeDirection = (exchange) ->
-      OrderCycle.exchangeDirection(exchange)
-
-    $scope.enterprisesWithFees = ->
-      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
-
-    $scope.toggleProducts = ($event, exchange) ->
-      $event.preventDefault()
-      OrderCycle.toggleProducts(exchange)
-
-    $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
-      EnterpriseFee.forEnterprise(parseInt(enterprise_id))
-
-    $scope.addSupplier = ($event) ->
-      $event.preventDefault()
-      OrderCycle.addSupplier($scope.new_supplier_id)
-
-    $scope.addDistributor = ($event) ->
-      $event.preventDefault()
-      OrderCycle.addDistributor($scope.new_distributor_id)
-
-    $scope.removeExchange = ($event, exchange) ->
-      $event.preventDefault()
-      OrderCycle.removeExchange(exchange)
-
-    $scope.addCoordinatorFee = ($event) ->
-      $event.preventDefault()
-      OrderCycle.addCoordinatorFee()
-
-    $scope.removeCoordinatorFee = ($event, index) ->
-      $event.preventDefault()
-      OrderCycle.removeCoordinatorFee(index)
-
-    $scope.addExchangeFee = ($event, exchange) ->
-      $event.preventDefault()
-      OrderCycle.addExchangeFee(exchange)
-
-    $scope.removeExchangeFee = ($event, exchange, index) ->
-      $event.preventDefault()
-      OrderCycle.removeExchangeFee(exchange, index)
-
-    $scope.removeDistributionOfVariant = (variant_id) ->
-      OrderCycle.removeDistributionOfVariant(variant_id)
-
-    $scope.submit = (event) ->
-      event.preventDefault()
-      OrderCycle.update()
-  ])
-
-  .config(['$httpProvider', ($httpProvider) ->
-    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
-  ])
-
-  .directive('datetimepicker', ['$parse', ($parse) ->
-    (scope, element, attrs) ->
-      # using $parse instead of scope[attrs.datetimepicker] for cases
-      # where attrs.datetimepicker is 'foo.bar.lol'
-      $(element).datetimepicker
-      	dateFormat: 'yy-mm-dd'
-      	timeFormat: 'HH:mm:ss'
-      	showOn: "button"
-      	buttonImage: "<%= asset_path 'datepicker/cal.gif' %>"
-      	buttonImageOnly: true
-      	stepMinute: 15
-      	onSelect: (dateText, inst) ->
-      	  scope.$apply ->
-      	    parsed = $parse(attrs.datetimepicker)
-      	    parsed.assign(scope, dateText)
-    ])
-
-  .directive('ofnOnChange', ->
-    (scope, element, attrs) ->
-      element.bind 'change', ->
-        scope.$apply(attrs.ofnOnChange)
-    )
-
-  .directive('ofnSyncDistributions', ->
-    (scope, element, attrs) ->
-      element.bind 'change', ->
-        if !$(this).is(':checked')
-          scope.$apply ->
-            scope.removeDistributionOfVariant(attrs.ofnSyncDistributions)
-    )

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

@@ -0,0 +1,83 @@
+angular.module('admin.orderCycles')
+  .controller 'AdminCreateOrderCycleCtrl', ($scope, $filter, OrderCycle, Enterprise, EnterpriseFee, ocInstance, StatusMessage) ->
+    $scope.enterprises = Enterprise.index(coordinator_id: ocInstance.coordinator_id)
+    $scope.supplier_enterprises = Enterprise.producer_enterprises
+    $scope.distributor_enterprises = Enterprise.hub_enterprises
+    $scope.supplied_products = Enterprise.supplied_products
+    $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
+
+    $scope.OrderCycle = OrderCycle
+    $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
+
+    $scope.StatusMessage = StatusMessage
+
+    $scope.loaded = ->
+      Enterprise.loaded && EnterpriseFee.loaded
+
+    $scope.suppliedVariants = (enterprise_id) ->
+      Enterprise.suppliedVariants(enterprise_id)
+
+    $scope.exchangeSelectedVariants = (exchange) ->
+      OrderCycle.exchangeSelectedVariants(exchange)
+
+    $scope.setExchangeVariants = (exchange, variants, selected) ->
+      OrderCycle.setExchangeVariants(exchange, variants, selected)
+
+    $scope.enterpriseTotalVariants = (enterprise) ->
+      Enterprise.totalVariants(enterprise)
+
+    $scope.productSuppliedToOrderCycle = (product) ->
+      OrderCycle.productSuppliedToOrderCycle(product)
+
+    $scope.variantSuppliedToOrderCycle = (variant) ->
+      OrderCycle.variantSuppliedToOrderCycle(variant)
+
+    $scope.incomingExchangeVariantsFor = (enterprise_id) ->
+      $filter('filterExchangeVariants')(OrderCycle.incomingExchangesVariants(), $scope.order_cycle.visible_variants_for_outgoing_exchanges[enterprise_id])
+
+    $scope.exchangeDirection = (exchange) ->
+      OrderCycle.exchangeDirection(exchange)
+
+    $scope.enterprisesWithFees = ->
+      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
+
+    $scope.toggleProducts = ($event, exchange) ->
+      $event.preventDefault()
+      OrderCycle.toggleProducts(exchange)
+
+    $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
+      EnterpriseFee.forEnterprise(parseInt(enterprise_id))
+
+    $scope.addSupplier = ($event) ->
+      $event.preventDefault()
+      OrderCycle.addSupplier($scope.new_supplier_id)
+
+    $scope.addDistributor = ($event) ->
+      $event.preventDefault()
+      OrderCycle.addDistributor($scope.new_distributor_id)
+
+    $scope.removeExchange = ($event, exchange) ->
+      $event.preventDefault()
+      OrderCycle.removeExchange(exchange)
+
+    $scope.addCoordinatorFee = ($event) ->
+      $event.preventDefault()
+      OrderCycle.addCoordinatorFee()
+
+    $scope.removeCoordinatorFee = ($event, index) ->
+      $event.preventDefault()
+      OrderCycle.removeCoordinatorFee(index)
+
+    $scope.addExchangeFee = ($event, exchange) ->
+      $event.preventDefault()
+      OrderCycle.addExchangeFee(exchange)
+
+    $scope.removeExchangeFee = ($event, exchange, index) ->
+      $event.preventDefault()
+      OrderCycle.removeExchangeFee(exchange, index)
+
+    $scope.removeDistributionOfVariant = (variant_id) ->
+      OrderCycle.removeDistributionOfVariant(variant_id)
+
+    $scope.submit = (destination) ->
+      OrderCycle.create(destination)

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

@@ -0,0 +1,84 @@
+angular.module('admin.orderCycles')
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+    order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
+    $scope.enterprises = Enterprise.index(order_cycle_id: order_cycle_id)
+    $scope.supplier_enterprises = Enterprise.producer_enterprises
+    $scope.distributor_enterprises = Enterprise.hub_enterprises
+    $scope.supplied_products = Enterprise.supplied_products
+    $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: order_cycle_id)
+
+    $scope.OrderCycle = OrderCycle
+    $scope.order_cycle = OrderCycle.load(order_cycle_id)
+
+    $scope.StatusMessage = StatusMessage
+
+    $scope.loaded = ->
+      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+
+    $scope.suppliedVariants = (enterprise_id) ->
+      Enterprise.suppliedVariants(enterprise_id)
+
+    $scope.exchangeSelectedVariants = (exchange) ->
+      OrderCycle.exchangeSelectedVariants(exchange)
+
+    $scope.setExchangeVariants = (exchange, variants, selected) ->
+      OrderCycle.setExchangeVariants(exchange, variants, selected)
+
+    $scope.enterpriseTotalVariants = (enterprise) ->
+      Enterprise.totalVariants(enterprise)
+
+    $scope.productSuppliedToOrderCycle = (product) ->
+      OrderCycle.productSuppliedToOrderCycle(product)
+
+    $scope.variantSuppliedToOrderCycle = (variant) ->
+      OrderCycle.variantSuppliedToOrderCycle(variant)
+
+    $scope.incomingExchangeVariantsFor = (enterprise_id) ->
+      $filter('filterExchangeVariants')(OrderCycle.incomingExchangesVariants(), $scope.order_cycle.visible_variants_for_outgoing_exchanges[enterprise_id])
+
+    $scope.exchangeDirection = (exchange) ->
+      OrderCycle.exchangeDirection(exchange)
+
+    $scope.enterprisesWithFees = ->
+      $scope.enterprises[id] for id in OrderCycle.participatingEnterpriseIds() when $scope.enterpriseFeesForEnterprise(id).length > 0
+
+    $scope.toggleProducts = ($event, exchange) ->
+      $event.preventDefault()
+      OrderCycle.toggleProducts(exchange)
+
+    $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
+      EnterpriseFee.forEnterprise(parseInt(enterprise_id))
+
+    $scope.addSupplier = ($event) ->
+      $event.preventDefault()
+      OrderCycle.addSupplier($scope.new_supplier_id)
+
+    $scope.addDistributor = ($event) ->
+      $event.preventDefault()
+      OrderCycle.addDistributor($scope.new_distributor_id)
+
+    $scope.removeExchange = ($event, exchange) ->
+      $event.preventDefault()
+      OrderCycle.removeExchange(exchange)
+
+    $scope.addCoordinatorFee = ($event) ->
+      $event.preventDefault()
+      OrderCycle.addCoordinatorFee()
+
+    $scope.removeCoordinatorFee = ($event, index) ->
+      $event.preventDefault()
+      OrderCycle.removeCoordinatorFee(index)
+
+    $scope.addExchangeFee = ($event, exchange) ->
+      $event.preventDefault()
+      OrderCycle.addExchangeFee(exchange)
+
+    $scope.removeExchangeFee = ($event, exchange, index) ->
+      $event.preventDefault()
+      OrderCycle.removeExchangeFee(exchange, index)
+
+    $scope.removeDistributionOfVariant = (variant_id) ->
+      OrderCycle.removeDistributionOfVariant(variant_id)
+
+    $scope.submit = (destination) ->
+      OrderCycle.update(destination)

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

@@ -1,4 +1,6 @@
-angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee, ocInstance) ->
+angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, ocInstance) ->
+  $scope.StatusMessage = StatusMessage
+  $scope.OrderCycle = OrderCycle
   $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, =>
     # TODO: make this a get method, which only fetches one enterprise
     $scope.enterprises = Enterprise.index {coordinator_id: ocInstance.coordinator_id}, (enterprises) =>
@@ -39,7 +41,6 @@ angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl
   $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
     EnterpriseFee.forEnterprise(parseInt(enterprise_id))
 
-  $scope.submit = (event) ->
-    event.preventDefault()
+  $scope.submit = (destination) ->
     OrderCycle.mirrorIncomingToOutgoingProducts()
-    OrderCycle.create()
+    OrderCycle.create(destination)

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

@@ -1,9 +1,11 @@
-angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
+angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
   $scope.orderCycleId = ->
     $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
 
+  $scope.StatusMessage = StatusMessage
   $scope.enterprises = Enterprise.index(order_cycle_id: $scope.orderCycleId())
   $scope.enterprise_fees = EnterpriseFee.index(order_cycle_id: $scope.orderCycleId())
+  $scope.OrderCycle = OrderCycle
   $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
     $scope.init()
 
@@ -32,7 +34,6 @@ angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl",
     $event.preventDefault()
     OrderCycle.removeCoordinatorFee(index)
 
-  $scope.submit = (event) ->
-    event.preventDefault()
+  $scope.submit = (destination) ->
     OrderCycle.mirrorIncomingToOutgoingProducts()
-    OrderCycle.update()
+    OrderCycle.update(destination)

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

@@ -1,4 +1,4 @@
-angular.module("admin.order_cycles").filter "filterExchangeVariants", ->
+angular.module("admin.orderCycles").filter "filterExchangeVariants", ->
   return (variants, rules) ->
     if variants? && rules?
       return (variant for variant in variants when variant in rules)

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

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

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

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

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

@@ -0,0 +1,3 @@
+angular.module("admin.orderCycles").filter "visibleVariants", ->
+  return (variants, exchange, rules) ->
+    return (variant for variant in variants when variant.id in rules[exchange.enterprise_id])

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

@@ -0,0 +1,32 @@
+angular.module('admin.orderCycles', ['ngResource', 'admin.utils', 'admin.indexUtils'])
+
+  .config ($httpProvider) ->
+    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
+
+  .directive 'datetimepicker', ($parse) ->
+    (scope, element, attrs) ->
+      # using $parse instead of scope[attrs.datetimepicker] for cases
+      # where attrs.datetimepicker is 'foo.bar.lol'
+      $(element).datetimepicker
+      	dateFormat: 'yy-mm-dd'
+      	timeFormat: 'HH:mm:ss'
+      	showOn: "button"
+      	buttonImage: "<%= asset_path 'datepicker/cal.gif' %>"
+      	buttonImageOnly: true
+      	stepMinute: 15
+      	onSelect: (dateText, inst) ->
+      	  scope.$apply ->
+      	    parsed = $parse(attrs.datetimepicker)
+      	    parsed.assign(scope, dateText)
+
+  .directive 'ofnOnChange', ->
+    (scope, element, attrs) ->
+      element.bind 'change', ->
+        scope.$apply(attrs.ofnOnChange)
+
+  .directive 'ofnSyncDistributions', ->
+    (scope, element, attrs) ->
+      element.bind 'change', ->
+        if !$(this).is(':checked')
+          scope.$apply ->
+            scope.removeDistributionOfVariant(attrs.ofnSyncDistributions)

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

@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
+angular.module('admin.orderCycles').factory('Enterprise', ($resource) ->
   Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {
     'index':
       method: 'GET'
@@ -10,6 +10,8 @@ angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
   {
     Enterprise: Enterprise
     enterprises: {}
+    producer_enterprises: []
+    hub_enterprises: []
     supplied_products: []
     loaded: false
 
@@ -17,6 +19,8 @@ angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
     	Enterprise.index params, (data) =>
         for enterprise in data
           @enterprises[enterprise.id] = enterprise
+          @producer_enterprises.push(enterprise) if enterprise.is_primary_producer
+          @hub_enterprises.push(enterprise) if enterprise.sells == 'any'
 
           for product in enterprise.supplied_products
             @supplied_products.push(product)

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

@@ -1,4 +1,4 @@
-angular.module('admin.order_cycles').factory('EnterpriseFee', ($resource) ->
+angular.module('admin.orderCycles').factory('EnterpriseFee', ($resource) ->
   EnterpriseFee = $resource('/admin/enterprise_fees/for_order_cycle/:enterprise_fee_id.json', {},  {
     'index':
       method: 'GET'

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

@@ -1,15 +1,27 @@
-angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window) ->
-  OrderCycle = $resource '/admin/order_cycles/:action_name/:order_cycle_id.json', {}, {
+angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, StatusMessage) ->
+  OrderCycleResource = $resource '/admin/order_cycles/:action_name/:order_cycle_id.json', {}, {
     'index':  { method: 'GET', isArray: true}
     'new'   : { method: 'GET', params: { action_name: "new" } }
 		'create': { method: 'POST'}
 		'update': { method: 'PUT'}}
 
-  {
-    order_cycle: {}
+  new class OrderCycle
+    order_cycle: {incoming_exchanges: [], outgoing_exchanges: []}
+    showProducts: {incoming: false, outgoing: false}
 
     loaded: false
 
+    exchangeIds: (direction) ->
+      parseInt(exchange.enterprise_id) for exchange in @exchangesByDirection(direction)
+
+    novelSupplier: (enterprise) =>
+      id = enterprise?.id || parseInt(enterprise)
+      @exchangeIds('incoming').indexOf(id) == -1
+
+    novelDistributor: (enterprise) =>
+      id = enterprise?.id || parseInt(enterprise)
+      @exchangeIds('outgoing').indexOf(id) == -1
+
     exchangeSelectedVariants: (exchange) ->
       numActiveVariants = 0
       numActiveVariants++ for id, active of exchange.variants when active
@@ -21,6 +33,10 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
     toggleProducts: (exchange) ->
     	exchange.showProducts = !exchange.showProducts
 
+    toggleAllProducts: (direction) ->
+      this.showProducts[direction] = !this.showProducts[direction]
+      exchange.showProducts = this.showProducts[direction] for exchange in this.exchangesByDirection(direction)
+
     setExchangeVariants: (exchange, variants, selected) ->
       direction = if exchange.incoming then "incoming" else "outgoing"
       editable = @order_cycle["editable_variants_for_#{direction}_exchanges"][exchange.enterprise_id] || []
@@ -80,12 +96,18 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
       distributors = (exchange.enterprise_id for exchange in this.order_cycle.outgoing_exchanges)
       jQuery.unique(suppliers.concat(distributors)).sort()
 
+    exchangesByDirection: (direction) ->
+      if direction == 'incoming'
+        this.order_cycle.incoming_exchanges
+      else
+        this.order_cycle.outgoing_exchanges
+
     removeDistributionOfVariant: (variant_id) ->
       for exchange in this.order_cycle.outgoing_exchanges
         exchange.variants[variant_id] = false
 
     new: (params, callback=null) ->
-      OrderCycle.new params, (oc) =>
+      OrderCycleResource.new params, (oc) =>
         delete oc.$promise
         delete oc.$resolved
         angular.extend(@order_cycle, oc)
@@ -100,7 +122,7 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
 
     load: (order_cycle_id, callback=null) ->
       service = this
-      OrderCycle.get {order_cycle_id: order_cycle_id}, (oc) ->
+      OrderCycleResource.get {order_cycle_id: order_cycle_id}, (oc) ->
         delete oc.$promise
         delete oc.$resolved
         angular.extend(service.order_cycle, oc)
@@ -123,22 +145,33 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
 
       this.order_cycle
 
-    create: ->
-    	oc = new OrderCycle({order_cycle: this.dataForSubmit()})
-    	oc.$create (data) ->
-    	  if data['success']
-    	    $window.location = '/admin/order_cycles'
-    	  else
+    create: (destination) ->
+      return unless @confirmNoDistributors()
+      oc = new OrderCycleResource({order_cycle: this.dataForSubmit()})
+      oc.$create (data) ->
+        if data['success']
+          $window.location = destination
+        else
           console.log('Failed to create order cycle')
 
-    update: ->
-    	oc = new OrderCycle({order_cycle: this.dataForSubmit()})
-    	oc.$update {order_cycle_id: this.order_cycle.id}, (data) ->
-    	  if data['success']
-    	    $window.location = '/admin/order_cycles'
-    	  else
+    update: (destination) ->
+      return unless @confirmNoDistributors()
+      oc = new OrderCycleResource({order_cycle: this.dataForSubmit()})
+      oc.$update {order_cycle_id: this.order_cycle.id, reloading: (if destination? then 1 else 0)}, (data) =>
+        if data['success']
+          if destination?
+            $window.location = destination
+          else
+            StatusMessage.display 'success', 'Your order cycle has been updated.'
+        else
           console.log('Failed to update order cycle')
 
+    confirmNoDistributors: ->
+      if @order_cycle.outgoing_exchanges.length == 0
+        confirm 'There are no distributors in this order cycle. This order cycle will not be visible to customers until you add one. Would you like to continue saving this order cycle?'
+      else
+        true
+
     dataForSubmit: ->
       data = this.deepCopy()
       data = this.stripNonSubmittableAttributes(data)
@@ -200,4 +233,3 @@ angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window)
 
       for id, active of incoming.variants
         outgoing.variants[id] = active
-  })

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

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

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

@@ -0,0 +1,40 @@
+angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource, blankOption) ->
+  new class OrderCycles
+    orderCyclesByID: {}
+    pristineByID: {}
+
+    index: (params={}, callback=null) ->
+      includeBlank = !!params['includeBlank']
+      delete params['includeBlank']
+      OrderCycleResource.index(params, (data) =>
+        for orderCycle in data
+          @orderCyclesByID[orderCycle.id] = orderCycle
+          @pristineByID[orderCycle.id] = angular.copy(orderCycle)
+
+        (callback || angular.noop)(data)
+
+        data.unshift(blankOption()) if includeBlank
+        data
+      )
+
+    save: (order_cycle) ->
+      deferred = $q.defer()
+      order_cycle.$update({id: order_cycle.id})
+      .then( (data) =>
+        @pristineByID[order_cycle.id] = angular.copy(order_cycle)
+        deferred.resolve(data)
+      ).catch (response) ->
+        deferred.reject(response)
+      deferred.promise
+
+    saved: (order_cycle) ->
+      @diff(order_cycle).length == 0
+
+    diff: (order_cycle) ->
+      changed = []
+      for attr, value of order_cycle when not angular.equals(value, @pristineByID[order_cycle.id][attr])
+        changed.push attr unless attr is "$$hashKey"
+      changed
+
+    resetAttribute: (order_cycle, attribute) ->
+      order_cycle[attribute] = @pristineByID[order_cycle.id][attribute]

app/assets/javascripts/admin/orders/controllers/orders_controller.js.coffee

@@ -0,0 +1,22 @@
+angular.module("admin.orders").controller "ordersCtrl", ($scope, $compile, $attrs, shops, orderCycles) ->
+  $scope.$compile = $compile
+  $scope.shops = shops
+  $scope.orderCycles = orderCycles
+  for oc in $scope.orderCycles
+    oc.name_and_status = "#{oc.name} (#{oc.status})"
+
+  $scope.distributor_id = $attrs.ofnDistributorId
+  $scope.order_cycle_id = $attrs.ofnOrderCycleId
+
+  $scope.validOrderCycle = (oc, index, array) ->
+    $scope.orderCycleHasDistributor oc, parseInt($scope.distributor_id)
+
+  $scope.distributorHasOrderCycles = (distributor) ->
+    (oc for oc in orderCycles when @orderCycleHasDistributor(oc, distributor.id)).length > 0
+
+  $scope.orderCycleHasDistributor = (oc, distributor_id) ->
+    distributor_ids = (d.id for d in oc.distributors)
+    distributor_ids.indexOf(distributor_id) != -1
+
+  $scope.distributionChosen = ->
+    $scope.distributor_id && $scope.order_cycle_id

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

@@ -0,0 +1 @@
+angular.module("admin.orders", ['ngResource'])

app/assets/javascripts/admin/orders/services/order_resource.js.coffee

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

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

@@ -0,0 +1,34 @@
+angular.module("admin.orders").factory 'Orders', ($q, OrderResource) ->
+  new class Orders
+    ordersByID: {}
+    pristineByID: {}
+
+    index: (params={}, callback=null) ->
+    	OrderResource.index params, (data) =>
+        for order in data
+          @ordersByID[order.id] = order
+          @pristineByID[order.id] = angular.copy(order)
+
+        (callback || angular.noop)(data)
+
+    save: (order) ->
+      deferred = $q.defer()
+      order.$update({id: order.number})
+      .then( (data) =>
+        @pristineByID[order.id] = angular.copy(order)
+        deferred.resolve(data)
+      ).catch (response) ->
+        deferred.reject(response)
+      deferred.promise
+
+    saved: (order) ->
+      @diff(order).length == 0
+
+    diff: (order) ->
+      changed = []
+      for attr, value of order when not angular.equals(value, @pristineByID[order.id][attr])
+        changed.push attr unless attr is "$$hashKey"
+      changed
+
+    resetAttribute: (order, attribute) ->
+      order[attribute] = @pristineByID[order.id][attribute]

app/assets/javascripts/admin/payment_methods/controllers/payment_method_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.payment_methods")
+angular.module("admin.paymentMethods")
   .controller "paymentMethodCtrl", ($scope, PaymentMethods) ->
     $scope.findPaymentMethodByID = (id) ->
-      $scope.PaymentMethod = PaymentMethods.findByID(id)
+      $scope.PaymentMethod = PaymentMethods.findByID(id)

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

@@ -1 +1 @@
-angular.module("admin.payment_methods", [])
+angular.module("admin.paymentMethods", [])