Merge pull request #2199 from coopdevs/auto-correct-cops

Auto correct cops

.codeclimate.yml

@@ -1,16 +1,36 @@
-engines:
+version: "2"
+plugins:
   rubocop:
     enabled: true
-    exclude_fingerprints:
-    - ac41db8d4ec4cbf508c353d9b65a024f
-    - 8e3b6322aef5be9f38700b3fd0cd347e
+    channel: "rubocop-0-48"
   scss-lint:
+    enabled: false
+  duplication:
     enabled: true
-ratings:
-  paths:
-  - app/**
-  - lib/**
-  - "**.rb"
-exclude_paths:
-- spec/**/*
-- vendor/**/*
+    exclude_patterns:
+    - "db/**"
+    - "config/initializers/active_record_postgresql_referential_integrity_patch.rb"
+checks:
+  argument-count:
+    enabled: false
+  complex-logic:
+    enabled: true
+  file-lines:
+    enabled: false
+  method-complexity:
+    enabled: false
+  method-count:
+    enabled: false
+  method-lines:
+    enabled: false
+  nested-control-flow:
+    enabled: true
+  return-statements:
+    enabled: true
+  similar-code:
+    enabled: true
+  identical-code:
+    enabled: true
+exclude_patterns:
+- "spec/**/*"
+- "vendor/**/*"

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,42 @@
+<!--- If what you want to file is not a bug, please use the [Feature
+template](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Feature-template)
+instead -->
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Description
+<!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Actual Behavior
+<!--- Tell us what happens instead -->
+
+## Steps to Reproduce
+<!--- Provide an unambiguous set of steps to reproduce this bug -->
+<!--- Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Animated Gif/Screenshot
+<!-- Provide a screenshot or brief animated gif reproducing the bug. Linux users can use
+[Peek](https://github.com/phw/peek#ubuntu) while Mac users can use [Recordit](http://recordit.co/) -->
+
+## Context
+<!--- How has this bug affected you? What were you trying to accomplish? -->
+
+## Severity
+<!--- Use the [Bug severity
+guideline](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Bug-severity) to assign one to this bug -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Browser name and version:
+* Operating System and version (desktop or mobile):
+
+## Possible Fix
+<!--- Not obligatory, but suggest a fix or reason for the bug -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,30 @@
+#### What? Why?
+
+Closes #[the issue number this PR is related to]
+
+[Explain why is this change needed and the solution you propose. Provide
+context for others to understand it]
+
+#### What should we test?
+
+[List which features should be tested and how]
+
+#### Release notes
+
+[In case this should be present in the release notes, please write them or
+remove this section otherwise]
+
+#### How is this related to the Spree upgrade?
+
+[Any known conflicts with the Spree Upgrade? explain them or remove this section
+otherwise]
+
+#### Discourse thread
+
+[Is there a discussion about this in Discourse? add the link if so or remove
+this section otherwise]
+
+#### Dependencies
+
+[Does this PR depend on another one? add the link of so or remove this section
+otherwise]

.gitignore

@@ -1,5 +1,6 @@
 .bundle
 .rbenv-version
+.byebug_history
 .swp
 *.swo
 *.swp
@@ -40,3 +41,4 @@ coverage
 libpeerconnection.log
 /config/application.yml
 node_modules
+vendor/bundle/

.node-version

@@ -0,0 +1 @@
+5.12.0

.rubocop.yml

@@ -1,4 +1,9 @@
+inherit_from:
+  - .rubocop_todo.yml
+
 AllCops:
+  TargetRubyVersion: 2.1
+  TargetRailsVersion: 3.2
   Include:
     - '**/Rakefile'
     - '**/config.ru'
@@ -6,24 +11,181 @@ AllCops:
     - 'db/**/*'
     - 'config/**/*'
     - 'script/**/*'
-    - 'spec/**/*'
+    - 'vendor/**/*'
+    - 'node_modules/**/*'
     - !ruby/regexp /old_and_unused\.rb$/
 
-Documentation:
+# OFN SETTINGS
+# Cop settings that have been agreed upon by the OFN community
+
+Rails:
+  Enabled: true
+
+Style/Documentation:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
+Style/StringLiterals:
   Enabled: false
 
-Style/BracesAroundHashParameters:
+Style/HashSyntax:
+  Enabled: true
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+# TEMPORARY/CONTESTED SETTINGS
+# These are still to be decided upon, but recommended for inclusion by
+# oeoeaio after scrutinising offenses the codebase
+
+# Don't think this is a big issue, mostly picking up RPSEC scope definitions
+# with lamdas and RSpec '.to change{}' blocks
+Lint/AmbiguousBlockAssociation:
   Enabled: false
-  
+
+# Heaps of offences (> 100) in specs, mostly in situations where two or more
+# instances of a model are required, but only one is referenced. Difficult to
+# fix without making the spec look messy or rewriting it.
+# Should definitely fix at some point.
+Lint/UselessAssignment:
+  Exclude:
+  - spec/**/*
+
+# AFAIK, there is no good alternative to dynamic matchers until we upgrade
+# to Rails 4 and can use #find_by. If there is a better approach, let's do it.
+Rails/DynamicFindBy:
+  Enabled: false
+
+# Same as above, #find_by is not available until Rails 4
+Rails/FindBy:
+  Enabled: false
+
+# This should be the programmer's discretion, perhaps we should review all of
+# the uses of it an make specific exceptions though.
+Rails/SkipsModelValidations:
+  Enabled: false
+
+# Relaxed.Ruby.Style SETTINGS
+# These styles are a starting point for the conversation around conventions
+# They should be removed or tweaked and moved above as decisions are made
+# NOTE: Cops which did not fail at the time of writing were removed
+
+Layout/DotPosition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledotposition
+
+Layout/SpaceBeforeBlockBraces:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
+
+Layout/SpaceInsideParens:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
+
+Style/Alias:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylealias
+
+Style/BlockDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
+
+Style/CommentAnnotation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
+
+Style/DoubleNegation:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styledoublenegation
+
+Style/FormatString:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleformatstring
+
+Style/IfUnlessModifier:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
+
+Style/Lambda:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylelambda
+
+Style/MultilineBlockChain:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
+
+Style/NegatedIf:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedif
+
+Style/NegatedWhile:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
+
+Style/ParallelAssignment:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
+
+Style/Semicolon:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesemicolon
+
+Style/SingleLineMethods:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
+
+Style/TrailingCommaInArguments:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
+
+Style/TrailingCommaInLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
+
+Style/WordArray:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#stylewordarray
+
+Style/SymbolArray:
+  Enabled: false
+  StyleGuide: https://rubocop.readthedocs.io/en/latest/cops_style/#stylesymbolarray
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
+
+Lint/AssignmentInCondition:
+  Enabled: false
+  StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
-  Max: 120
 
-MethodLength:
+Metrics/MethodLength:
   Enabled: false
 
-StringLiterals:
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
   Enabled: false

.travis.yml

@@ -4,6 +4,8 @@ cache: bundler
 bundler_args: --without development
 rvm:
   - "2.1.5"
+addons:
+  postgresql: "9.5"
 
 # Set the timezone for phantomjs with TZ
 # Set the timezone for karma with TIMEZONE
@@ -40,7 +42,6 @@ before_script:
 
 script:
   - 'if [ "$KARMA" = "true" ]; then bundle exec rake karma:run; else echo "Skipping karma run"; fi'
-  #- "KNAPSACK_GENERATE_REPORT=true bundle exec rspec spec"
   - "bundle exec rake 'knapsack:rspec[--tag ~performance]'"
 
 after_success:

CONTRIBUTING.md

@@ -1,33 +1,68 @@
 # Contributing
+We love pull requests from everyone. Any contribution is valuable, but there are two issue streams that we especially love people to work on:
 
-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.
+1) Our delivery backlog, is managed via a ZenHub board (ZenHub extensions are available for most major browsers). We use a Kanban-style approach, whereby devs pick issues from the top of the backlog which has been organised according to current priorities. If you have some time and are interested in working on some issues from the backlog, please make yourself known on the [#dev](https://openfoodnetwork.slack.com/messages/C2GQ45KNU) channel on Slack and we can direct you to the most appropriate issue to pick up.
 
-Fork, then clone the repo:
+2) Our list of bugs and other self-contained issues that we consider to be a good starting point for new contributors, or devs who aren’t able to commit to seeing a whole feature through. These issues are marked with the `# good first issue` label.
 
-    git clone git@github.com:your-username/openfoodnetwork.git
+## Set up
 
-Follow the instructions in README.markdown to set up your machine.
+Set up your local development environment by following the appropriate guide from the `Development environment setup` section in the [developer wiki](https://github.com/openfoodfoundation/openfoodnetwork/wiki).
 
-Make sure the tests pass:
+Add an `upstream` remote that points to the main repo:
 
-    rspec spec
+    cd ~/location-of-your-local-ofn-repo
+    git remote add upstream https://github.com/openfoodfoundation/openfoodnetwork
 
-Make your change. Add tests for your change. Make the tests pass:
+If you haven't already done so, fork this repo using the `Fork` button in the top-right corner of this screen. Then ensure that your fork is listed as the `origin` remote on your local machine.
 
-    rspec spec
+    git remote set-url origin https://github.com/your-username/openfoodnetwork
 
-Push to your fork and [submit a pull request][pr].
+Fetch the latest version of `master` from `upstream` (ie. the main repo):
 
-[pr]: https://github.com/openfoodfoundation/openfoodnetwork/compare/
+    git fetch upstream master
 
-At this point you're waiting on us. We may suggest some changes or
-improvements or alternatives.
+Create a new branch on your local machine for (based on `upstream/master`):
 
-To increase the chance that your pull request is swiftly accepted:
+    git checkout -b branch-name-here --no-track upstream/master
 
+If you want to run the whole test suite, we recommend using a free CI service to run your tests in parallel. Running the whole suite locally in series is likely to take > 40 minutes. [TravisCI][travis] and [SemaphoreCI][semaphore] both work great in our experience. Either way, make sure the tests pass on your new branch:
+
+    bundle exec rspec spec
+
+## Making a change
+
+Make your changes to the codebase. We recommend using TDD. Add a test, make changes and get the test suite back to green.
+
+    bundle exec rspec spec
+
+Once the tests are passing you can commit your changes. See [Making a great commit][great-commit] for more tips.
+
+    git add .
+    git commit -m "Add a concise commit message describing your change here"
+
+Push your changes to a branch on your fork:
+
+    git push origin branch-name-here
+
+## Submitting a Pull Request
+
+Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [[making a great pull request]].
+
+TL;DR:
 * Write tests
+* Make sure the whole test suite is passing
+* Keep your PR small, with a single focus
+* Maintain a clean commit history
 * Use a style consistent with the rest of the codebase
 * Before submitting, [rebase your work][rebase] on the current master branch
 
+From here, your pull request will progress through the [Review, Test, Merge & Deploy process][process].
+
+[pr]: https://github.com/openfoodfoundation/openfoodnetwork/compare/
+[great-pr]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Making-a-great-pull-request
+[great-commit]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Making-a-great-commit
+[process]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/The-process-of-review%2C-test%2C-merge-and-deploy
 [rebase]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough
+[travis]: https://travis-ci.org/
+[semaphore]: https://semaphoreci.com/

Gemfile

@@ -1,30 +1,37 @@
 source 'https://rubygems.org'
 ruby "2.1.5"
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'rails', '3.2.21'
 gem 'rails-i18n', '~> 3.0.0'
 gem 'i18n', '~> 0.6.11'
+gem 'i18n-js', '~> 3.0.0'
 
 # Patched version. See http://rubysec.com/advisories/CVE-2015-5312/.
 gem 'nokogiri', '>= 1.6.7.1'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step1c'
+gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '86bf87f1b1e1b299edc8cd10a2486e44ba0a3987'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '1-3-stable'
+gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
 
 # 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 'spree_paypal_express', github: "openfoodfoundation/better_spree_paypal_express", branch: "spree-upgrade-intermediate"
+#gem 'spree_paypal_express', github: "spree-contrib/better_spree_paypal_express", branch: "1-3-stable"
+gem 'stripe', '~> 3.3.1'
+gem 'activemerchant', '~> 1.71.0'
+
+gem 'oauth2', '~> 1.2.0' # Used for Stripe Connect
+gem 'jwt', '~> 1.5'
 
 gem 'delayed_job_active_record'
 gem 'daemons'
 
 # Fix bug in simple_form preventing collection_check_boxes usage within form_for block
 # When merged, revert to upstream gem
-gem 'simple_form', :github => 'RohanM/simple_form'
+gem 'simple_form', github: 'RohanM/simple_form'
 
 gem 'unicorn'
 gem 'angularjs-rails', '1.5.5'
@@ -42,14 +49,14 @@ gem 'representative_view'
 gem 'rabl'
 gem "active_model_serializers"
 gem 'oj'
-gem 'deface', :github => 'spree/deface', :ref => '1110a13'
+gem 'deface', github: 'spree/deface', ref: '1110a13'
 gem 'paperclip'
 gem 'dalli'
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'spinjs-rails'
-gem 'rack-ssl', :require => 'rack/ssl'
-gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
+gem 'rack-ssl', require: 'rack/ssl'
+gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'angularjs-file-upload-rails', '~> 1.1.6'
 gem 'roadie-rails', '~> 1.0.3'
 gem 'figaro'
@@ -57,6 +64,7 @@ gem 'blockenspiel'
 gem 'acts-as-taggable-on', '~> 3.4'
 gem 'paper_trail', '~> 3.0.8'
 gem 'diffy'
+gem 'skylight', '< 2.0'
 
 gem 'wicked_pdf'
 gem 'wkhtmltopdf-binary'
@@ -91,23 +99,22 @@ gem 'jquery-rails'
 gem 'jquery-migrate-rails'
 gem 'css_splitter'
 
-gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz'
+gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', ref: '60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c'
 
 group :test, :development do
   # Pretty printed test output
-  gem 'turn', '~> 0.8.3', :require => false
-  gem 'fuubar'
-  gem 'rspec-rails'
+  gem 'fuubar', '~> 2.2.0'
+  gem 'rspec-rails', ">= 3.5.2"
   gem 'shoulda-matchers'
-  gem 'factory_girl_rails', :require => false
-  gem 'capybara'
-  gem 'database_cleaner', '0.7.1', :require => false
+  gem 'factory_girl_rails', require: false
+  gem 'capybara', '>= 2.15.4'
+  gem 'database_cleaner', '0.7.1', require: false
   gem 'awesome_print'
-  gem 'letter_opener'
+  gem 'letter_opener', '>= 1.4.1'
   gem 'timecop'
-  gem 'poltergeist'
+  gem 'poltergeist', '>= 1.16.0'
   gem 'rspec-retry'
-  gem 'json_spec'
+  gem 'json_spec', '~> 1.1.4'
   gem 'unicorn-rails'
   gem 'atomic'
   gem 'knapsack'
@@ -115,19 +122,25 @@ end
 
 group :test do
   gem 'webmock'
-
   # See spec/spec_helper.rb for instructions
   #gem 'perftools.rb'
 end
 
 group :development do
-  gem 'pry-byebug'
+  gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
+  gem 'pry-byebug', '>= 3.4.3'
   gem 'debugger-linecache'
   gem 'guard'
+  gem 'listen', '3.0.8' # 3.1.0 requires ruby 2.2
   gem 'guard-livereload'
   gem 'rack-livereload'
   gem 'guard-rails'
-  gem 'guard-zeus'
-  gem 'guard-rspec'
+  gem 'guard-rspec', '~> 4.7.3'
   gem 'parallel_tests'
+  gem 'rubocop', '>= 0.49.1'
+
+  # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
+  # While we don't require this gem directly, no dependents forced the upgrade to a version
+  # greater than 1.0.9, so we just required the latest available version here.
+  gem 'eventmachine', '>= 1.2.3'
 end

Gemfile.lock

@@ -1,5 +1,5 @@
 GIT
-  remote: git://github.com/RohanM/simple_form.git
+  remote: https://github.com/RohanM/simple_form.git
   revision: 45f08a213b40f3d4bda5f5398db841137587160a
   specs:
     simple_form (2.0.2)
@@ -7,74 +7,104 @@ GIT
       activemodel (~> 3.0)
 
 GIT
-  remote: git://github.com/jeremydurham/custom-err-msg.git
+  remote: https://github.com/jeremydurham/custom-err-msg.git
   revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
   specs:
     custom_error_message (1.1.1)
 
 GIT
-  remote: git://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: 840d973cd5bd3250b17674a624dad494aeb09eb3
-  branch: hide-password
+  remote: https://github.com/openfoodfoundation/better_spree_paypal_express.git
+  revision: 8d95f4544c682634812becaf50999fba0cd04df0
+  branch: spree-upgrade-intermediate
   specs:
     spree_paypal_express (2.0.3)
       paypal-sdk-merchant (= 1.106.1)
-      spree_core (~> 1.3.4)
+      spree_core (~> 1.3.99)
 
 GIT
-  remote: git://github.com/openfoodfoundation/ofn-qz.git
-  revision: 024680ccea429b2e5428d7b964fa67c52add34ec
+  remote: https://github.com/openfoodfoundation/ofn-qz.git
+  revision: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
+  ref: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
   specs:
     ofn-qz (0.1.0)
       railties (~> 3.1)
 
 GIT
-  remote: git://github.com/openfoodfoundation/spree.git
-  revision: a4c439570b77afa50f9e36299811f293232bd281
-  branch: spree-upgrade-step1c
+  remote: https://github.com/openfoodfoundation/spree.git
+  revision: 86bf87f1b1e1b299edc8cd10a2486e44ba0a3987
+  ref: 86bf87f1b1e1b299edc8cd10a2486e44ba0a3987
+  branch: step-6a
   specs:
     spree (1.3.99)
       spree_api (= 1.3.99)
+      spree_backend (= 1.3.99)
       spree_cmd (= 1.3.99)
       spree_core (= 1.3.99)
       spree_dash (= 1.3.99)
-      spree_promo (= 1.3.99)
+      spree_frontend (= 1.3.99)
       spree_sample (= 1.3.99)
     spree_api (1.3.99)
+      rabl (= 0.7.2)
       spree_core (= 1.3.99)
       versioncake (= 0.4.0)
+    spree_backend (1.3.99)
+      deface (>= 0.9.0)
+      jquery-rails (~> 2.0)
+      rails (~> 3.2.8)
+      select2-rails (~> 3.2)
+      spree_api (= 1.3.99)
+      spree_core (= 1.3.99)
+      stringex (~> 1.3.2)
     spree_cmd (1.3.99)
       thor (>= 0.14.6)
     spree_core (1.3.99)
-      activemerchant (~> 1.50.0)
-      acts_as_list (= 0.1.4)
+      activemerchant (~> 1.50)
+      acts_as_list (= 0.1.9)
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (= 1.6.8)
       deface (>= 0.9.0)
       ffaker (~> 1.15.0)
-      highline (= 1.6.11)
-      jquery-rails (~> 2.0)
+      highline (= 1.6.15)
+      httparty (= 0.9.0)
       json (>= 1.5.5)
       kaminari (= 0.13.0)
-      money (= 5.0.0)
+      money (= 5.1.0)
       paperclip (~> 3.0)
-      rabl (= 0.7.2)
       rails (~> 3.2.13)
       ransack (= 0.7.2)
-      select2-rails (~> 3.2)
       state_machine (= 1.2.0)
       stringex (~> 1.3.2)
+      truncate_html (= 0.9.2)
     spree_dash (1.3.99)
-      httparty (~> 0.8.1)
-      spree_core (= 1.3.99)
-    spree_promo (1.3.99)
+      httparty (~> 0.9.0)
+      spree_backend (= 1.3.99)
+      spree_frontend (= 1.3.99)
+    spree_frontend (1.3.99)
+      deface (>= 0.9.0)
+      jquery-rails (~> 2.2.1)
+      rails (~> 3.2.8)
+      select2-rails (~> 3.2)
+      spree_api (= 1.3.99)
       spree_core (= 1.3.99)
+      stringex (~> 1.3.2)
     spree_sample (1.3.99)
       spree_core (= 1.3.99)
 
 GIT
-  remote: git://github.com/spree/deface.git
+  remote: https://github.com/openfoodfoundation/spree_auth_devise.git
+  revision: da9eecefc6fe13dedf4c6f3febec79caad839ec3
+  branch: spree-upgrade-intermediate
+  specs:
+    spree_auth_devise (2.0.0)
+      devise (~> 2.2.5)
+      devise-encryptable (= 0.1.2)
+      spree_backend (~> 1.3.6)
+      spree_core (~> 1.3.6)
+      spree_frontend (~> 1.3.6)
+
+GIT
+  remote: https://github.com/spree/deface.git
   revision: 1110a1336252109bce7f98f9182042e0bc2930ae
   ref: 1110a13
   specs:
@@ -84,18 +114,7 @@ GIT
       rails (>= 3.1)
 
 GIT
-  remote: git://github.com/spree/spree_auth_devise.git
-  revision: ba95589a85368297c844f096c2a0c121e5b08138
-  branch: 1-3-stable
-  specs:
-    spree_auth_devise (1.3.0)
-      cancan (~> 1.6.7)
-      devise (~> 2.2.3)
-      devise-encryptable (= 0.1.2)
-      spree_core
-
-GIT
-  remote: git://github.com/spree/spree_i18n.git
+  remote: https://github.com/spree/spree_i18n.git
   revision: 752eb67204e9c5a4e22b62591a8fd55fe2285e43
   branch: 1-3-stable
   specs:
@@ -105,7 +124,7 @@ GIT
       spree_core (>= 1.1)
 
 GIT
-  remote: git://github.com/willrjmarshall/foundation_rails_helper.git
+  remote: https://github.com/willrjmarshall/foundation_rails_helper.git
   revision: 4d5d53fdc4b1fb71e66524d298c5c635de82cfbb
   branch: rails3
   specs:
@@ -133,8 +152,8 @@ GEM
       sprockets (~> 2.2.1)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activemerchant (1.50.0)
-      activesupport (>= 3.2.14, < 5.0.0)
+    activemerchant (1.71.0)
+      activesupport (>= 3.2.14, < 6.x)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
@@ -154,8 +173,9 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
-    acts_as_list (0.1.4)
-    addressable (2.3.3)
+    acts_as_list (0.1.9)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     andand (1.3.3)
     angular-rails-templates (0.2.0)
       railties (>= 3.1)
@@ -163,8 +183,8 @@ GEM
       tilt
     angularjs-file-upload-rails (1.1.6)
     angularjs-rails (1.5.5)
-    ansi (1.4.2)
     arel (3.0.3)
+    ast (2.3.0)
     atomic (1.1.99)
     awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
@@ -173,33 +193,28 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    bcrypt (3.1.7)
+    bcrypt (3.1.11)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.4.5)
     bugsnag (4.1.0)
     builder (3.0.4)
-    byebug (2.7.0)
-      columnize (~> 0.3)
-      debugger-linecache (~> 1.2)
+    byebug (9.0.6)
     cancan (1.6.8)
-    capybara (2.7.1)
+    capybara (2.18.0)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+      xpath (>= 2.0, < 4.0)
     chronic (0.10.2)
     chunky_png (1.3.4)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
+    climate_control (0.1.0)
     cliver (0.3.2)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.0.9)
+    coderay (1.1.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -207,8 +222,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorize (0.7.7)
-    columnize (0.9.0)
+    colorize (0.8.1)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -225,8 +239,8 @@ GEM
       compass (~> 1.0.0)
       sass-rails (<= 5.0.1)
       sprockets (< 2.13)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     css_parser (1.3.5)
       addressable
     css_splitter (0.4.5)
@@ -239,11 +253,11 @@ GEM
       fog (~> 1.0)
       rails (~> 3.0)
     debugger-linecache (1.2.0)
-    delayed_job (4.0.4)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.2)
-      activerecord (>= 3.0, < 4.2)
-      delayed_job (>= 3.0, < 4.1)
+    delayed_job (4.1.4)
+      activesupport (>= 3.0, < 5.2)
+    delayed_job_active_record (4.1.2)
+      activerecord (>= 3.0, < 5.2)
+      delayed_job (>= 3.0, < 5)
     devise (2.2.8)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
@@ -251,22 +265,24 @@ GEM
       warden (~> 1.2.1)
     devise-encryptable (0.1.2)
       devise (>= 2.1.0)
-    diff-lcs (1.2.4)
+    diff-lcs (1.3)
     diffy (3.1.0)
-    em-websocket (0.5.0)
+    em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.5.3)
+      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.8)
+    eventmachine (1.2.3)
     excon (0.45.4)
     execjs (2.6.0)
-    factory_girl (3.3.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.3.0)
-      factory_girl (~> 3.3.0)
+    factory_girl_rails (4.9.0)
+      factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     ffaker (1.15.0)
-    ffi (1.9.3)
+    ffi (1.9.18)
     figaro (0.7.0)
       bundler (~> 1.0)
       rails (>= 3, < 5)
@@ -387,38 +403,44 @@ GEM
     foundation-rails (5.5.0.0)
       railties (>= 3.1.0)
       sass (>= 3.2.0, < 3.4)
-    fuubar (1.3.3)
-      rspec (>= 2.14.0, < 3.1.0)
+    fuubar (2.2.0)
+      rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
-    guard (2.2.4)
+    guard (2.14.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-livereload (2.0.1)
+    guard-compat (1.2.1)
+    guard-livereload (2.5.2)
       em-websocket (~> 0.5)
-      guard (~> 2.0)
+      guard (~> 2.8)
+      guard-compat (~> 1.0)
       multi_json (~> 1.8)
-    guard-rails (0.4.7)
-      guard (>= 0.2.2)
-    guard-rspec (4.0.4)
-      guard (>= 2.1.1)
-      rspec (~> 2.14)
-    guard-zeus (0.0.1)
-      guard
-      zeus
+    guard-rails (0.7.2)
+      guard (~> 2.11)
+      guard-compat (~> 1.0)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
     haml (4.0.4)
       tilt
-    highline (1.6.11)
+    highline (1.6.15)
     hike (1.2.3)
-    http_parser.rb (0.5.3)
-    httparty (0.8.3)
+    http_parser.rb (0.6.0)
+    httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.11)
+    i18n-js (3.0.0)
+      i18n (~> 0.6, >= 0.6.6)
     immigrant (0.1.6)
       activerecord (>= 3.0)
       foreigner (>= 1.2.1)
@@ -426,47 +448,57 @@ GEM
     ipaddress (0.8.0)
     journey (1.0.4)
     jquery-migrate-rails (1.2.1)
-    jquery-rails (2.3.0)
+    jquery-rails (2.2.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    json_spec (1.1.1)
+    json (1.8.6)
+    json_spec (1.1.5)
       multi_json (~> 1.0)
-      rspec (~> 2.0)
+      rspec (>= 2.0, < 4.0)
+    jwt (1.5.4)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     kgio (2.9.3)
-    knapsack (1.5.1)
+    knapsack (1.16.0)
       rake
-      timecop (>= 0.1.0)
-    launchy (2.1.2)
+    launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.0.0)
-      launchy (>= 2.0.4)
+    letter_opener (1.6.0)
+      launchy (~> 2.2)
     libv8 (3.16.14.11)
-    listen (2.2.0)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.4)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    lumberjack (1.0.12)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (1.25.1)
-    mini_portile2 (2.0.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.1.0)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
-    money (5.0.0)
-      i18n (~> 0.4)
-      json
+    money (5.1.0)
+      i18n (~> 0.6.0)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nenv (0.3.0)
     newrelic_rpm (3.12.0.288)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
     oj (2.1.2)
     orm_adapter (0.5.0)
     paper_trail (3.0.8)
@@ -477,37 +509,39 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    parallel (1.4.1)
-    parallel_tests (1.3.7)
+    parallel (1.11.2)
+    parallel_tests (2.14.1)
       parallel
+    parser (2.4.0.0)
+      ast (~> 2.2)
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
       xml-simple
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
     pg (0.13.2)
-    poltergeist (1.9.0)
+    poltergeist (1.16.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.5)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-byebug (1.3.2)
-      byebug (~> 2.7)
-      pry (~> 0.9.12)
+    powerpack (0.1.1)
+    pry (0.11.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.4.3)
+      byebug (>= 9.0, < 9.1)
+      pry (~> 0.10)
+    public_suffix (3.0.0)
     rabl (0.7.2)
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
     rack (1.4.7)
-    rack-cache (1.6.1)
+    rack-cache (1.7.0)
       rack (>= 0.4)
-    rack-livereload (0.3.15)
+    rack-livereload (0.3.16)
       rack
     rack-ssl (1.3.4)
       rack
@@ -531,15 +565,17 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    rainbow (2.2.2)
+      rake
     raindrops (0.13.0)
-    rake (11.1.2)
+    rake (10.5.0)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.2.3)
@@ -561,26 +597,39 @@ GEM
     roo (2.7.1)
       nokogiri (~> 1)
       rubyzip (~> 1.1, < 2.0.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.2)
-    rspec-rails (2.14.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-retry (0.4.2)
-      rspec-core
-    ruby-progressbar (1.7.1)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-retry (0.5.6)
+      rspec-core (> 3.3, < 3.8)
+    rspec-support (3.7.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     rubyzip (1.2.0)
-    safe_yaml (0.9.5)
+    safe_yaml (1.0.4)
     sass (3.3.14)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
@@ -588,9 +637,11 @@ GEM
       tilt (~> 1.3)
     select2-rails (3.5.10)
       thor (~> 0.14)
-    shoulda-matchers (1.1.0)
+    shellany (0.0.1)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    skylight (1.6.1)
       activesupport (>= 3.0.0)
-    slop (3.4.5)
     spinjs-rails (1.3)
       rails (>= 3.1)
     sprockets (2.2.3)
@@ -600,26 +651,26 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     state_machine (1.2.0)
     stringex (1.3.3)
+    stripe (3.3.1)
+      faraday (~> 0.9)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
-    thor (0.19.1)
+    thor (0.20.0)
     tilt (1.4.1)
-    timecop (0.8.1)
-    timers (1.1.0)
+    timecop (0.9.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    truncate_html (0.5.5)
+    truncate_html (0.9.2)
     turbo-sprockets-rails3 (0.3.6)
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.0.0)
-    turn (0.8.3)
-      ansi
-    tzinfo (0.3.49)
+    tzinfo (0.3.53)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicode-display_width (1.3.0)
     unicorn (4.9.0)
       kgio (~> 2.6)
       rack
@@ -632,31 +683,29 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-    warden (1.2.3)
+    warden (1.2.7)
       rack (>= 1.0)
-    webmock (1.13.0)
+    webmock (1.8.11)
       addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-    websocket-driver (0.6.3)
+      crack (>= 0.1.7)
+    websocket-driver (0.7.0)
       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)
+    wicked_pdf (1.1.0)
+    wkhtmltopdf-binary (0.12.3.1)
+    xml-simple (1.1.5)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
-    zeus (0.15.4)
-      method_source (>= 0.6.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_model_serializers
+  activemerchant (~> 1.71.0)
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.2.0)
@@ -667,7 +716,8 @@ DEPENDENCIES
   aws-sdk
   blockenspiel
   bugsnag
-  capybara
+  byebug (~> 9.0.0)
+  capybara (>= 2.15.4)
   coffee-rails (~> 3.2.1)
   compass-rails
   css_splitter
@@ -680,39 +730,43 @@ DEPENDENCIES
   deface!
   delayed_job_active_record
   diffy
+  eventmachine (>= 1.2.3)
   factory_girl_rails
   figaro
   foreigner
   foundation-icons-sass-rails
   foundation-rails
   foundation_rails_helper!
-  fuubar
+  fuubar (~> 2.2.0)
   geocoder
   gmaps4rails
   guard
   guard-livereload
   guard-rails
-  guard-rspec
-  guard-zeus
+  guard-rspec (~> 4.7.3)
   haml
   i18n (~> 0.6.11)
+  i18n-js (~> 3.0.0)
   immigrant
   jquery-migrate-rails
   jquery-rails
-  json_spec
+  json_spec (~> 1.1.4)
+  jwt (~> 1.5)
   knapsack
-  letter_opener
+  letter_opener (>= 1.4.1)
+  listen (= 3.0.8)
   momentjs-rails
   newrelic_rpm
   nokogiri (>= 1.6.7.1)
+  oauth2 (~> 1.2.0)
   ofn-qz!
   oj
   paper_trail (~> 3.0.8)
   paperclip
   parallel_tests
   pg
-  poltergeist
-  pry-byebug
+  poltergeist (>= 1.16.0)
+  pry-byebug (>= 3.4.3)
   rabl
   rack-livereload
   rack-ssl
@@ -722,22 +776,24 @@ DEPENDENCIES
   representative_view
   roadie-rails (~> 1.0.3)
   roo (~> 2.7.0)
-  rspec-rails
+  rspec-rails (>= 3.5.2)
   rspec-retry
+  rubocop (>= 0.49.1)
   sass (~> 3.3)
   sass-rails (~> 3.2.3)
   shoulda-matchers
   simple_form!
+  skylight (< 2.0)
   spinjs-rails
   spree!
   spree_auth_devise!
   spree_i18n!
   spree_paypal_express!
+  stripe (~> 3.3.1)
   therubyracer
   timecop
   truncate_html
   turbo-sprockets-rails3
-  turn (~> 0.8.3)
   uglifier (>= 1.0.3)
   unicorn
   unicorn-rails
@@ -750,4 +806,4 @@ RUBY VERSION
    ruby 2.1.5p273
 
 BUNDLED WITH
-   1.14.3
+   1.16.1

Guardfile

@@ -47,4 +47,3 @@ end
   #watch(%r{^spec/acceptance/(.+)\.feature$})
   #watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 #end
-

README.md

@@ -1,5 +1,6 @@
 [![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)
+[![View performance data on Skylight](https://badges.skylight.io/status/EiXQ6sSKij8y.svg)](https://oss.skylight.io/app/applications/EiXQ6sSKij8y)
 
 # Open Food Network
 
@@ -45,44 +46,23 @@ You can download the source with the command:
 
 ### 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 .
+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 2.1.5 installed:
+When ready, run `script/setup`. If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
 
-    ruby --version
+If you run into any other issues getting your local environment up and running please consult [the wiki](https://github.com/openfoodfoundation/openfoodnetwork/wiki).
 
-Install the project's gem dependencies:
-
-    cd openfoodnetwork
-    bundle install
-
-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`:
+If still you get stuck do not hesitate to open an issue reporting the full output of the script.
 
+Now, your dreams of spinning up a development server can be realised:
 ```
-createuser -s -P ofn
+bundle exec rails server
+```
+To login as Spree default user, use:
+```
+email: spree@example.com
+password: spree123
 ```
-
-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
-
-Load some default data for your environment:
-
-    rake openfoodnetwork:dev:load_sample_data
-
-At long last, your dreams of spinning up a development server can be realised:
-
-    rails server
-
-
 ### Testing
 
 Tests, both unit and integration, are based on RSpec. To run the test suite, first prepare the test database:
@@ -98,6 +78,17 @@ The site is configured to use
 startup time while Rails loads. See the Zeus github page for
 usage instructions.
 
+Once [npm dependencies are
+installed](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma), AngularJS tests can be run with:
+
+    ./script/karma run
+
+If you want karma to automatically rerun the tests on file modification, use:
+
+    ./script/karma start
+
+### Multilingual
+Do not forget to run `rake tmp:cache:clear` after locales are updated to reload I18n js translations.
 
 ## Credits
 
@@ -111,7 +102,7 @@ usage instructions.
 * 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)
+* Steve Pettitt (https://github.com/stveep)
 
 
 ## Licence

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

@@ -1,3 +1,14 @@
-angular.module("ofn.admin", ["ngResource", "ngAnimate", "admin.utils", "admin.indexUtils", "admin.dropdown", "admin.products", "admin.taxons", "infinite-scroll"]).config ($httpProvider) ->
+angular.module("ofn.admin", [
+  "ngResource",
+  "mm.foundation",
+  "angularFileUpload",
+  "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

@@ -14,12 +14,12 @@
 //= require angular-resource
 //= require angular-animate
 //= require angular-sanitize
-//= require admin/spree_core
+//= require admin/spree_backend
 //= require admin/spree_auth
-//= require admin/spree_promo
 //= require admin/spree_paypal_express
 //= require ../shared/ng-infinite-scroll.min.js
 //= require ../shared/ng-tags-input.min.js
+//= require moment
 //= require angular-rails-templates
 //= require_tree ../templates/admin
 //= require ./admin_ofn
@@ -40,6 +40,7 @@
 //= require ./resources/resources
 //= require ./shipping_methods/shipping_methods
 //= require ./side_menu/side_menu
+//= require ./subscriptions/subscriptions
 //= require ./tag_rules/tag_rules
 //= require ./taxons/taxons
 //= require ./utils/utils
@@ -48,8 +49,17 @@
 //= require textAngular-rangy.min.js
 //= require textAngular-sanitize.min.js
 //= require textAngular.min.js
-//= require darkswarm/i18n.js
+//= require i18n/translations
 //= require darkswarm/i18n.translate.js
-
+//= require moment
+//= require moment/en-gb.js
+//= require moment/es.js
+//= require moment/fr.js
+//= require moment/it.js
+//= require moment/nb.js
+//= require moment/pt-br.js
+//= require moment/sv.js
+//= require ../shared/mm-foundation-tpls-0.8.0.min.js
+//= require angularjs-file-upload
 
 //= require_tree .

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

@@ -32,7 +32,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
     $scope.filteredProducts = []
     $scope.currentFilters = []
     $scope.limit = 15
-    $scope.productsWithUnsavedVariants = []
     $scope.query = ""
     $scope.DisplayProperties = DisplayProperties
 
@@ -114,7 +113,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
         display_name: null
         on_hand: null
         price: null
-      $scope.productsWithUnsavedVariants.push product
       DisplayProperties.setShowVariants product.id, true
 
 
@@ -196,7 +194,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
           filters: $scope.currentFilters
       ).success((data) ->
         DirtyProducts.clear()
-        BulkProducts.updateVariantLists(data.products, $scope.productsWithUnsavedVariants)
+        BulkProducts.updateVariantLists(data.products || [])
         $timeout -> $scope.displaySuccess()
       ).error (data, status) ->
         if status == 400 && data.errors? && data.errors.length > 0

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

@@ -14,8 +14,8 @@ angular.module("admin.businessModelConfiguration").controller "BusinessModelConf
     $scope.cappedBill()
 
   $scope.capReached = ->
-    return "No" if !$scope.cap? || Number($scope.cap) == 0
-    if $scope.bill() >= Number($scope.cap) then "Yes" else "No"
+    return t('no') if !$scope.cap? || Number($scope.cap) == 0
+    if $scope.bill() >= Number($scope.cap) then t('yes') else t('no')
 
   $scope.includedTax = ->
     return 0 if !$scope.taxRate? || Number($scope.taxRate) == 0

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

@@ -12,7 +12,7 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
 
   $scope.$watch "shop_id", ->
     if $scope.shop_id?
-      CurrentShop.shop = $filter('filter')($scope.shops, {id: $scope.shop_id})[0]
+      CurrentShop.shop = $filter('filter')($scope.shops, {id: parseInt($scope.shop_id)}, true)[0]
       Customers.index({enterprise_id: $scope.shop_id}).then (data) ->
         pendingChanges.removeAll()
         $scope.customers_form.$setPristine()

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

@@ -2,6 +2,7 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
   restrict: 'A'
   scope: true
   link: (scope, element, attr) ->
+    template = null
     scope.errors = []
 
     scope.$watch 'address.country_id', (newVal) ->
@@ -18,19 +19,19 @@ angular.module("admin.customers").directive 'editAddressDialog', ($compile, $tem
       else
         scope.errors.push(t('admin.customers.index.update_address_error'))
 
-
-    template = $compile($templateCache.get('admin/edit_address_dialog.html'))(scope)
-    template.dialog(DialogDefaults)
-
     element.bind 'click', (e) ->
       if e.target.id == 'bill-address-link'
         scope.addressType = 'bill_address'
       else
         scope.addressType = 'ship_address'
       scope.address = scope.customer[scope.addressType]
+      scope.states = scope.filter_states(scope.address?.country_id)
 
+      template = $compile($templateCache.get('admin/edit_address_dialog.html'))(scope)
+      template.dialog(DialogDefaults)
       template.dialog('open')
       scope.$apply()
 
     scope.filter_states = (countryID) ->
-      $filter('filter')(scope.availableCountries, {id: countryID})[0].states
+      return [] unless countryID
+      $filter('filter')(scope.availableCountries, {id: parseInt(countryID)}, true)[0].states

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

@@ -12,7 +12,10 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
       scope.submitted = true
       scope.errors = []
       if scope.new_customer_form.$valid
-        Customers.add(scope.email).$promise.then (data) ->
+        params =
+          enterprise_id: CurrentShop.shop.id
+          email: scope.email
+        Customers.add(params).$promise.then (data) ->
           if data.id
             scope.email = ""
             scope.submitted = false
@@ -21,7 +24,7 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
           if response.data.errors
             scope.errors.push(error) for error in response.data.errors
           else
-            scope.errors.push("Sorry! Could not create '#{scope.email}'")
+            scope.errors.push(t('js.customers.could_not_create') + " '#{scope.email}'")
       return
 
     # Compile modal template
@@ -35,4 +38,4 @@ angular.module("admin.customers").directive 'newCustomerDialog', ($compile, $tem
       if CurrentShop.shop.id
         template.dialog('open')
       else
-        alert('Please select a shop first')
+        alert(t('js.customers.select_shop'))

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

@@ -8,4 +8,4 @@ angular.module("ofn.admin").directive "datetimepicker", ->
       onSelect: (dateText, inst) ->
         scope.$apply (scope) ->
           # Fires ngModel.$parsers
-          ngModel.$setViewValue dateText
+          ngModel.$setViewValue dateText

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

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

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

@@ -2,7 +2,7 @@ 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>'
+      html = '<a href="' + url + '" class="delete-resource icon_link icon-trash no-text" data-action="remove" data-confirm="' + t('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_roles/enterprise_roles.js.coffee

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

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

@@ -1,13 +1,11 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, $window, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
+  .controller "enterpriseCtrl", ($scope, $http, $window, NavigationCheck, enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu, StatusMessage) ->
     $scope.Enterprise = enterprise
     $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
     $scope.navClear = NavigationCheck.clear
-    $scope.pristineEmail = $scope.Enterprise.email
     $scope.menu = SideMenu
-    $scope.newManager = { id: '', email: (t('add_manager')) }
-
+    $scope.newManager = { id: null, email: (t('add_manager')) }
     $scope.StatusMessage = StatusMessage
 
     $scope.$watch 'enterprise_form.$dirty', (newValue) ->
@@ -28,7 +26,7 @@ angular.module("admin.enterprises")
     # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
     # and on all new uses of this contoller, and we might not want that.
     enterpriseNavCallback = ->
-      if $scope.enterprise_form.$dirty
+      if $scope.enterprise_form != undefined && $scope.enterprise_form.$dirty
         t('admin.unsaved_confirm_leave')
 
     # Register the NavigationCheck callback
@@ -36,17 +34,33 @@ angular.module("admin.enterprises")
 
     $scope.removeManager = (manager) ->
       if manager.id?
+        if manager.id == $scope.Enterprise.owner.id or manager.id == parseInt($scope.receivesNotifications)
+          return
         for i, user of $scope.Enterprise.users when user.id == manager.id
           $scope.Enterprise.users.splice i, 1
-        if $scope.enterprise_form?
-          $scope.enterprise_form.$setDirty()
+          $scope.enterprise_form?.$setDirty()
 
     $scope.addManager = (manager) ->
-      if manager.id? and manager.email?
+      if manager.id? and angular.isNumber(manager.id) and manager.email?
         manager =
           id: manager.id
           email: manager.email
+          confirmed: manager.confirmed
         if (user for user in $scope.Enterprise.users when user.id == manager.id).length == 0
           $scope.Enterprise.users.push manager
+          $scope.enterprise_form?.$setDirty()
         else
           alert ("#{manager.email}" + " " + t("is_already_manager"))
+
+    $scope.inviteManager = ->
+      $scope.invite_errors = $scope.invite_success = null
+      email = $scope.newUser
+
+      $http.post("/admin/manager_invitations", {email: email, enterprise_id: $scope.Enterprise.id}).success (data)->
+          $scope.addManager({id: data.user, email: email})
+          $scope.invite_success = t('user_invited', email: email)
+        .error (data) ->
+          $scope.invite_errors = data.errors
+
+    $scope.resetModal = ->
+      $scope.newUser = $scope.invite_errors = $scope.invite_success = null

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

@@ -30,27 +30,27 @@ angular.module("admin.enterprises").controller 'enterprisesCtrl', ($scope, $q, E
     $scope.producerTextFor = (enterprise) ->
       switch enterprise.is_primary_producer
         when true
-          "Producer"
+          t('js.enterprises.producer')
         else
-          "Non-Producer"
+          t('js.enterprises.non_producer')
 
     $scope.packageTextFor = (enterprise) ->
       switch enterprise.is_primary_producer
         when true
           switch enterprise.sells
             when "none"
-              "Profile"
+              t('js.profile')
             when "own"
-              "Shop"
+              t('js.shop')
             when "any"
-              "Hub"
+              t('js.hub')
             else
-              "Choose"
+              t('js.choose')
         else
           switch enterprise.sells
             when "none"
-              "Profile"
+              t('js.profile')
             when "any"
-              "Hub"
+              t('js.hub')
             else
-              "Choose"
+              t('js.choose')

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

@@ -14,7 +14,7 @@ angular.module("admin.enterprises").controller 'indexPanelCtrl', ($scope, Enterp
       , (response) ->
         $scope.saving = false
         if response.status == 422 && response.data.errors?
-          message = 'Please resolve the following errors:\n'
+          message = t('js.resolve_errors') + ':\n'
           for attr, msg of response.data.errors
             message += "#{attr} #{msg}\n"
           alert(message)

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

@@ -22,7 +22,7 @@ angular.module("admin.enterprises")
       { name: 'users', label: t('users'), icon_class: "icon-user" }
     ]
 
-    $scope.select(0)
+    SideMenu.init()
 
     $scope.showItem = (item) ->
       if item.show?

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

@@ -0,0 +1,11 @@
+angular.module('admin.enterprises').directive 'enterpriseLimit', (InfoDialog) ->
+  restrict: 'A'
+  scope: {
+    limit_reached: '=enterpriseLimit',
+    modal_message: '@modalMessage'
+  }
+  link: (scope, element, attr) ->
+    element.bind 'click', (event)->
+      if scope.limit_reached
+        event.preventDefault()
+        InfoDialog.open 'error', scope.modal_message

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

@@ -1,7 +1,7 @@
 angular.module("admin.enterprises")
   .factory "EnterprisePaymentMethods", (enterprise, PaymentMethods) ->
     new class EnterprisePaymentMethods
-      paymentMethods: PaymentMethods.paymentMethods
+      paymentMethods: PaymentMethods.all
 
       constructor: ->
         for payment_method in @paymentMethods

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

@@ -1,7 +1,7 @@
 angular.module("admin.enterprises")
   .factory "EnterpriseShippingMethods", (enterprise, ShippingMethods) ->
     new class EnterpriseShippingMethods
-      shippingMethods: ShippingMethods.shippingMethods
+      shippingMethods: ShippingMethods.all
 
       constructor: ->
         for shipping_method in @shippingMethods

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

@@ -19,16 +19,16 @@ angular.module("admin.enterprises").factory 'PermalinkChecker', ($q, $http) ->
         if data.length > @MAX_PERMALINK_LENGTH || !data.match(/^[\w-]+$/)
           deferredRequest.resolve
             permalink: permalink
-            available: "Error"
+            available: t('js.error')
         else
           deferredRequest.resolve
             permalink: data
-            available: "Available"
+            available: t('available')
       ).error (data,status) =>
         if status == 409
           deferredRequest.resolve
             permalink: data
-            available: "Unavailable"
+            available: t('js.unavailable')
         else
           # Something went wrong or request was aborted
           deferredRequest.reject()

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

@@ -1,9 +0,0 @@
-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/index_utils.js.coffee

@@ -1 +1,2 @@
-angular.module("admin.indexUtils", ['admin.resources', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->
+angular.module("admin.indexUtils", ['admin.resources', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->
+  $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content");

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

@@ -1,14 +1,16 @@
 angular.module("admin.indexUtils").factory 'Panels', ->
   new class Panels
-    panels: []
+    all: []
 
     register: (ctrl, object, selected=null) ->
       if ctrl? && object?
-        @panels.push { ctrl: ctrl, object: object, selected: selected }
+        existing = @panelFor(object)
+        newPanel = { ctrl: ctrl, object: object, selected: selected }
+        if existing then angular.extend(existing, newPanel) else @all.push(newPanel)
         ctrl.select(selected) if selected?
 
     toggle: (object, name, state=null) ->
-      panel = @findPanelByObject(object)
+      panel = @panelFor(object)
       if panel.selected == name
         @select(panel, null) unless state == "open"
       else
@@ -18,5 +20,5 @@ angular.module("admin.indexUtils").factory 'Panels', ->
       panel.selected = name
       panel.ctrl.select(name)
 
-    findPanelByObject: (object) ->
-      (panel for panel in @panels when panel.object == object)[0]
+    panelFor: (object) ->
+      (@all.filter (panel) -> panel.object == object)[0]

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

@@ -6,7 +6,7 @@ angular.module("admin.indexUtils").factory "pendingChanges", ($q, resources, Sta
     add: (id, attr, change) =>
       @pendingChanges["#{id}"] = {} unless @pendingChanges.hasOwnProperty("#{id}")
       @pendingChanges["#{id}"]["#{attr}"] = change
-      StatusMessage.display('notice', "You have made #{@changeCount(@pendingChanges)} unsaved changes")
+      StatusMessage.display('notice', t('admin.unsaved_changes'))
 
     removeAll: =>
       @pendingChanges = {}
@@ -21,16 +21,16 @@ angular.module("admin.indexUtils").factory "pendingChanges", ($q, resources, Sta
     submitAll: (form=null) =>
       all = []
       @errors = []
-      StatusMessage.display('progress', "Saving...")
+      StatusMessage.display('progress', t('js.saving'))
       for id, objectChanges of @pendingChanges
         for attrName, change of objectChanges
           all.push @submit(change)
       $q.all(all).then =>
         if @errors.length == 0
-          StatusMessage.display('success', "All changes saved successfully")
+          StatusMessage.display('success', t('js.all_changes_saved_successfully'))
           form.$setPristine() if form?
         else
-          StatusMessage.display('failure', "Oh no! I was unable to save your changes")
+          StatusMessage.display('failure', t('js.oh_no'))
       all
 
     submit: (change) ->

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

@@ -10,7 +10,7 @@ angular.module("admin.indexUtils").factory "SpreeApiAuth", ($q, $http, SpreeApiK
           deferred.resolve()
 
       .error (response) ->
-        error = response?.error || "You are unauthorised to access this page."
+        error = response?.error || t('js.unauthorized')
         deferred.reject(error)
 
       deferred.promise

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

@@ -3,8 +3,8 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
   $scope.RequestMonitor = RequestMonitor
   $scope.filteredLineItems = []
   $scope.confirmDelete = true
-  $scope.startDate = formatDate daysFromToday -7
-  $scope.endDate = formatDate daysFromToday 1
+  $scope.startDate = moment().startOf('day').subtract(7, 'days').format('YYYY-MM-DD')
+  $scope.endDate = moment().startOf('day').format('YYYY-MM-DD')
   $scope.bulkActions = [ { name: t("admin.orders.bulk_management.actions_delete"), callback: 'deleteLineItems' } ]
   $scope.selectedUnitsProduct = {}
   $scope.selectedUnitsVariant = {}
@@ -22,16 +22,16 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.refreshData = ->
     unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
-      $scope.startDate = OrderCycles.byID[$scope.orderCycleFilter].first_order
-      $scope.endDate = OrderCycles.byID[$scope.orderCycleFilter].last_order
+      $scope.startDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_open_at).format('YYYY-MM-DD')
+      $scope.endDate = moment(OrderCycles.byID[$scope.orderCycleFilter].orders_close_at).startOf('day').format('YYYY-MM-DD')
 
-    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)}")
+    RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
+    RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gteq]": "#{moment($scope.startDate).format()}", "q[order][completed_at_lt]": "#{moment($scope.endDate).add(1,'day').format()}")
 
     unless $scope.initialized
-      RequestMonitor.load $scope.distributors = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
-      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{daysFromToday(-90)}")
-      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+      RequestMonitor.load $scope.distributors = Enterprises.index(action: "visible", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{moment().subtract(90,'days').format()}")
+      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "visible", 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.byID
@@ -51,13 +51,13 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
 
   $scope.$watch 'bulk_order_form.$dirty', (newVal, oldVal) ->
     if newVal == true
-      StatusMessage.display 'notice', "You have unsaved changes"
+      StatusMessage.display 'notice', t('js.unsaved_changes')
 
   $scope.submit = ->
     if $scope.bulk_order_form.$valid
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
       $q.all(LineItems.saveAll()).then(->
-        StatusMessage.display 'success', "All changes saved"
+        StatusMessage.display 'success', t('js.all_changes_saved')
         $scope.bulk_order_form.$setPristine()
       ).catch ->
         StatusMessage.display 'failure', t "unsaved_changes_error"
@@ -142,31 +142,3 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     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/order_cycles/controllers/create.js.coffee

@@ -1,10 +1,11 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminCreateOrderCycleCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, ocInstance, StatusMessage) ->
+  .controller 'AdminCreateOrderCycleCtrl', ($scope, $filter, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, 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.schedules = Schedules.index()
 
     $scope.OrderCycle = OrderCycle
     $scope.order_cycle = OrderCycle.new({ coordinator_id: ocInstance.coordinator_id})
@@ -12,10 +13,13 @@ angular.module('admin.orderCycles')
     $scope.StatusMessage = StatusMessage
 
     $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
+
+    $scope.$watch 'order_cycle_form.$valid', (isValid) ->
+      StatusMessage.setValidation(isValid)
 
     $scope.loaded = ->
-      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading
 
     $scope.suppliedVariants = (enterprise_id) ->
       Enterprise.suppliedVariants(enterprise_id)
@@ -81,9 +85,8 @@ angular.module('admin.orderCycles')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
       OrderCycle.create(destination)
 
     $scope.cancel = (destination) ->
       $window.location = destination
-

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

@@ -1,11 +1,12 @@
 angular.module('admin.orderCycles')
-  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+  .controller 'AdminEditOrderCycleCtrl', ($scope, $filter, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor) ->
     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.schedules = Schedules.index()
 
     $scope.OrderCycle = OrderCycle
     $scope.order_cycle = OrderCycle.load(order_cycle_id)
@@ -13,10 +14,13 @@ angular.module('admin.orderCycles')
     $scope.StatusMessage = StatusMessage
 
     $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
+
+    $scope.$watch 'order_cycle_form.$valid', (isValid) ->
+      StatusMessage.setValidation(isValid)
 
     $scope.loaded = ->
-      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+      Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading
 
     $scope.suppliedVariants = (enterprise_id) ->
       Enterprise.suppliedVariants(enterprise_id)
@@ -84,11 +88,11 @@ angular.module('admin.orderCycles')
 
     $scope.submit = (destination) ->
       $event.preventDefault()
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
 
     $scope.submit = ($event, destination) ->
       $event.preventDefault()
-      StatusMessage.display 'progress', "Saving..."
+      StatusMessage.display 'progress', t('js.saving')
       OrderCycle.update(destination, $scope.order_cycle_form)
 
     $scope.cancel = (destination) ->

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

@@ -0,0 +1,45 @@
+angular.module("admin.orderCycles").controller "OrderCyclesCtrl", ($scope, $q, Columns, StatusMessage, RequestMonitor, OrderCycles, Enterprises, Schedules, Dereferencer) ->
+  $scope.RequestMonitor = RequestMonitor
+  $scope.columns = Columns.columns
+  $scope.saveAll = -> OrderCycles.saveChanges($scope.order_cycles_form)
+  $scope.ordersCloseAtLimit = -31 # days
+  $scope.involvingFilter = 0
+  $scope.scheduleFilter = 0
+
+  compileData = ->
+    for schedule in $scope.schedules
+      Dereferencer.dereference(schedule.order_cycles, OrderCycles.byID)
+    for orderCycle in $scope.orderCycles
+      coordinator = Enterprises.byID[orderCycle.coordinator.id]
+      orderCycle.coordinator = coordinator if coordinator?
+      Dereferencer.dereference(orderCycle.producers, Enterprises.byID)
+      Dereferencer.dereference(orderCycle.shops, Enterprises.byID)
+      Dereferencer.dereference(orderCycle.schedules, Schedules.byID)
+      orderCycle.involvedEnterpriseIDs = [orderCycle.coordinator.id]
+      orderCycle.producerNames = orderCycle.producers.map((producer) -> orderCycle.involvedEnterpriseIDs.push(producer.id); producer.name).join(", ")
+      orderCycle.shopNames = orderCycle.shops.map((shop) -> orderCycle.involvedEnterpriseIDs.push(shop.id); shop.name).join(", ")
+
+  # NOTE: this is using the Enterprises service from the admin.enterprises module
+  RequestMonitor.load ($scope.enterprises = Enterprises.index(action: "visible", ams_prefix: "basic")).$promise
+  $scope.schedules = Schedules.index()
+  $scope.orderCycles = OrderCycles.index(ams_prefix: "index", "q[orders_close_at_gt]": "#{daysFromToday($scope.ordersCloseAtLimit)}")
+  RequestMonitor.load $q.all([$scope.enterprises.$promise, $scope.schedules.$promise, $scope.orderCycles.$promise]).then -> compileData()
+
+  $scope.$watch 'order_cycles_form.$dirty', (newVal, oldVal) ->
+    StatusMessage.display 'notice', "You have unsaved changes" if newVal
+
+  $scope.showMore = (days) ->
+    $scope.ordersCloseAtLimit -= days
+    existingIDs = Object.keys(OrderCycles.byID)
+    orderCycles = OrderCycles.index(ams_prefix: "index", "q[orders_close_at_gt]": "#{daysFromToday($scope.ordersCloseAtLimit)}", "q[id_not_in][]": existingIDs)
+    orderCycles.$promise.then ->
+      $scope.orderCycles.push(orderCycle) for orderCycle in orderCycles
+      compileData()
+
+daysFromToday = (days) ->
+  now = new Date
+  now.setHours(0)
+  now.setMinutes(0)
+  now.setSeconds(0)
+  now.setDate( now.getDate() + days )
+  now

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

@@ -1,6 +1,7 @@
-angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, ocInstance) ->
+angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage, Schedules, RequestMonitor, ocInstance) ->
   $scope.StatusMessage = StatusMessage
   $scope.OrderCycle = OrderCycle
+  $scope.schedules = Schedules.index()
   $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) =>
@@ -8,7 +9,10 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl"
     $scope.enterprise_fees = EnterpriseFee.index(coordinator_id: ocInstance.coordinator_id)
 
   $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
+
+  $scope.$watch 'order_cycle_form.$valid', (isValid) ->
+    StatusMessage.setValidation(isValid)
 
   $scope.init = (enterprises) ->
     enterprise = enterprises[Object.keys(enterprises)[0]]
@@ -23,7 +27,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl"
     OrderCycle.order_cycle.coordinator_id = enterprise.id
 
   $scope.loaded = ->
-    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading
 
   $scope.removeDistributionOfVariant = angular.noop
 
@@ -46,7 +50,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl"
 
   $scope.submit = ($event, destination) ->
     $event.preventDefault()
-    StatusMessage.display 'progress', "Saving..."
+    StatusMessage.display 'progress', t('js.saving')
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.create(destination)
 

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

@@ -1,19 +1,23 @@
-angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, StatusMessage) ->
+angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Schedules, RequestMonitor, 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.schedules = Schedules.index()
   $scope.OrderCycle = OrderCycle
   $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
     $scope.init()
 
   $scope.$watch 'order_cycle_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+      StatusMessage.display 'notice', t("admin.unsaved_changes") if newValue
+
+  $scope.$watch 'order_cycle_form.$valid', (isValid) ->
+    StatusMessage.setValidation(isValid)
 
   $scope.loaded = ->
-    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded && !RequestMonitor.loading
 
   $scope.init = ->
     $scope.outgoing_exchange = OrderCycle.order_cycle.outgoing_exchanges[0]
@@ -39,7 +43,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl",
 
   $scope.submit = ($event, destination) ->
     $event.preventDefault()
-    StatusMessage.display 'progress', "Saving..."
+    StatusMessage.display 'progress', t('js.saving')
     OrderCycle.mirrorIncomingToOutgoingProducts()
     OrderCycle.update(destination, $scope.order_cycle_form)
 

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

@@ -0,0 +1,26 @@
+angular.module("admin.orderCycles").directive 'orderCyclesSelector', ($timeout, OrderCycles) ->
+  restrict: 'C'
+  templateUrl: 'admin/order_cycles_selector.html'
+  link: (scope, element, attr) ->
+    scope.orderCycles = OrderCycles.all.filter (oc) -> oc.viewing_as_coordinator
+
+    $timeout ->
+      scope.selections =
+        available: scope.availableOrderCycles[0]
+        selected: scope.selectedOrderCycles[0]
+
+    scope.add = (orderCycle) ->
+      orderCycle ?= scope.selections.available
+      index = scope.availableOrderCycles.indexOf(orderCycle)
+      if index > -1
+        scope.selectedOrderCycles.push orderCycle
+        scope.selections.available = scope.availableOrderCycles[index+1] || scope.availableOrderCycles[index-1]
+        scope.selections.selected = orderCycle
+
+    scope.remove = (orderCycle) ->
+      orderCycle ?= scope.selections.selected
+      index = scope.selectedOrderCycles.indexOf(orderCycle)
+      if index > -1
+        scope.selectedOrderCycles.splice(index, 1)
+        scope.selections.selected = scope.selectedOrderCycles[index] || scope.selectedOrderCycles[index-1]
+        scope.selections.available = orderCycle

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

@@ -0,0 +1,63 @@
+angular.module("admin.orderCycles").directive 'scheduleDialog', ($window, $compile, $injector, $templateCache, DialogDefaults, OrderCycles, Schedules) ->
+  restrict: 'A'
+  scope:
+    scheduleId: '@'
+    showMore: '&'
+  link: (scope, element, attr) ->
+    # Link opening of dialog to click event on element
+    element.bind 'click', (e) ->
+      existing = Schedules.byID[scope.scheduleId]
+      scope.schedule =
+        id: existing?.id
+        name: existing?.name || ''
+        order_cycle_ids: existing?.order_cycle_ids || []
+      scope.selectedOrderCycles = []
+      scope.selectedOrderCycles.push orderCycle for orderCycle in (existing?.order_cycles || [])
+      scope.submitted = false
+      scope.errors = []
+      # Compile modal template
+      scope.template = $compile($templateCache.get('admin/schedule_dialog.html'))(scope)
+      # Set Dialog options
+      settings = angular.copy(DialogDefaults)
+      scope.template.dialog(angular.extend(settings,{width: $window.innerWidth * 0.6}))
+      scope.template.dialog(close: -> scope.template.remove())
+      scope.template.dialog('open')
+
+    scope.close = ->
+      scope.template.dialog('close')
+      return
+
+    scope.delete = ->
+      if confirm(t('are_you_sure'))
+        Schedules.remove(scope.schedule).$promise.then (data) ->
+          scope.close()
+        , (response) ->
+          errors = response.data.errors
+          if errors?
+            scope.errors.push errors[0]
+          else
+            scope.errors.push "Could not delete schedule: #{scope.schedule.name}"
+
+
+    scope.loadMore = ->
+      scope.showMore().then ->
+        scope.availableOrderCycles = (orderCycle for id, orderCycle of OrderCycles.byID when orderCycle.id not in scope.schedule.order_cycle_ids)
+
+    scope.submit = ->
+      scope.schedule_form.$setPristine()
+      scope.submitted = true
+      scope.errors = []
+      return scope.errors.push(t('admin.order_cycles.index.no_order_cycles_error')) unless scope.selectedOrderCycles.length > 0
+      scope.schedule.order_cycle_ids = scope.selectedOrderCycles.map (oc) -> oc.id
+      if scope.schedule_form.$valid
+        method = if scope.schedule.id? then Schedules.update else Schedules.add
+        method(scope.schedule).$promise.then (data) ->
+          if data.id
+            scope.submitted = false
+            scope.template.dialog('close')
+        , (response) ->
+          if response.data.errors
+            scope.errors.push(error) for error in response.data.errors
+          else
+            scope.errors.push("Sorry! Could not create '#{scope.name}'")
+      return

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

@@ -0,0 +1,15 @@
+angular.module("admin.orderCycles").directive 'scheduleList', (RequestMonitor, Schedules) ->
+  restrict: 'E'
+  scope:
+    orderCycle: '='
+  template: "<div><span ng-repeat='schedule in schedules'>{{ schedule.name + ($last ? '' : ', ')}}</span></div>"
+  link: (scope, element, attr) ->
+    scope.schedules = []
+
+    scope.$watchCollection 'orderCycle.schedule_ids', (newValue, oldValue) ->
+      return unless  newValue? && RequestMonitor.loadId > 0 # Request for schedules needs to have been sent
+      scope.schedules = []
+      RequestMonitor.loadQueue.then ->
+        for id in scope.orderCycle.schedule_ids
+          schedule = Schedules.byID[id]
+          scope.schedules.push schedule if schedule?

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

@@ -0,0 +1,7 @@
+angular.module("admin.orderCycles").filter "available", ($filter) ->
+  return (orderCycles, selectedOrderCycles) ->
+    return orderCycles unless selectedOrderCycles?.length > 0
+    $filter('filter')(orderCycles, (orderCycle) ->
+      (selectedOrderCycles.indexOf(orderCycle) == -1) &&
+      (orderCycle.coordinator.id == selectedOrderCycles[0].coordinator.id)
+    )

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

@@ -0,0 +1,6 @@
+angular.module("admin.orderCycles").filter "involving", ($filter) ->
+  return (orderCycles, enterpriseID) ->
+    return orderCycles if enterpriseID == 0
+    $filter('filter')(orderCycles, (orderCycle) ->
+      enterpriseID in orderCycle.involvedEnterpriseIDs
+    )

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

@@ -0,0 +1,6 @@
+angular.module("admin.orderCycles").filter "schedule", ($filter) ->
+  return (orderCycles, scheduleID) ->
+    return orderCycles if scheduleID == 0
+    $filter('filter')(orderCycles, (orderCycle) ->
+      scheduleID in orderCycle.schedules.map (oc) -> oc.id
+    )

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

@@ -1,32 +0,0 @@
-angular.module('admin.orderCycles', ['admin.utils', 'admin.indexUtils', 'ngTagsInput'])
-
-  .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/order_cycles.js.erb.coffee

@@ -0,0 +1,37 @@
+angular.module('admin.orderCycles', ['ngTagsInput', 'admin.indexUtils', 'admin.enterprises'])
+
+  .config ($httpProvider) ->
+    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
+
+  .directive 'datetimepicker', ($timeout, $parse) ->
+    require: "ngModel"
+    link: (scope, element, attrs, ngModel) ->
+      $timeout ->
+        # 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(->
+              element.val(dateText)
+        	    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/order_cycle.js.coffee

@@ -151,27 +151,32 @@ angular.module('admin.orderCycles').factory 'OrderCycle', ($resource, $window, S
       return unless @confirmNoDistributors()
       oc = new OrderCycleResource({order_cycle: this.dataForSubmit()})
       oc.$create (data) ->
-        if data['success']
-          $window.location = destination
+        $window.location = destination
+      , (response) ->
+        if response.data.errors?
+          StatusMessage.display('failure', response.data.errors[0])
         else
-          console.log('Failed to create order cycle')
+          StatusMessage.display('failure', 'Failed to create order cycle')
 
     update: (destination, form) ->
       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']
-          form.$setPristine() if form
-          if destination?
-            $window.location = destination
-          else
-            StatusMessage.display 'success', 'Your order cycle has been updated.'
+        form.$setPristine() if form
+        if destination?
+          $window.location = destination
         else
-          console.log('Failed to update order cycle')
+          StatusMessage.display 'success', t('js.order_cycles.update_success')
+      , (response) ->
+        if response.data.errors?
+          StatusMessage.display('failure', response.data.errors[0])
+        else
+          StatusMessage.display('failure', 'Failed to create 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?'
+        confirm t('js.order_cycles.no_distributors')
       else
         true
 

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

@@ -1,5 +1,7 @@
 angular.module("admin.orders").directive 'customerSearchOverride', ->
   restrict: 'C'
+  scope:
+    distributorId: '@'
   link: (scope, element, attr) ->
     formatCustomerResult = (customer) ->
       customerTemplate
@@ -9,13 +11,14 @@ angular.module("admin.orders").directive 'customerSearchOverride', ->
 
     element.select2
       placeholder: Spree.translations.choose_a_customer
+      minimumInputLength: 3
       ajax:
         url: '/admin/search/customers.json'
         datatype: 'json'
         data: (term, page) ->
           {
             q: term
-            distributor_id: $('#distributor_id').val()  # modified
+            distributor_id: scope.distributorId  # modified
           }
         results: (data, page) ->
           { results: data }

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

@@ -0,0 +1,18 @@
+angular.module("admin.paymentMethods").controller "StripeController", ($scope, $http, shops) ->
+  $scope.shops = shops
+  $scope.stripe_account = {}
+
+  $scope.$watch "paymentMethod.preferred_enterprise_id", (newID, oldID) ->
+    return unless newID?
+    $scope.stripe_account = {}
+    $http.get("/admin/stripe_accounts/status.json?enterprise_id=#{newID}").success (data) ->
+      angular.extend($scope.stripe_account, data)
+    .error (response) ->
+      $scope.stripe_account.status = "request_failed"
+
+  $scope.current_enterprise_stripe_path = ->
+    return unless $scope.paymentMethod.preferred_enterprise_id?
+    permalink = shops.filter((shop) ->
+      shop.id == $scope.paymentMethod.preferred_enterprise_id
+    )[0].permalink
+    "/admin/enterprises/#{permalink}/edit#/payment_methods"

app/assets/javascripts/admin/payments/new.js

@@ -0,0 +1,33 @@
+// Override of Spree's logic in the file of the same name
+// Changes made as per https://github.com/spree/spree/commit/8a3a80b08abf80fbed2fcee4b429ba1caf68baf1
+// which allows the form partial in admin/payments/new to be switched using radio buttons
+// We can remove this file when we reach 2.3.0
+
+$(document).ready(function() {
+  if ($("#new_payment").is("*")) {
+    $('.payment_methods_radios').click(
+      function() {
+        $('.payment-methods').hide();
+        if (this.checked) {
+          $('#payment_method_' + this.value).show();
+        }
+      }
+    );
+
+    $('.payment_methods_radios').each(
+      function() {
+        if (this.checked) {
+          $('#payment_method_' + this.value).show();
+        } else {
+          $('#payment_method_' + this.value).hide();
+        }
+      }
+    );
+
+    $(".card_new").radioControlsVisibilityOfElement('.card_form');
+
+    $('select.jump_menu').change(function(){
+      window.location = this.options[this.selectedIndex].value;
+    });
+  }
+});

app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee

@@ -1,8 +1,7 @@
 angular.module("ofn.admin").controller "ImportOptionsFormCtrl", ($scope, $rootScope, ProductImportService) ->
 
   $scope.toggleResetAbsent = () ->
-    confirmed = confirm 'This will set stock level to zero on all products for this \n' +
-      'enterprise that are not present in the uploaded file.' if $scope.resetAbsent
+    confirmed = confirm t('js.product_import.confirmation') if $scope.resetAbsent
 
     if confirmed or !$scope.resetAbsent
       ProductImportService.updateResetAbsent($scope.supplierId, $scope.resetCount, $scope.resetAbsent)

app/assets/javascripts/admin/products/controllers/edit_units_controller.js.coffee

@@ -0,0 +1,24 @@
+angular.module("admin.products").controller "editUnitsCtrl", ($scope, VariantUnitManager) ->
+
+  $scope.product =
+    variant_unit: angular.element('#variant_unit').val()
+    variant_unit_scale: angular.element('#variant_unit_scale').val()
+
+  $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
+
+  if $scope.product.variant_unit == 'items'
+    $scope.variant_unit_with_scale = 'items'
+  else
+    $scope.variant_unit_with_scale = $scope.product.variant_unit + '_' + $scope.product.variant_unit_scale
+
+  $scope.setFields = ->
+    if $scope.variant_unit_with_scale == 'items'
+      variant_unit = 'items'
+      variant_unit_scale = null
+    else
+      options = $scope.variant_unit_with_scale.split('_')
+      variant_unit = options[0]
+      variant_unit_scale = options[1]
+
+    $scope.product.variant_unit = variant_unit
+    $scope.product.variant_unit_scale = variant_unit_scale

app/assets/javascripts/admin/products/controllers/product_image_controller.js.coffee

@@ -0,0 +1,6 @@
+angular.module("ofn.admin").controller "ProductImageCtrl", ($scope, ProductImageService) ->
+  $scope.imageUploader = ProductImageService.imageUploader
+  $scope.imagePreview = ProductImageService.imagePreview
+
+  $scope.$watch 'product.image_url', (newValue) ->
+    $scope.imagePreview = newValue if newValue

app/assets/javascripts/admin/products/controllers/variant_units_controller.js.coffee

@@ -0,0 +1,14 @@
+angular.module("admin.products").controller "variantUnitsCtrl", ($scope, VariantUnitManager, $timeout) ->
+
+  $scope.unitName = (scale, type) ->
+    VariantUnitManager.getUnitName(scale, type)
+
+  $scope.scale = angular.element('#product_variant_unit_scale').val()
+
+  $scope.updateValue = ->
+    unit_value_human = angular.element('#unit_value_human').val()
+    $scope.unit_value = unit_value_human * $scope.scale
+
+  variant_unit_value = angular.element('#variant_unit_value').val()
+  $scope.unit_value_human = variant_unit_value / $scope.scale
+  $timeout -> $scope.updateValue()

app/assets/javascripts/admin/products/directives/image_modal.js.coffee

@@ -0,0 +1,6 @@
+angular.module("ofn.admin").directive "imageModal", ($modal, ProductImageService) ->
+  restrict: 'C'
+  link: (scope, elem, attrs, ctrl) ->
+    elem.on "click", (ev) =>
+      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/image_upload.html', controller: ctrl, scope: scope, windowClass: 'product-image-upload')
+      ProductImageService.configure(scope.product)

app/assets/javascripts/admin/products/services/product_image_service.js.coffee

@@ -0,0 +1,15 @@
+angular.module("ofn.admin").factory "ProductImageService", (FileUploader, SpreeApiKey) ->
+  new class ProductImageService
+    imagePreview: null
+
+    imageUploader: new FileUploader
+      headers:
+        'X-Spree-Token': SpreeApiKey
+      autoUpload: true
+
+    configure: (product) =>
+      @imageUploader.url = "/api/product_images/#{product.id}"
+      @imagePreview = product.image_url
+      @imageUploader.onSuccessItem = (image, response) =>
+        product.thumb_url = response.thumb_url
+        product.image_url = response.image_url

app/assets/javascripts/admin/products/services/variant_unit_manager.js.coffee

@@ -12,11 +12,10 @@ angular.module("admin.products").factory "VariantUnitManager", ->
 
     @variantUnitOptions: ->
       options = for unit_type, scale_with_name of @unitNames
-        unit_type_cap = unit_type[0].toUpperCase() + unit_type[1..-1]
         for scale in @unitScales(unit_type)
           name = @getUnitName(scale, unit_type)
-          ["#{unit_type_cap} (#{name})", "#{unit_type}_#{scale}"]
-      options.push [['Items', 'items']]
+          ["#{I18n.t(unit_type)} (#{name})", "#{unit_type}_#{scale}"]
+      options.push [[I18n.t('items'), 'items']]
       [].concat options...
 
     @getScale: (value, unitType) ->

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

@@ -1,5 +1,5 @@
 angular.module("admin.resources").factory 'LineItemResource', ($resource) ->
-  $resource('/admin/:orders/:order_number/line_items/:id.json', {}, {
+  $resource('/admin/bulk_line_items/:id.json', {}, {
     'index':
       method: 'GET'
       isArray: true

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

@@ -5,4 +5,9 @@ angular.module("admin.resources").factory 'OrderCycleResource', ($resource) ->
       isArray: true
     'update':
       method: 'PUT'
+    'bulkUpdate':
+      method: 'POST'
+      isArray: true
+      params:
+        action: 'bulk_update'
   })

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

@@ -0,0 +1,16 @@
+angular.module("admin.resources").factory 'ScheduleResource', ($resource) ->
+  $resource('/admin/schedules/:id/:action.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+    'create':
+      method: 'POST'
+    'update':
+      method: 'PUT'
+      params:
+        id: '@id'
+    'destroy':
+      method: 'DELETE'
+      params:
+        id: '@id'
+  })

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

@@ -1,13 +1,14 @@
-angular.module("admin.resources").factory "Customers", ($q, InfoDialog, RequestMonitor, CustomerResource, CurrentShop) ->
+angular.module("admin.resources").factory "Customers", ($q, $injector, InfoDialog, RequestMonitor, CustomerResource) ->
   new class Customers
     all: []
     byID: {}
     pristineByID: {}
 
-    add: (email) ->
-      params =
-        enterprise_id: CurrentShop.shop.id
-        email: email
+    constructor: ->
+      if $injector.has('customers')
+        @load($injector.get('customers'))
+
+    add: (params) ->
       CustomerResource.create params, (customer) =>
         if customer.id
           @all.unshift customer
@@ -24,7 +25,7 @@ angular.module("admin.resources").factory "Customers", ($q, InfoDialog, RequestM
         if errors?
           InfoDialog.open 'error', errors[0]
         else
-          InfoDialog.open 'error', "Could not delete customer: #{customer.email}"
+          InfoDialog.open 'error', t('js.resources.could_not_delete_customer') + ": #{customer.email}"
 
     index: (params) ->
       @clear()

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

@@ -26,7 +26,7 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
     save: (lineItem) ->
       deferred = $q.defer()
       lineItem.errors = {}
-      lineItem.$update({id: lineItem.id, orders: "orders", order_number: lineItem.order.number})
+      lineItem.$update({id: lineItem.id})
       .then( (data) =>
         @pristineByID[lineItem.id] = angular.copy(lineItem)
         deferred.resolve(data)
@@ -54,7 +54,7 @@ angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
 
     delete: (lineItem, callback=null) ->
       deferred = $q.defer()
-      lineItem.$delete({id: lineItem.id, orders: "orders", order_number: lineItem.order.number})
+      lineItem.$delete({id: lineItem.id})
       .then( (data) =>
         delete @byID[lineItem.id]
         delete @pristineByID[lineItem.id]

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

@@ -1,4 +1,4 @@
-angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCycleResource) ->
+angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCycleResource, RequestMonitor, StatusMessage) ->
   new class OrderCycles
     all: []
     byID: {}
@@ -8,14 +8,13 @@ angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCy
       if $injector.has('orderCycles')
         @load($injector.get('orderCycles'))
 
-    index: (params={}, callback=null) ->
-      OrderCycleResource.index params, (data) =>
-        @load(data)
-        (callback || angular.noop)(data)
-        data
+    index: (params={}) ->
+      request = OrderCycleResource.index params, (data) => @load(data)
+      RequestMonitor.load(request.$promise)
+      request
 
     load: (orderCycles) ->
-      for orderCycle in orderCycles
+      for orderCycle in orderCycles when orderCycle.id not in Object.keys(@byID)
         @all.push orderCycle
         @byID[orderCycle.id] = orderCycle
         @pristineByID[orderCycle.id] = angular.copy(orderCycle)
@@ -30,14 +29,44 @@ angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCy
         deferred.reject(response)
       deferred.promise
 
+    saveChanges: (form) ->
+      changed = {}
+      for id, orderCycle of @byID when not @saved(orderCycle)
+        changed[Object.keys(changed).length] = @changesFor(orderCycle)
+      if Object.keys(changed).length > 0
+        StatusMessage.display('progress', "Saving...")
+        OrderCycleResource.bulkUpdate { order_cycle_set: { collection_attributes: changed } }, (data) =>
+          for orderCycle in data
+            delete orderCycle.coordinator
+            delete orderCycle.producers
+            delete orderCycle.distributors
+            angular.extend(@byID[orderCycle.id], orderCycle)
+            angular.extend(@pristineByID[orderCycle.id], orderCycle)
+          form.$setPristine() if form?
+          StatusMessage.display('success', "Order cycles have been updated.")
+        , (response) =>
+          if response.data.errors?
+            StatusMessage.display('failure', response.data.errors[0])
+          else
+            StatusMessage.display('failure', "Oh no! I was unable to save your changes.")
+
     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.push attr if attr in @attrsToSave()
       changed
 
+    changesFor: (orderCycle) ->
+      changes = { id: orderCycle.id }
+      for attr, value of orderCycle when not angular.equals(value, @pristineByID[orderCycle.id][attr])
+        changes[attr] = orderCycle[attr] if attr in @attrsToSave()
+      changes
+
+    attrsToSave: ->
+      ['orders_open_at','orders_close_at']
+
     resetAttribute: (order_cycle, attribute) ->
       order_cycle[attribute] = @pristineByID[order_cycle.id][attribute]

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

@@ -1,7 +1,7 @@
 angular.module("admin.resources")
   .factory "PaymentMethods", ($injector) ->
     new class PaymentMethods
-      paymentMethods: []
+      all: []
       byID: {}
       pristineByID: {}
 
@@ -11,6 +11,6 @@ angular.module("admin.resources")
 
       load: (paymentMethods) ->
         for paymentMethod in paymentMethods
-          @paymentMethods.push paymentMethod
+          @all.push paymentMethod
           @byID[paymentMethod.id] = paymentMethod
           @pristineByID[paymentMethod.id] = angular.copy(paymentMethod)

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

@@ -0,0 +1,46 @@
+angular.module("admin.resources").factory "Schedules", ($q, $injector, RequestMonitor, ScheduleResource, OrderCycles, Dereferencer, StatusMessage) ->
+  new class Schedules
+    all: []
+    byID: {}
+
+    constructor: ->
+      if $injector.has('schedules')
+        @load($injector.get('schedules'))
+
+    load: (schedules) ->
+      for schedule in schedules
+        @all.push schedule
+        @byID[schedule.id] = schedule
+
+    add: (params) =>
+      ScheduleResource.create params, (schedule) =>
+        @byID[schedule.id] = schedule if schedule.id?
+        Dereferencer.dereference(schedule.order_cycles, OrderCycles.byID)
+        orderCycle.schedules.push(schedule) for orderCycle in schedule.order_cycles
+        StatusMessage.display 'success', "#{t('admin.order_cycles.index.created_schedule')}: '#{schedule.name}'"
+
+    update: (params) =>
+      ScheduleResource.update params, (schedule) =>
+        if schedule.id?
+          Dereferencer.dereference(schedule.order_cycles, OrderCycles.byID)
+          for orderCycle in @byID[schedule.id].order_cycles when orderCycle.id not in schedule.order_cycle_ids
+            if orderCycle.schedules # Only if we need to update the schedules
+              orderCycle.schedules.splice(i, 1) for s, i in orderCycle.schedules by -1 when s.id == schedule.id
+          for orderCycle in schedule.order_cycles when orderCycle.id not in @byID[schedule.id].order_cycle_ids
+            orderCycle.schedules.push(@byID[schedule.id])
+          angular.extend(@byID[schedule.id], schedule)
+          StatusMessage.display 'success', "#{t('admin.order_cycles.index.updated_schedule')}: '#{schedule.name}'"
+
+    remove: (schedule) ->
+      params = id: schedule.id
+      ScheduleResource.destroy params, =>
+        for orderCycle in @byID[schedule.id].order_cycles
+          if orderCycle.schedules # Only if we need to update the schedules
+            orderCycle.schedules.splice(i, 1) for s, i in orderCycle.schedules by -1 when s.id == schedule.id
+        delete @byID[schedule.id]
+        StatusMessage.display 'success', "#{t('admin.order_cycles.index.deleted_schedule')}: '#{schedule.name}'"
+
+    index: ->
+      request = ScheduleResource.index (data) => @load(data)
+      RequestMonitor.load(request.$promise)
+      request

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

@@ -1,7 +1,7 @@
 angular.module("admin.resources")
   .factory "ShippingMethods", ($injector) ->
     new class ShippingMethods
-      shippingMethods: []
+      all: []
       byID: {}
       pristineByID: {}
 
@@ -11,6 +11,6 @@ angular.module("admin.resources")
 
       load: (shippingMethods) ->
         for shippingMethod in shippingMethods
-          @shippingMethods.push shippingMethod
+          @all.push shippingMethod
           @byID[shippingMethod.id] = shippingMethod
           @pristineByID[shippingMethod.id] = angular.copy(shippingMethod)

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

@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher) ->
+angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher, $http) ->
   new class BulkProducts
     products: []
 
@@ -11,20 +11,14 @@ angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher)
       PagedFetcher.fetch url, (data) => @addProducts data.products
 
     cloneProduct: (product) ->
-      dataFetcher("/admin/products/" + product.permalink_live + "/clone.json").then (data) =>
-        # Ideally we would use Spree's built in respond_override helper here to redirect the
-        # user after a successful clone with .json in the accept headers
-        # However, at the time of writing there appears to be an issue which causes the
-        # respond_with block in the destroy action of Spree::Admin::Product to break
-        # when a respond_overrride for the clone action is used.
-        id = data.product.id
-        dataFetcher("/api/products/" + id + "?template=bulk_show").then (newProduct) =>
+      $http.post("/api/products/" + product.id + "/clone").success (data) =>
+        dataFetcher("/api/products/" + data.id + "?template=bulk_show").then (newProduct) =>
           @unpackProduct newProduct
           @insertProductAfter(product, newProduct)
 
-    updateVariantLists: (serverProducts, productsWithUnsavedVariants) ->
-      for product in productsWithUnsavedVariants
-        server_product = @findProductInList(product.id, serverProducts)
+    updateVariantLists: (serverProducts) ->
+      for server_product in serverProducts
+        product = @findProductInList(server_product.id, @products)
         product.variants = server_product.variants
         @loadVariantUnitValues product
 

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

@@ -1,6 +1,6 @@
 angular.module("ofn.admin").factory "ofnConfirmHandler", (pendingChanges, $compile, $q) ->
   return (scope, callback) ->
-    template = "<div id='dialog-div' style='padding: 10px'><h6>Unsaved changes currently exist, save now or ignore?</h6></div>"
+    template = "<div id='dialog-div' style='padding: 10px'><h6>" + t('js.services.unsaved_changes_message') + "</h6></div>"
     dialogDiv = $compile(template)(scope)
     return ->
       if pendingChanges.changeCount(pendingChanges.pendingChanges) > 0

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

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

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

@@ -1,9 +1,21 @@
 angular.module("admin.side_menu")
-  .factory "SideMenu", ->
+  .factory "SideMenu", ($location) ->
     new class SideMenu
       items: []
       selected: null
 
+
+      # Checks for path and uses it to set the view
+      # If no path, loads first view
+      init: =>
+        path = $location.path()?.match(/^\/\w+$/)?[0]
+        index = if path
+          name = path[1..]
+          @items.indexOf(@find_by_name(name))
+        else
+          0
+        @select(index)
+
       setItems: (items) =>
         @items = items
         item.visible = true for item in @items
@@ -13,6 +25,7 @@ angular.module("admin.side_menu")
           @selected.selected = false if @selected
           @selected = @items[index]
           @selected.selected = true
+          $location.path(@selected.name)
 
       find_by_name: (name) =>
         for item in @items when item.name is name

app/assets/javascripts/admin/subscriptions/controllers/address_controller.js.coffee

@@ -0,0 +1,26 @@
+angular.module("admin.subscriptions").controller "AddressController", ($scope, $filter, StatusMessage, availableCountries) ->
+  $scope.countries = availableCountries
+  $scope.statesFor = (country_id) ->
+    return [] unless country_id
+    $filter('filter')(availableCountries, {id: country_id})[0].states
+  $scope.billStates = $scope.statesFor($scope.subscription.bill_address.country_id)
+  $scope.shipStates = $scope.statesFor($scope.subscription.ship_address.country_id)
+
+  $scope.registerNextCallback 'address', ->
+    $scope.subscription_form.$submitted = true
+    if $scope.subscription_address_form.$valid
+      $scope.subscription_form.$setPristine()
+      StatusMessage.clear()
+      $scope.setView('products')
+    else
+      StatusMessage.display 'failure', t('admin.subscriptions.details.invalid_error')
+
+  $scope.registerBackCallback 'address', ->
+    StatusMessage.clear()
+    $scope.setView('details')
+
+  $scope.$watch 'subscription.bill_address.country_id', (newValue, oldValue) ->
+    $scope.billStates = $scope.statesFor(newValue) if newValue?
+
+  $scope.$watch 'subscription.ship_address.country_id', (newValue, oldValue) ->
+    $scope.shipStates = $scope.statesFor(newValue) if newValue?

app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee

@@ -0,0 +1,38 @@
+angular.module("admin.subscriptions").controller "DetailsController", ($scope, $http, CreditCardResource, StatusMessage) ->
+  $scope.cardRequired = false
+
+  $scope.registerNextCallback 'details', ->
+    $scope.subscription_form.$submitted = true
+    if $scope.subscription_details_form.$valid
+      $scope.subscription_form.$setPristine()
+      StatusMessage.clear()
+      $scope.setView('address')
+    else
+      StatusMessage.display 'failure', t('admin.subscriptions.details.invalid_error')
+
+  $scope.$watch "subscription.customer_id", (newValue, oldValue) ->
+    return if !newValue?
+    $scope.loadAddresses(newValue) unless $scope.subscription.id?
+    $scope.loadCreditCards(newValue)
+
+  $scope.$watch "subscription.payment_method_id", (newValue, oldValue) ->
+    return if !newValue?
+    paymentMethod = ($scope.paymentMethods.filter (pm) -> pm.id == newValue)[0]
+    return unless paymentMethod?
+    if paymentMethod.type == "Spree::Gateway::StripeConnect"
+      $scope.cardRequired = true
+    else
+      $scope.cardRequired = false
+      $scope.subscription.credit_card_id = null
+
+  $scope.loadAddresses = (customer_id) ->
+    $http.get("/admin/customers/#{customer_id}/addresses")
+    .success (response) =>
+      delete response.bill_address.id
+      delete response.ship_address.id
+      angular.extend($scope.subscription.bill_address, response.bill_address)
+      angular.extend($scope.subscription.ship_address, response.ship_address)
+      $scope.shipAddressFromBilling() unless response.ship_address.address1?
+
+  $scope.loadCreditCards = (customer_id) ->
+    $scope.creditCards = CreditCardResource.index(customer_id: customer_id)

app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee

@@ -0,0 +1,10 @@
+angular.module("admin.subscriptions").controller "OrderUpdateIssuesController", ($scope, OrderCycles) ->
+  $scope.proxyOrders = $scope.options.proxyOrders
+
+  $scope.orderCycleName = (id) ->
+    OrderCycles.byID[id].name
+
+  $scope.orderCycleCloses = (id) ->
+    closes_at = moment(OrderCycles.byID[id].orders_close_at)
+    text = if closes_at > moment() then t('js.closes') else t('js.closed')
+    "#{text} #{closes_at.fromNow()}"

app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee

@@ -0,0 +1,22 @@
+angular.module("admin.subscriptions").controller "OrdersPanelController", ($scope, OrderCycles) ->
+  $scope.subscription = $scope.object
+
+  $scope.cancelOrder = (order) ->
+    if confirm(t('are_you_sure'))
+      $scope.subscription.cancelOrder(order)
+
+  $scope.resumeOrder = (order) ->
+    if confirm(t('are_you_sure'))
+      $scope.subscription.resumeOrder(order)
+
+  $scope.orderCycleName = (id) ->
+    OrderCycles.byID[id].name
+
+  $scope.orderCycleCloses = (id) ->
+    oc = OrderCycles.byID[id]
+    return t('js.subscriptions.close_date_not_set') unless oc?.orders_close_at?
+    closes_at = moment(oc.orders_close_at)
+    text = if closes_at > moment() then t('js.subscriptions.closes') else t('js.subscription.closed')
+    "#{text} #{closes_at.fromNow()}"
+
+  $scope.stateText = (state) -> t("spree.order_state.#{state}")

app/assets/javascripts/admin/subscriptions/controllers/products_controller.js.coffee

@@ -0,0 +1,13 @@
+angular.module("admin.subscriptions").controller "ProductsController", ($scope, StatusMessage) ->
+  $scope.registerNextCallback 'products', ->
+    $scope.subscription_form.$submitted = true
+    if $scope.subscription.subscription_line_items.length > 0
+      $scope.subscription_form.$setPristine()
+      StatusMessage.clear()
+      $scope.setView('review')
+    else
+      StatusMessage.display 'failure', 'Please add at least one product'
+
+  $scope.registerBackCallback 'products', ->
+    StatusMessage.clear()
+    $scope.setView('address')

app/assets/javascripts/admin/subscriptions/controllers/products_panel_controller.js.coffee

@@ -0,0 +1,23 @@
+angular.module("admin.subscriptions").controller "ProductsPanelController", ($scope, Subscriptions, StatusMessage) ->
+  $scope.subscription = $scope.object
+  $scope.distributor_id = $scope.subscription.shop_id
+  $scope.saving = false
+
+  $scope.saved = ->
+    pristine = Subscriptions.pristineByID[$scope.subscription.id].subscription_line_items
+    return false unless angular.equals($scope.subscription.subscription_line_items, pristine)
+    true
+
+  $scope.save = ->
+    $scope.saving = true
+    StatusMessage.display 'progress', 'Saving...'
+    $scope.subscription.update().then (response) ->
+      $scope.saving = false
+      StatusMessage.display 'success', 'Saved'
+    , (response) ->
+      $scope.saving = false
+      if response.data?.errors?
+        keys = Object.keys(response.data.errors)
+        StatusMessage.display 'failure', response.data.errors[keys[0]][0]
+      else
+        StatusMessage.display 'success', 'Saved'

app/assets/javascripts/admin/subscriptions/controllers/review_controller.js.coffee

@@ -0,0 +1,8 @@
+angular.module("admin.subscriptions").controller "ReviewController", ($scope, Customers, Schedules, PaymentMethods, ShippingMethods) ->
+  $scope.formatAddress = (a) ->
+    formatted = []
+    formatted.push "#{a.firstname} #{a.lastname}"
+    formatted.push a.address1
+    formatted.push a.city
+    formatted.push a.zipcode
+    formatted.join(", ")

app/assets/javascripts/admin/subscriptions/controllers/subscription_controller.js.coffee

@@ -0,0 +1,27 @@
+angular.module("admin.subscriptions").controller "SubscriptionController", ($scope, Subscription, SubscriptionForm, Customers, Schedules, PaymentMethods, ShippingMethods) ->
+  $scope.subscription = new Subscription()
+  $scope.errors = null
+  $scope.save = null
+  $scope.customers = Customers.all
+  $scope.schedules = Schedules.all
+  $scope.paymentMethods = PaymentMethods.all
+  $scope.shippingMethods = ShippingMethods.all
+  $scope.distributor_id = $scope.subscription.shop_id # variant selector requires distributor_id
+  $scope.view = if $scope.subscription.id? then 'review' else 'details'
+  $scope.nextCallbacks = {}
+  $scope.backCallbacks = {}
+  $scope.creditCards = []
+  $scope.setView = (view) -> $scope.view = view
+  $scope.stepTitleFor = (step) -> t("admin.subscriptions.steps.#{step}")
+  $scope.registerNextCallback = (view, callback) => $scope.nextCallbacks[view] = callback
+  $scope.registerBackCallback = (view, callback) => $scope.backCallbacks[view] = callback
+  $scope.next = -> $scope.nextCallbacks[$scope.view]()
+  $scope.back = -> $scope.backCallbacks[$scope.view]()
+
+  $scope.shipAddressFromBilling = =>
+    angular.extend($scope.subscription.ship_address, $scope.subscription.bill_address)
+
+  $scope.$watch 'subscription_form', ->
+    form = new SubscriptionForm($scope.subscription_form, $scope.subscription)
+    $scope.errors = form.errors
+    $scope.save = form.save

app/assets/javascripts/admin/subscriptions/controllers/subscription_line_items_controller.js.coffee

@@ -0,0 +1,24 @@
+angular.module("admin.subscriptions").controller "SubscriptionLineItemsController", ($scope, InfoDialog) ->
+  $scope.newItem = { variant_id: 0, quantity: 1 }
+
+  $scope.addSubscriptionLineItem = ->
+    match = $scope.match()
+    if match
+      if match._destroy
+        angular.extend(match, $scope.newItem)
+        delete match._destroy
+      else
+        InfoDialog.open 'error', t('admin.subscriptions.product_already_in_order')
+    else
+      $scope.subscription_form.$setDirty()
+      $scope.subscription.buildItem($scope.newItem)
+
+  $scope.removeSubscriptionLineItem = (item) ->
+    $scope.subscription_form.$setDirty()
+    $scope.subscription.removeItem(item)
+
+  $scope.match = ->
+    matching = $scope.subscription.subscription_line_items.filter (sli) ->
+      sli.variant_id == $scope.newItem.variant_id
+    return matching[0] if matching.length > 0
+    null

app/assets/javascripts/admin/subscriptions/controllers/subscriptions_controller.js.coffee

@@ -0,0 +1,20 @@
+angular.module("admin.subscriptions").controller "SubscriptionsController", ($scope, Subscriptions, Columns, RequestMonitor, shops, ShippingMethods, PaymentMethods) ->
+  $scope.columns = Columns.columns
+  $scope.shops = shops
+  $scope.shop_id = if shops.length == 1 then shops[0].id else null
+  $scope.shippingMethodsByID = ShippingMethods.byID
+  $scope.paymentMethodsByID = PaymentMethods.byID
+  $scope.RequestMonitor = RequestMonitor
+  $scope.query = ''
+
+  $scope.$watch "shop_id", ->
+    if $scope.shop_id?
+      $scope.subscriptions = Subscriptions.index("q[shop_id_eq]": $scope.shop_id, "q[canceled_at_null]": true)
+
+  $scope.itemCount = (subscription) ->
+    subscription.subscription_line_items.reduce (sum, sli) ->
+      return sum + sli.quantity
+    , 0
+
+  $scope.filtersApplied = ->
+    $scope.query != ''

app/assets/javascripts/admin/subscriptions/directives/confirm_order_edit.js.coffee

@@ -0,0 +1,9 @@
+# Used to display a message before redirecting to a link
+angular.module("admin.subscriptions").directive "confirmOrderEdit", (ConfirmDialog, $window) ->
+  restrict: "A"
+  link: (scope, element, attrs) ->
+    element.bind "click", (event) ->
+      unless scope.proxyOrder.order_id?
+        event.preventDefault()
+        ConfirmDialog.open('error', t('admin.subscriptions.orders.confirm_edit'), {confirm: t('admin.subscriptions.yes_i_am_sure')}).then ->
+          $window.open(attrs.href)

app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee

@@ -0,0 +1,28 @@
+angular.module("admin.subscriptions").directive 'newSubscriptionDialog', ($compile, $window, $templateCache, DialogDefaults, shops) ->
+  restrict: 'A'
+  scope: true
+  link: (scope, element, attr) ->
+    scope.submitted = false
+    scope.shops = shops
+    scope.shop_id = null
+
+    scope.newSubscription = ->
+      scope.new_subscription_form.$setPristine()
+      scope.submitted = true
+      if scope.shop_id?
+        $window.location.href = "/admin/subscriptions/new?subscription[shop_id]=#{scope.shop_id}"
+      return
+
+    # Compile modal template
+    template = $compile($templateCache.get('admin/new_subscription_dialog.html'))(scope)
+
+    # Set Dialog options
+    template.dialog(DialogDefaults)
+
+    # Link opening of dialog to click event on element
+    element.bind 'click', (e) ->
+      if shops.length == 1
+        scope.shop_id = shops[0].id
+        scope.newSubscription()
+      else
+        template.dialog('open')

app/assets/javascripts/admin/subscriptions/services/credit_card_resource.js.coffee

@@ -0,0 +1,5 @@
+angular.module("admin.subscriptions").factory 'CreditCardResource', ($resource) ->
+  resource = $resource '/admin/customers/:customer_id/cards.json', {},
+    'index':
+      method: 'GET'
+      isArray: true

app/assets/javascripts/admin/subscriptions/services/subscription.js.coffee

@@ -0,0 +1,6 @@
+angular.module("admin.subscriptions").factory "Subscription", ($injector, SubscriptionResource) ->
+  class Subscription extends SubscriptionResource
+
+    constructor: ->
+      if $injector.has('subscription')
+        angular.extend(@, $injector.get('subscription'))

app/assets/javascripts/admin/subscriptions/services/subscription_actions.js.coffee

@@ -0,0 +1,77 @@
+# Wrapper for actions provided by ngResource
+# Used to extend the prototype of the subscription resource created by SubscriptionResource
+
+angular.module("admin.subscriptions").factory 'SubscriptionActions', ($http, $injector, $q, InfoDialog, ConfirmDialog) ->
+  buildItem: (item) ->
+    return false unless item.variant_id > 0
+    return false unless item.quantity > 0
+    data = angular.extend({}, item, { shop_id: @shop_id, schedule_id: @schedule_id })
+    $http.post("/admin/subscription_line_items/build", data).then (response) =>
+      @subscription_line_items.push response.data
+    , (response) =>
+      InfoDialog.open 'error', response.data.errors[0]
+
+  removeItem: (item) ->
+    item._destroy = true
+
+  create: ->
+    @$save().then (response) =>
+      $injector.get('Subscriptions').afterCreate(@id) if $injector.has('Subscriptions')
+      $q.resolve(response)
+    , (response) => $q.reject(response)
+
+  update: ->
+    @$update().then (response) =>
+      $injector.get('Subscriptions').afterUpdate(@id) if $injector.has('Subscriptions')
+      orders_with_issues = @not_closed_proxy_orders.filter((po) -> po.update_issues.length > 0)
+      if orders_with_issues.length > 0
+        InfoDialog.open('error', null, 'admin/order_update_issues_dialog.html', { proxyOrders: orders_with_issues})
+        return $q.reject(response)
+      $q.resolve(response)
+    , (response) => $q.reject(response)
+
+  cancel: ->
+    ConfirmDialog.open('error', t('admin.subscriptions.confirm_cancel_msg'), {cancel: t('back'), confirm: t('admin.subscriptions.yes_i_am_sure')})
+    .then =>
+      @$cancel().then angular.noop, (response) =>
+        if response.data?.errors?.open_orders?
+          options = {cancel: t('admin.subscriptions.no_keep_them'), confirm: t('admin.subscriptions.yes_cancel_them')}
+          ConfirmDialog.open('error', response.data.errors.open_orders, options)
+          .then (=> @$cancel(open_orders: 'cancel')), (=> @$cancel(open_orders: 'keep'))
+        else
+          InfoDialog.open 'error', t('admin.subscriptions.cancel_failure_msg')
+
+  pause: ->
+    ConfirmDialog.open('error', t('admin.subscriptions.confirm_pause_msg'), {confirm: t('admin.subscriptions.yes_i_am_sure')})
+    .then =>
+      @$pause().then angular.noop, (response) =>
+        if response.data?.errors?.open_orders?
+          options = {cancel: t('admin.subscriptions.no_keep_them'), confirm: t('admin.subscriptions.yes_cancel_them')}
+          ConfirmDialog.open('error', response.data.errors.open_orders, options)
+          .then (=> @$pause(open_orders: 'cancel')), (=> @$pause(open_orders: 'keep'))
+        else
+          InfoDialog.open 'error', t('admin.subscriptions.pause_failure_msg')
+
+  unpause: ->
+    ConfirmDialog.open('error', t('admin.subscriptions.confirm_unpause_msg'), {confirm: t('admin.subscriptions.yes_i_am_sure')})
+    .then =>
+      @$unpause().then angular.noop, (response) =>
+        if response.data?.errors?.canceled_orders?
+          InfoDialog.open('info', response.data.errors.canceled_orders)
+            .then (=> @$unpause(canceled_orders: 'notified'))
+        else
+          InfoDialog.open 'error', t('admin.subscriptions.unpause_failure_msg')
+
+  cancelOrder: (order) ->
+    if order.id?
+      $http.put("/admin/proxy_orders/#{order.id}/cancel").then (response) =>
+        angular.extend(order,response.data)
+      , (response) ->
+        InfoDialog.open 'error', response.data.errors[0]
+
+  resumeOrder: (order) ->
+    if order.id?
+      $http.put("/admin/proxy_orders/#{order.id}/resume").then (response) =>
+        angular.extend(order,response.data)
+      , (response) ->
+        InfoDialog.open 'error', response.data.errors[0]

app/assets/javascripts/admin/subscriptions/services/subscription_form.js.coffee

@@ -0,0 +1,35 @@
+angular.module("admin.subscriptions").factory 'SubscriptionForm', ($window, StatusMessage) ->
+  class SubscriptionForm
+    form: null
+    subscription: null
+    errors: {}
+
+    constructor: (form, subscription) ->
+      @form = form
+      @subscription = subscription
+
+    save: =>
+      return @formInvalid() unless @form.$valid
+      delete @errors[k] for k, v of @errors
+      @form.$setPristine()
+      StatusMessage.display 'progress', 'Saving...'
+      if @subscription.id?
+        @subscription.update().then @successCallback, @errorCallback
+      else
+        @subscription.create().then @successCallback, @errorCallback
+
+    successCallback: (response) =>
+      StatusMessage.display 'success', 'Saved. Redirecting...'
+      $window.location.href = "/admin/subscriptions"
+
+    errorCallback: (response) =>
+      if response.data?.errors?
+        angular.extend(@errors, response.data.errors)
+        keys = Object.keys(response.data.errors)
+        StatusMessage.display 'failure', response.data.errors[keys[0]][0]
+      else
+        # Happens when there are sync issues between SO and initialised orders
+        # We save the SO, but open a dialog, so want to stay on the page
+        StatusMessage.display 'success', 'Saved'
+
+    formInvalid: -> StatusMessage.display 'failure', t('admin.subscriptions.details.invalid_error')

app/assets/javascripts/admin/subscriptions/services/subscription_functions.js.coffee

@@ -0,0 +1,35 @@
+# Provides additional auxillary functions to instances of SubscriptionResource
+# Used to extend the extend the protype of the subscription resource created by SubscriptionResource
+
+angular.module("admin.subscriptions").factory 'SubscriptionFunctions', ($injector) ->
+  estimatedSubtotal: ->
+    @subscription_line_items.reduce (subtotal, item) ->
+      return subtotal if item._destroy
+      subtotal += item.price_estimate * item.quantity
+    , 0
+
+  estimatedFees: ->
+    @shipping_fee_estimate + @payment_fee_estimate
+
+  estimatedTotal: ->
+    @estimatedSubtotal() + @estimatedFees()
+
+  customer: ->
+    return unless @customer_id
+    return unless $injector.has('Customers')
+    $injector.get('Customers').byID[@customer_id]
+
+  schedule: ->
+    return unless @schedule_id
+    return unless $injector.has('Schedules')
+    $injector.get('Schedules').byID[@schedule_id]
+
+  paymentMethod: ->
+    return unless @payment_method_id
+    return unless $injector.has('PaymentMethods')
+    $injector.get('PaymentMethods').byID[@payment_method_id]
+
+  shippingMethod: ->
+    return unless @shipping_method_id
+    return unless $injector.has('ShippingMethods')
+    $injector.get('ShippingMethods').byID[@shipping_method_id]

app/assets/javascripts/admin/subscriptions/services/subscription_resource.js.coffee

@@ -0,0 +1,32 @@
+angular.module("admin.subscriptions").factory 'SubscriptionResource', ($resource, SubscriptionActions, SubscriptionFunctions) ->
+  resource = $resource('/admin/subscriptions/:id/:action.json', {}, {
+    'index':
+      method: 'GET'
+      isArray: true
+    'update':
+      method: 'PUT'
+      params:
+        id: '@id'
+    'cancel':
+      method: 'PUT'
+      params:
+        id: '@id'
+        action: 'cancel'
+        open_orders: '@open_orders'
+    'pause':
+      method: 'PUT'
+      params:
+        id: '@id'
+        action: 'pause'
+        open_orders: '@open_orders'
+    'unpause':
+      method: 'PUT'
+      params:
+        id: '@id'
+        action: 'unpause'
+  })
+
+  angular.extend(resource.prototype, SubscriptionActions)
+  angular.extend(resource.prototype, SubscriptionFunctions)
+
+  resource

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

@@ -0,0 +1,27 @@
+angular.module("admin.subscriptions").factory 'Subscriptions', ($q, SubscriptionResource, Subscription, RequestMonitor) ->
+  new class Subscriptions
+    byID: {}
+    pristineByID: {}
+
+    index: (params={}, callback=null) ->
+      request = SubscriptionResource.index params, (data) => @load(data)
+      RequestMonitor.load(request.$promise)
+      request
+
+    load: (subscriptions) ->
+      for subscription in subscriptions
+        @byID[subscription.id] = subscription
+        @pristineByID[subscription.id] = angular.copy(subscription)
+
+    afterCreate: (id) ->
+      return unless @byID[id]?
+      @pristineByID[id] = angular.copy(@byID[id])
+
+    afterUpdate: (id) ->
+      return unless @byID[id]?
+      @pristineByID[id] = angular.copy(@byID[id])
+
+    afterRemoveItem: (id, deletedItemID) ->
+      return unless @pristineByID[id]?
+      for item, i in @pristineByID[id].subscription_line_items when item.id == deletedItemID
+        @pristineByID[id].subscription_line_items.splice(i, 1)

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

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

app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee

@@ -2,7 +2,7 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
   $scope.tagGroups = enterprise.tag_groups
   $scope.defaultTagGroup = enterprise.default_tag_group
 
-  $scope.visibilityOptions = [ { id: "visible", name: "VISIBLE" }, { id: "hidden", name: "NOT VISIBLE" } ]
+  $scope.visibilityOptions = [ { id: "visible", name: t('js.tag_rules.visible')  }, { id: "hidden", name: t('js.tag_rules.not_visible') } ]
 
   $scope.updateRuleCounts = ->
     index = $scope.defaultTagGroup.rules.length
@@ -57,4 +57,4 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
         .success ->
           tagGroup.rules.splice(index, 1)
           $scope.updateRuleCounts()
-          $scope.enterprise_form.$setDirty()
+          $scope.enterprise_form.$setDirty()

app/assets/javascripts/admin/tag_rules/directives/new_rule_dialog.js.coffee

@@ -9,10 +9,10 @@ angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templ
 
     scope.ruleTypes = [
       # { id: "DiscountOrder", name: 'Apply a discount to orders' }
-      { id: "FilterProducts", name: 'Show or Hide variants in my shopfront' }
-      { id: "FilterShippingMethods", name: 'Show or Hide shipping methods at checkout' }
-      { id: "FilterPaymentMethods", name: 'Show or Hide payment methods at checkout' }
-      { id: "FilterOrderCycles", name: 'Show or Hide order cycles in my shopfront' }
+      { id: "FilterProducts", name: t('js.tag_rules.show_hide_variants') }
+      { id: "FilterShippingMethods", name: t('js.tag_rules.show_hide_shipping') }
+      { id: "FilterPaymentMethods", name: t('js.tag_rules.show_hide_payment') }
+      { id: "FilterOrderCycles", name: t('js.tag_rules.show_hide_order_cycles') }
     ]
 
     scope.ruleType = scope.ruleTypes[0].id

app/assets/javascripts/admin/util.js.erb

@@ -1,6 +1,6 @@
 $(document).ready(function() {
   $('.datetimepicker').datetimepicker({
-    dateFormat: Spree.translations.date_picker,
+    dateFormat: 'yy-mm-dd',
     dayNames: Spree.translations.abbr_day_names,
     dayNamesMin: Spree.translations.abbr_day_names,
     monthNames: Spree.translations.month_names,

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

@@ -1,4 +1,4 @@
-angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout, $filter) ->
+angular.module("admin.utils").directive "ofnSelect2", ($sanitize, $timeout, $filter) ->
   require: 'ngModel'
   restrict: 'C'
   scope:
@@ -14,8 +14,11 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout,
       scope.text ?= 'name'
       scope.multiple ?= false
       scope.filter ?= -> true
+      scope.placeholder ?= t('admin.choose')
 
       if scope.data.$promise
+        # Initialize with empty data set, while we wait for data
+        element.select2(data:[], placeholder: scope.placeholder)
         scope.data.$promise.then -> init()
       else
         init()
@@ -39,6 +42,7 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout,
       item.name = $sanitize(item.name) for item in scope.data
       element.select2
         multiple: scope.multiple
+        placeholder: scope.placeholder
         minimumResultsForSearch: scope.minSearch || 0
         data: ->
           filtered = $filter('filter')(scope.data,scope.filter)

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

@@ -0,0 +1,33 @@
+angular.module("admin.utils").directive "variantAutocomplete", ($timeout) ->
+  restrict: 'C'
+  link: (scope, element, attrs) ->
+    # Make variantAutocomplete do nothing because it is called
+    # from core/app/assets/javascripts/admin/orders/edit.js
+    $.fn.variantAutocomplete = angular.noop
+
+    $timeout ->
+      if $("#variant_autocomplete_template").length > 0
+        variantTemplate = Handlebars.compile($("#variant_autocomplete_template").text())
+
+      if Spree.routes
+        element.parent().children(".options_placeholder").attr "id", element.parent().data("index")
+        element.select2
+          placeholder: t('admin.orders.select_variant')
+          minimumInputLength: 3
+          quietMillis: 300
+          ajax:
+            url: Spree.routes.variants_search
+            datatype: "json"
+            data: (term, page) ->
+              q: term
+              distributor_id: scope.distributor_id
+              order_cycle_id: scope.order_cycle_id
+            results: (data, page) ->
+              results: data
+          formatResult: (variant) ->
+            if variant["images"][0] != undefined && variant["images"][0].image != undefined
+              variant.image = variant.images[0].image.mini_url
+            variantTemplate variant: variant
+          formatSelection: (variant) ->
+            element.parent().children(".options_placeholder").html variant.options_text
+            variant.name