Merge pull request #4387 from openfoodfoundation/transifex

Transifex

.github/ISSUE_TEMPLATE.md

@@ -1,66 +0,0 @@
-<!-- Provide a general summary of the issue in the Title above.
-
-If your issue is not a bug, please use the Feature template instead:
-https://github.com/openfoodfoundation/openfoodnetwork/wiki/Feature-template
-
--->
-## 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
-<!-- Assign a label and explain the impact.
-
-bug-s1: a critical feature is broken: checkout, payments, signup, login
-bug-s2: a non-critical feature is broken, no workaround
-bug-s3: a feature is broken but there is a workaround
-bug-s4: it's annoying, but you can use it
-bug-s5: we can live with it, only a few users impacted
-
-https://github.com/openfoodfoundation/openfoodnetwork/wiki/Bug-severity
--->
-
-
-
-## Your Environment
-<!-- Include 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/ISSUE_TEMPLATE/bug_report.md

@@ -9,6 +9,7 @@ assignees: ''
 
 ## Description
 <!-- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+<!-- How has this bug affected you? What were you trying to accomplish? -->
 
 
 ## Expected Behavior
@@ -22,6 +23,8 @@ assignees: ''
 ## Steps to Reproduce
 <!-- Provide an unambiguous set of steps to reproduce this bug -->
 <!-- Include code to reproduce if relevant -->
+<!-- Include links -->
+<!-- Include user ID -->
 
 1.
 2.
@@ -29,13 +32,11 @@ assignees: ''
 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? -->
+<!-- Provide a screenshot or brief video reproducing the bug.  -->
+<!-- Please try to have the dev tools opened on the network tab (press F12 to open the devtools of your browser -->
 
+## Workaround
+<!-- Include a workaround for this bug (if relevant) -->
 
 ## Severity
 <!-- Assign a label and explain the impact.
@@ -55,7 +56,6 @@ https://github.com/openfoodfoundation/openfoodnetwork/wiki/Bug-severity
 * Version used:
 * Browser name and version:
 * Operating System and version (desktop or mobile):
-* OFN Platform instance where you discovered the bug, and which version of the software they are using. 
 
 ## Possible Fix
 <!-- Not obligatory, but suggest a fix or reason for the bug -->

.github/ISSUE_TEMPLATE/story-template.md

@@ -14,5 +14,12 @@ assignees: ''
 **- I want to be able to do:** (specify the desired behavior)
 (Link to others issues or resources to provide context > only if really necessary). -->
 
-## Acceptance Criteria
-<!-- Document the outcomes that need to be achieved before this component can be considered complete. -->
+## Acceptance Criteria & Tests
+<!-- Document the outcomes that need to be achieved before this component can be considered complete.
+ -->
+<!-- Provide an unambiguous set of steps a tester should do to validate the PR that will solve this issue -->
+
+1.
+2. 
+3. 
+4.

.rubocop_manual_todo.yml

@@ -110,18 +110,6 @@ Metrics/LineLength:
   - app/models/variant_override.rb
   - app/models/variant_override_set.rb
   - app/overrides/add_enterprise_fees_to_admin_configurations_menu.rb
-  - app/serializers/api/admin/basic_enterprise_serializer.rb
-  - app/serializers/api/admin/enterprise_fee_serializer.rb
-  - app/serializers/api/admin/enterprise_serializer.rb
-  - app/serializers/api/admin/exchange_serializer.rb
-  - app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb
-  - app/serializers/api/admin/index_enterprise_serializer.rb
-  - app/serializers/api/admin/index_order_cycle_serializer.rb
-  - app/serializers/api/admin/line_item_serializer.rb
-  - app/serializers/api/admin/order_cycle_serializer.rb
-  - app/serializers/api/admin/subscription_serializer.rb
-  - app/serializers/api/admin/tag_rule_serializer.rb
-  - app/serializers/api/admin/variant_override_serializer.rb
   - app/services/cart_service.rb
   - app/services/default_stock_location.rb
   - app/services/embedded_page_service.rb
@@ -148,11 +136,9 @@ Metrics/LineLength:
   - lib/open_food_network/order_cycle_form_applicator.rb
   - lib/open_food_network/order_cycle_management_report.rb
   - lib/open_food_network/order_grouper.rb
-  - lib/open_food_network/orders_and_fulfillments_report.rb
   - lib/open_food_network/payments_report.rb
   - lib/open_food_network/permalink_generator.rb
   - lib/open_food_network/products_cache.rb
-  - lib/open_food_network/products_renderer.rb
   - lib/open_food_network/reports/bulk_coop_allocation_report.rb
   - lib/open_food_network/reports/line_items.rb
   - lib/open_food_network/sales_tax_report.rb
@@ -262,13 +248,10 @@ Metrics/LineLength:
   - spec/helpers/order_cycles_helper_spec.rb
   - spec/helpers/spree/admin/base_helper_spec.rb
   - spec/jobs/confirm_order_job_spec.rb
-  - spec/jobs/products_cache_integrity_checker_job_spec.rb
-  - spec/jobs/refresh_products_cache_job_spec.rb
   - spec/jobs/subscription_confirm_job_spec.rb
   - spec/jobs/subscription_placement_job_spec.rb
   - spec/lib/open_food_network/address_finder_spec.rb
   - spec/lib/open_food_network/bulk_coop_report_spec.rb
-  - spec/lib/open_food_network/cached_products_renderer_spec.rb
   - spec/lib/open_food_network/customers_report_spec.rb
   - spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
   - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
@@ -285,7 +268,6 @@ Metrics/LineLength:
   - spec/lib/open_food_network/permissions_spec.rb
   - spec/lib/open_food_network/products_and_inventory_report_spec.rb
   - spec/lib/open_food_network/products_cache_spec.rb
-  - spec/lib/open_food_network/products_renderer_spec.rb
   - spec/lib/open_food_network/proxy_order_syncer_spec.rb
   - spec/lib/open_food_network/scope_variant_to_hub_spec.rb
   - spec/lib/open_food_network/subscription_payment_updater_spec.rb
@@ -454,7 +436,6 @@ Metrics/AbcSize:
   - lib/open_food_network/order_cycle_form_applicator.rb
   - lib/open_food_network/order_cycle_management_report.rb
   - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/orders_and_fulfillments_report.rb
   - lib/open_food_network/packing_report.rb
   - lib/open_food_network/payments_report.rb
   - lib/open_food_network/permissions.rb
@@ -481,63 +462,26 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Max: 25
-  ExcludedMethods: ["class_eval", "collection", "context", "describe", "it", "member", "namespace", "resource", "resources"]
+  ExcludedMethods: [
+    "class_eval",
+    "collection",
+    "context",
+    "describe",
+    "feature",
+    "it",
+    "member",
+    "namespace",
+    "resource",
+    "resources",
+    "scenario"
+  ]
   Exclude:
   - lib/tasks/data.rake
   - lib/tasks/dev.rake
   - spec/controllers/spree/admin/invoices_controller_spec.rb
   - spec/factories/variant_factory.rb
-  - spec/features/admin/adjustments_spec.rb
-  - spec/features/admin/bulk_order_management_spec.rb
-  - spec/features/admin/bulk_product_update_spec.rb
-  - spec/features/admin/caching_spec.rb
-  - spec/features/admin/content_spec.rb
-  - spec/features/admin/customers_spec.rb
-  - spec/features/admin/enterprise_fees_spec.rb
-  - spec/features/admin/enterprise_groups_spec.rb
-  - spec/features/admin/enterprise_relationships_spec.rb
-  - spec/features/admin/enterprise_roles_spec.rb
-  - spec/features/admin/enterprises/images_spec.rb
-  - spec/features/admin/enterprises/index_spec.rb
-  - spec/features/admin/enterprises_spec.rb
-  - spec/features/admin/enterprise_user_spec.rb
-  - spec/features/admin/multilingual_spec.rb
-  - spec/features/admin/order_cycles_spec.rb
   - spec/features/admin/orders_spec.rb
-  - spec/features/admin/overview_spec.rb
-  - spec/features/admin/payment_method_spec.rb
-  - spec/features/admin/product_import_spec.rb
-  - spec/features/admin/products_spec.rb
-  - spec/features/admin/reports/enterprise_fee_summaries_spec.rb
-  - spec/features/admin/reports_spec.rb
-  - spec/features/admin/schedules_spec.rb
-  - spec/features/admin/shipping_methods_spec.rb
-  - spec/features/admin/subscriptions_spec.rb
-  - spec/features/admin/tag_rules_spec.rb
-  - spec/features/admin/tax_settings_spec.rb
-  - spec/features/admin/users_spec.rb
-  - spec/features/admin/variant_overrides_spec.rb
-  - spec/features/admin/variants_spec.rb
-  - spec/features/consumer/account/cards_spec.rb
-  - spec/features/consumer/account/settings_spec.rb
-  - spec/features/consumer/account_spec.rb
-  - spec/features/consumer/authentication_spec.rb
-  - spec/features/consumer/cookies_spec.rb
-  - spec/features/consumer/external_services_spec.rb
-  - spec/features/consumer/groups_spec.rb
-  - spec/features/consumer/multilingual_spec.rb
-  - spec/features/consumer/producers_spec.rb
-  - spec/features/consumer/registration_spec.rb
-  - spec/features/consumer/shopping/cart_spec.rb
-  - spec/features/consumer/shopping/checkout_auth_spec.rb
-  - spec/features/consumer/shopping/checkout_spec.rb
-  - spec/features/consumer/shopping/embedded_groups_spec.rb
   - spec/features/consumer/shopping/embedded_shopfronts_spec.rb
-  - spec/features/consumer/shopping/orders_spec.rb
-  - spec/features/consumer/shopping/products_spec.rb
-  - spec/features/consumer/shopping/shopping_spec.rb
-  - spec/features/consumer/shopping/variant_overrides_spec.rb
-  - spec/features/consumer/shops_spec.rb
   - spec/lib/open_food_network/group_buy_report_spec.rb
   - spec/models/tag_rule/discount_order_spec.rb
   - spec/spec_helper.rb
@@ -569,7 +513,6 @@ Metrics/CyclomaticComplexity:
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/open_food_network/orders_and_fulfillments_report.rb
   - lib/spree/core/controller_helpers/order_decorator.rb
   - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
@@ -594,7 +537,6 @@ Metrics/PerceivedComplexity:
   - lib/discourse/single_sign_on.rb
   - lib/open_food_network/bulk_coop_report.rb
   - lib/open_food_network/enterprise_issue_validator.rb
-  - lib/open_food_network/orders_and_fulfillments_report.rb
   - lib/spree/core/controller_helpers/order_decorator.rb
   - lib/spree/core/controller_helpers/respond_with_decorator.rb
   - lib/spree/localized_number.rb
@@ -664,12 +606,10 @@ Metrics/MethodLength:
   - lib/open_food_network/order_cycle_management_report.rb
   - lib/open_food_network/order_cycle_permissions.rb
   - lib/open_food_network/order_grouper.rb
-  - lib/open_food_network/orders_and_fulfillments_report.rb
   - lib/open_food_network/packing_report.rb
   - lib/open_food_network/payments_report.rb
   - lib/open_food_network/permissions.rb
   - lib/open_food_network/products_and_inventory_report.rb
-  - lib/open_food_network/products_renderer.rb
   - lib/open_food_network/rack_request_blocker.rb
   - lib/open_food_network/reports/bulk_coop_allocation_report.rb
   - lib/open_food_network/reports/bulk_coop_supplier_report.rb
@@ -708,7 +648,6 @@ Metrics/ClassLength:
   - lib/open_food_network/order_cycle_form_applicator.rb
   - lib/open_food_network/order_cycle_management_report.rb
   - lib/open_food_network/order_cycle_permissions.rb
-  - lib/open_food_network/orders_and_fulfillments_report.rb
   - lib/open_food_network/packing_report.rb
   - lib/open_food_network/payments_report.rb
   - lib/open_food_network/permissions.rb
@@ -725,7 +664,6 @@ Metrics/ModuleLength:
   - spec/controllers/api/orders_controller_spec.rb
   - spec/controllers/spree/api/products_controller_spec.rb
   - spec/lib/open_food_network/address_finder_spec.rb
-  - spec/lib/open_food_network/cached_products_renderer_spec.rb
   - spec/lib/open_food_network/customers_report_spec.rb
   - spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
   - spec/lib/open_food_network/option_value_namer_spec.rb

.rubocop_styleguide.yml

@@ -186,7 +186,19 @@ Metrics/AbcSize:
 
 Metrics/BlockLength:
   Max: 25
-  ExcludedMethods: ["class_eval", "collection", "context", "describe", "it", "member", "namespace", "resource", "resources"]
+  ExcludedMethods: [
+    "class_eval",
+    "collection",
+    "context",
+    "describe",
+    "feature",
+    "it",
+    "member",
+    "namespace",
+    "resource",
+    "resources",
+    "scenario"
+  ]
 
 Metrics/BlockNesting:
   Max: 3

.ruby-version

@@ -1 +1 @@
-2.1.5
+2.1.9

CONTRIBUTING.md

@@ -19,6 +19,10 @@ If you want to run the whole test suite, we recommend using a free CI service to
 
     bundle exec rspec spec
 
+## Which issue to pick first?
+
+We have curated all issues interesting for new members of the community within the [Welcome New Developers project board][welcome-dev]. Have a look and pick the one you would prefer working on!
+
 ## Internationalisation (i18n)
 
 The locale `en` is maintained in the source code, but other locales are managed at [Transifex][ofn-transifex]. Read more about [internationalisation][i18n] in the developer wiki.
@@ -62,3 +66,4 @@ From here, your pull request will progress through the [Review, Test, Merge & De
 [slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
 [ofn-transifex]: https://www.transifex.com/open-food-foundation/open-food-network/
 [i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/i18n
+[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27

Dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y curl git build-essential software-prope
 # Setup ENV variables
 ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH
 ENV RBENV_ROOT /usr/local/src/rbenv
-ENV RUBY_VERSION 2.1.5
+ENV RUBY_VERSION 2.1.9
 ENV CONFIGURE_OPTS --disable-install-doc
 
 # Rbenv & Ruby part

GETTING_STARTED.md

@@ -11,7 +11,7 @@ The following guides are located in the wiki and provide more OS-specific step-b
 ### Dependencies
 
 * Rails 3.2.x
-* Ruby 2.1.5
+* Ruby 2.1.9
 * PostgreSQL database
 * PhantomJS (for testing)
 * See Gemfile for a list of gems required

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby "2.1.5"
+ruby "2.1.9"
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'i18n', '~> 0.6.11'
@@ -39,7 +39,7 @@ gem 'activemerchant', '~> 1.78'
 gem 'devise', '~> 2.2.5'
 gem 'devise-encryptable', '0.2.0'
 gem 'jwt', '~> 2.2'
-gem 'oauth2', '~> 1.4.1' # Used for Stripe Connect
+gem 'oauth2', '~> 1.4.2' # Used for Stripe Connect
 
 gem 'daemons'
 gem 'delayed_job_active_record'
@@ -85,7 +85,6 @@ gem 'paperclip', '~> 3.4.1'
 gem 'rack-rewrite'
 gem 'rack-ssl', require: 'rack/ssl'
 gem 'roadie-rails', '~> 1.1.1'
-gem 'skylight', '< 2.0'
 gem 'spinjs-rails'
 
 gem 'combine_pdf'
@@ -105,7 +104,10 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'compass-rails'
 
-  gem 'therubyracer', '=0.12.0'
+  gem 'mini_racer', '0.1.15'
+  # Previously we found that libv8 6.7.288.46.1 breakis the compilation of mini_racer.
+  # Now we see that we need to set the version explicitly. Nothing else depends on libv8.
+  gem 'libv8', '6.3.292.48.1'
 
   gem 'uglifier', '>= 1.0.3'
 
@@ -157,10 +159,6 @@ end
 group :development do
   gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
   gem 'debugger-linecache'
-  gem 'guard'
-  gem 'guard-livereload'
-  gem 'guard-rails'
-  gem 'guard-rspec', '~> 4.7.3'
   gem 'listen', '3.0.8' # 3.1.0 requires ruby 2.2
   gem "newrelic_rpm", "~> 3.0"
   gem 'pry-byebug', '>= 3.4.3'

Gemfile.lock

@@ -164,7 +164,7 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.5.0)
-    bugsnag (6.12.0)
+    bugsnag (6.12.1)
       concurrent-ruby (~> 1.0)
     builder (3.0.4)
     byebug (9.0.6)
@@ -223,7 +223,7 @@ GEM
       activerecord (>= 3.2.0, < 5.0)
       fog (~> 1.0)
       rails (>= 3.2.0, < 5.0)
-    ddtrace (0.26.0)
+    ddtrace (0.28.0)
       msgpack
     debugger-linecache (1.2.0)
     deface (1.0.2)
@@ -252,9 +252,6 @@ GEM
     diffy (3.3.0)
     docile (1.3.2)
     dry-inflector (0.1.2)
-    em-websocket (0.5.1)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.2.7)
     excon (0.62.0)
@@ -432,34 +429,11 @@ GEM
       ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
-    guard (2.15.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-livereload (2.5.2)
-      em-websocket (~> 0.5)
-      guard (~> 2.8)
-      guard-compat (~> 1.0)
-      multi_json (~> 1.8)
-    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.7)
       tilt
     hashdiff (1.0.0)
     highline (1.6.18)
     hike (1.2.3)
-    http_parser.rb (0.6.0)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
     i18n (0.6.11)
@@ -491,11 +465,10 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    libv8 (3.16.14.19)
+    libv8 (6.3.292.48.1)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    lumberjack (1.0.13)
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -503,6 +476,8 @@ GEM
     mime-types (1.25.1)
     mini_mime (1.0.1)
     mini_portile2 (2.1.0)
+    mini_racer (0.1.15)
+      libv8 (~> 6.3)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
     money (5.1.1)
@@ -511,17 +486,13 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nenv (0.3.0)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     newrelic_rpm (3.18.1.330)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -610,7 +581,6 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.5.0)
-    ref (2.0.0)
     request_store (1.4.1)
       rack (>= 1.4)
     roadie (3.4.0)
@@ -626,29 +596,29 @@ GEM
       nokogiri
       roo (>= 2.0.0beta1, < 3)
       spreadsheet (> 0.9.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
-    rspec-support (3.8.0)
+    rspec-support (3.9.0)
     rubocop (0.57.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -660,7 +630,7 @@ GEM
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
-    rubyzip (1.2.2)
+    rubyzip (1.3.0)
     safe_yaml (1.0.5)
     sass (3.3.14)
     sass-rails (3.2.6)
@@ -673,10 +643,9 @@ GEM
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.17.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -685,8 +654,6 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    skylight (1.7.2)
-      activesupport (>= 3.0.0)
     spinjs-rails (1.4)
       rails (>= 3.1)
     spreadsheet (1.1.7)
@@ -704,9 +671,6 @@ GEM
     stripe (4.24.0)
       faraday (~> 0.13)
       net-http-persistent (~> 3.0)
-    therubyracer (0.12.0)
-      libv8 (~> 3.16.14.0)
-      ref
     thor (0.20.3)
     tilt (1.4.1)
     timecop (0.9.1)
@@ -719,7 +683,7 @@ GEM
       railties (> 3.2.8, < 4.0.0)
       sprockets (>= 2.2.0)
     tzinfo (0.3.55)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.2)
     unicorn (5.5.1)
@@ -739,7 +703,7 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (~> 3.0)
-    webmock (3.7.1)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -796,10 +760,6 @@ DEPENDENCIES
   fuubar (~> 2.4.1)
   geocoder
   gmaps4rails
-  guard
-  guard-livereload
-  guard-rails
-  guard-rspec (~> 4.7.3)
   haml
   i18n (~> 0.6.11)
   i18n-js (~> 3.3.0)
@@ -811,11 +771,13 @@ DEPENDENCIES
   kaminari (~> 0.14.1)
   knapsack
   letter_opener (>= 1.4.1)
+  libv8 (= 6.3.292.48.1)
   listen (= 3.0.8)
+  mini_racer (= 0.1.15)
   momentjs-rails
   newrelic_rpm (~> 3.0)
   nokogiri (>= 1.6.7.1)
-  oauth2 (~> 1.4.1)
+  oauth2 (~> 1.4.2)
   ofn-qz!
   oj
   order_management!
@@ -843,7 +805,6 @@ DEPENDENCIES
   shoulda-matchers
   simple_form!
   simplecov
-  skylight (< 2.0)
   spinjs-rails
   spree_api!
   spree_backend!
@@ -853,7 +814,6 @@ DEPENDENCIES
   spring (= 1.7.2)
   spring-commands-rspec
   stripe
-  therubyracer (= 0.12.0)
   timecop
   truncate_html
   turbo-sprockets-rails3
@@ -868,7 +828,7 @@ DEPENDENCIES
   wkhtmltopdf-binary
 
 RUBY VERSION
-   ruby 2.1.5p273
+   ruby 2.1.9p490
 
 BUNDLED WITH
    1.17.2

Guardfile

@@ -1,11 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'livereload' do
-  watch(%r{app/views/.+\.(erb|haml|slim)$})
-  watch(%r{app/helpers/.+\.rb})
-  watch(%r{public/.+\.(css|js|html)})
-
-  # Rails Assets Pipeline
-  watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
-end

README.md

@@ -1,6 +1,5 @@
 [![Build Status](https://semaphoreci.com/api/v1/openfoodfoundation/openfoodnetwork-2/branches/master/badge.svg)](https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2)
 [![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
 
@@ -36,7 +35,7 @@ We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. B
 Copyright (c) 2012 - 2019 Open Food Foundation, released under the AGPL licence.
 
 [survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
-[slack-invite]: https://openfoodnetwork.org/slack-invite
+[slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/enQtNzY3NDEwNzM2MDM0LWFmNGRhNDUwYzNmNWNkYmFkMzgxNDg1OTg1ODNjNWY4Y2FhNDIwNmE4ZWI0OThiMGNmZjFkODczNGZiYTJmNWI
 [contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
 [ofn-install]: https://github.com/openfoodfoundation/ofn-install
 [super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide

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

@@ -1,4 +1,4 @@
-Darkswarm.controller "OrderCycleCtrl", ($scope, $timeout, OrderCycle) ->
+Darkswarm.controller "OrderCycleCtrl", ($scope, $rootScope, $timeout, OrderCycle) ->
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.OrderCycle = OrderCycle
 
@@ -6,11 +6,12 @@ Darkswarm.controller "OrderCycleCtrl", ($scope, $timeout, OrderCycle) ->
   # This is a hack. We should probably write our own "popover" directive
   # That takes an expression instead of a trigger, and binds to that
   $timeout =>
+    $rootScope.$broadcast 'orderCycleSelected'
     if !$scope.OrderCycle.selected()
       $("#order_cycle_id").trigger("openTrigger")
 
 
-Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
+Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $rootScope, $timeout, OrderCycle, Products, Variants, Cart, ChangeableOrdersAlert) ->
   # Track previous order cycle id for use with revertOrderCycle()
   $scope.previous_order_cycle_id = OrderCycle.order_cycle.order_cycle_id
   $scope.$watch 'order_cycle.order_cycle_id', (newValue, oldValue)->
@@ -32,3 +33,4 @@ Darkswarm.controller "OrderCycleChangeCtrl", ($scope, $timeout, OrderCycle, Prod
     Products.update()
     Cart.reloadFinalisedLineItems()
     ChangeableOrdersAlert.reload()
+    $rootScope.$broadcast 'orderCycleSelected'

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

@@ -1,41 +1,65 @@
-Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, OrderCycle, FilterSelectorsService, Cart, Taxons, Properties) ->
+Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, OrderCycle, OrderCycleResource, FilterSelectorsService, Cart, Dereferencer, Taxons, Properties, currentHub, $timeout) ->
   $scope.Products = Products
   $scope.Cart = Cart
   $scope.query = ""
   $scope.taxonSelectors = FilterSelectorsService.createSelectors()
   $scope.propertySelectors = FilterSelectorsService.createSelectors()
   $scope.filtersActive = true
-  $scope.limit = 10
+  $scope.page = 1
+  $scope.per_page = 10
   $scope.order_cycle = OrderCycle.order_cycle
-  # $scope.infiniteDisabled = true
+  $scope.supplied_taxons = null
+  $scope.supplied_properties = null
 
-  # All of this logic basically just replicates the functionality filtering an ng-repeat
-  # except that it allows us to filter a separate list before rendering, meaning that
-  # we can get much better performance when applying filters by resetting the limit on the
-  # number of products being rendered each time a filter is changed.
+  $rootScope.$on "orderCycleSelected", ->
+    $scope.update_filters()
+    $scope.clearAll()
 
-  $scope.$watch "Products.loading", (newValue, oldValue) ->
-    $scope.updateFilteredProducts()
-    $scope.$broadcast("loadFilterSelectors") if !newValue
+  $scope.update_filters = ->
+    order_cycle_id = OrderCycle.order_cycle.order_cycle_id
 
-  $scope.incrementLimit = ->
-    if $scope.limit < Products.products.length
-      $scope.limit += 10
-      $scope.updateVisibleProducts()
+    return unless order_cycle_id
 
-  $scope.$watch 'query', -> $scope.updateFilteredProducts()
-  $scope.$watchCollection 'activeTaxons', -> $scope.updateFilteredProducts()
-  $scope.$watchCollection 'activeProperties', -> $scope.updateFilteredProducts()
+    params = {
+      id: order_cycle_id,
+      distributor: currentHub.id
+    }
+    OrderCycleResource.taxons params, (data)=>
+      $scope.supplied_taxons = {}
+      data.map( (taxon) ->
+        $scope.supplied_taxons[taxon.id] = Taxons.taxons_by_id[taxon.id]
+      )
+    OrderCycleResource.properties params, (data)=>
+      $scope.supplied_properties = {}
+      data.map( (property) ->
+        $scope.supplied_properties[property.id] = Properties.properties_by_id[property.id]
+      )
 
-  $scope.updateFilteredProducts = ->
-    $scope.limit = 10
-    f1 = $filter('products')(Products.products, $scope.query)
-    f2 = $filter('taxons')(f1, $scope.activeTaxons)
-    $scope.filteredProducts = $filter('properties')(f2, $scope.activeProperties)
-    $scope.updateVisibleProducts()
+  $scope.loadMore = ->
+    if ($scope.page * $scope.per_page) <= Products.products.length
+      $scope.loadMoreProducts()
 
-  $scope.updateVisibleProducts = ->
-    $scope.visibleProducts = $filter('limitTo')($scope.filteredProducts, $scope.limit)
+  $scope.$watch 'query', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
+  $scope.$watchCollection 'activeTaxons', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
+  $scope.$watchCollection 'activeProperties', (newValue, oldValue) -> $scope.loadProducts() if newValue != oldValue
+
+  $scope.loadProducts = ->
+    $scope.page = 1
+    Products.update($scope.queryParams())
+
+  $scope.loadMoreProducts = ->
+    Products.update($scope.queryParams($scope.page + 1), true)
+    $scope.page += 1
+
+  $scope.queryParams = (page = null) ->
+    {
+      id: $scope.order_cycle.order_cycle_id,
+      page: page || $scope.page,
+      per_page: $scope.per_page,
+      'q[name_or_meta_keywords_or_supplier_name_cont]': $scope.query,
+      'q[properties_id_or_supplier_properties_id_in_any][]': $scope.activeProperties,
+      'q[primary_taxon_id_in_any][]': $scope.activeTaxons
+    }
 
   $scope.searchKeypress = (e)->
     code = e.keyCode || e.which

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

@@ -0,0 +1,21 @@
+Darkswarm.factory 'OrderCycleResource', ($resource) ->
+  $resource('/api/order_cycles/:id', {}, {
+    'products':
+      method: 'GET'
+      isArray: true
+      url: '/api/order_cycles/:id/products'
+      params:
+        id: '@id'
+    'taxons':
+      method: 'GET'
+      isArray: true
+      url: '/api/order_cycles/:id/taxons'
+      params:
+        id: '@id'
+    'properties':
+      method: 'GET'
+      isArray: true
+      url: '/api/order_cycles/:id/properties'
+      params:
+        id: '@id'
+  })

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

@@ -1,26 +1,34 @@
-Darkswarm.factory 'Products', ($resource, Shopfront, Dereferencer, Taxons, Properties, Cart, Variants) ->
+Darkswarm.factory 'Products', (OrderCycleResource, OrderCycle, Shopfront, currentHub, Dereferencer, Taxons, Properties, Cart, Variants) ->
   new class Products
     constructor: ->
       @update()
 
-    # TODO: don't need to scope this into object
-    # Already on object as far as controller scope is concerned
-    products: null
+    products: []
+    fetched_products: []
     loading: true
 
-    update: =>
+    update: (params = {}, load_more = false) =>
       @loading = true
-      @products = []
-      $resource("/shop/products").query (products)=>
-        @products = products
+      order_cycle_id = OrderCycle.order_cycle.order_cycle_id
 
+      if order_cycle_id == undefined
+        @loading = false
+        return
+
+      params['id'] = order_cycle_id
+      params['distributor'] = currentHub.id
+
+      OrderCycleResource.products params, (data)=>
+        @products = [] unless load_more
+        @fetched_products = data
         @extend()
         @dereference()
         @registerVariants()
+        @products = @products.concat(@fetched_products)
         @loading = false
 
     extend: ->
-      for product in @products
+      for product in @fetched_products
         if product.variants?.length > 0
           prices = (v.price for v in product.variants)
           product.price = Math.min.apply(null, prices)
@@ -30,7 +38,7 @@ Darkswarm.factory 'Products', ($resource, Shopfront, Dereferencer, Taxons, Prope
         product.largeImage = product.images[0]?.large_url if product.images
 
     dereference: ->
-      for product in @products
+      for product in @fetched_products
         product.supplier = Shopfront.producers_by_id[product.supplier.id]
         Dereferencer.dereference product.taxons, Taxons.taxons_by_id
 
@@ -40,7 +48,7 @@ Darkswarm.factory 'Products', ($resource, Shopfront, Dereferencer, Taxons, Prope
     # May return different objects! If the variant has already been registered
     # by another service, we fetch those
     registerVariants: ->
-      for product in @products
+      for product in @fetched_products
         if product.variants
           product.variant_names = ""
           product.variants = for variant in product.variants

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

@@ -17,7 +17,7 @@
   .small-4.medium-2.large-2.columns.variant-price
     .table-cell.price
       %i.ofn-i_009-close
-      {{  ::variant.price_with_fees | localizeCurrency }}
+      {{ variant.price_with_fees | localizeCurrency }}
 
       -# Now in a template in app/assets/javascripts/templates !
       %price-breakdown{"price-breakdown" => "_", variant: "variant",

app/controllers/admin/cache_settings_controller.rb

@@ -1,27 +0,0 @@
-require 'open_food_network/products_cache_integrity_checker'
-
-module Admin
-  class CacheSettingsController < Spree::Admin::BaseController
-    def edit
-      @results = Exchange.cachable.map do |exchange|
-        checker = OpenFoodNetwork::ProductsCacheIntegrityChecker
-          .new(exchange.receiver, exchange.order_cycle)
-
-        {
-          distributor: exchange.receiver,
-          order_cycle: exchange.order_cycle,
-          status: checker.ok?,
-          diff: checker.diff
-        }
-      end
-    end
-
-    def update
-      Spree::Config.set(params[:preferences])
-
-      respond_to do |format|
-        format.html { redirect_to main_app.edit_admin_cache_settings_path }
-      end
-    end
-  end
-end

app/controllers/api/order_cycles_controller.rb

@@ -0,0 +1,88 @@
+module Api
+  class OrderCyclesController < BaseController
+    include EnterprisesHelper
+    respond_to :json
+
+    skip_authorization_check
+
+    def products
+      products = ProductsRenderer.new(
+        distributor,
+        order_cycle,
+        customer,
+        search_params
+      ).products_json
+
+      render json: products
+    rescue ProductsRenderer::NoProducts
+      render status: :not_found, json: ''
+    end
+
+    def taxons
+      taxons = Spree::Taxon.
+        joins(:products).
+        where(spree_products: { id: distributed_products }).
+        select('DISTINCT spree_taxons.*')
+
+      render json: ActiveModel::ArraySerializer.new(taxons, each_serializer: Api::TaxonSerializer)
+    end
+
+    def properties
+      render json: ActiveModel::ArraySerializer.new(
+        product_properties | producer_properties, each_serializer: Api::PropertySerializer
+      )
+    end
+
+    private
+
+    def product_properties
+      Spree::Property.
+        joins(:products).
+        where(spree_products: { id: distributed_products }).
+        select('DISTINCT spree_properties.*')
+    end
+
+    def producer_properties
+      producers = Enterprise.
+        joins(:supplied_products).
+        where(spree_products: { id: distributed_products })
+
+      Spree::Property.
+        joins(:producer_properties).
+        where(producer_properties: { producer_id: producers }).
+        select('DISTINCT spree_properties.*')
+    end
+
+    def search_params
+      permitted_search_params = params.slice :q, :page, :per_page
+
+      if permitted_search_params.key? :q
+        permitted_search_params[:q].slice!(*permitted_ransack_params)
+      end
+
+      permitted_search_params
+    end
+
+    def permitted_ransack_params
+      [:name_or_meta_keywords_or_supplier_name_cont,
+       :properties_id_or_supplier_properties_id_in_any,
+       :primary_taxon_id_in_any]
+    end
+
+    def distributor
+      Enterprise.find_by_id(params[:distributor])
+    end
+
+    def order_cycle
+      OrderCycle.find_by_id(params[:id])
+    end
+
+    def customer
+      @current_api_user.andand.customer_of(distributor) || nil
+    end
+
+    def distributed_products
+      OrderCycleDistributedProducts.new(distributor, order_cycle, customer).products_relation
+    end
+  end
+end

app/controllers/api/orders_controller.rb

@@ -1,5 +1,10 @@
 module Api
   class OrdersController < BaseController
+    def show
+      authorize! :read, order
+      render json: order, serializer: Api::OrderDetailedSerializer, current_order: order
+    end
+
     def index
       authorize! :admin, Spree::Order
 
@@ -19,5 +24,12 @@ module Api
         each_serializer: Api::Admin::OrderSerializer
       )
     end
+
+    def order
+      @order ||= Spree::Order.
+        where(number: params[:id]).
+        includes(line_items: { variant: [:product, :stock_items, :default_price] }).
+        first!
+    end
   end
 end

app/controllers/api/products_controller.rb

@@ -127,6 +127,9 @@ module Api
 
       render text: {
         products: serializer,
+        # This line is used by the PagedFetcher JS service (inventory).
+        pages: products.num_pages,
+        # This hash is used by the BulkProducts JS service.
         pagination: pagination_data(products)
       }.to_json
     end

app/controllers/api/shipments_controller.rb

@@ -0,0 +1,105 @@
+require 'open_food_network/scope_variant_to_hub'
+
+module Api
+  class ShipmentsController < Api::BaseController
+    respond_to :json
+
+    before_filter :find_order
+    before_filter :find_and_update_shipment, only: [:ship, :ready, :add, :remove]
+
+    def create
+      variant = scoped_variant(params[:variant_id])
+      quantity = params[:quantity].to_i
+      @shipment = get_or_create_shipment(params[:stock_location_id])
+
+      @order.contents.add(variant, quantity, nil, @shipment)
+
+      @shipment.refresh_rates
+      @shipment.save!
+
+      render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def update
+      authorize! :read, Spree::Shipment
+      @shipment = @order.shipments.find_by_number!(params[:id])
+      params[:shipment] ||= []
+      unlock = params[:shipment].delete(:unlock)
+
+      if unlock == 'yes'
+        @shipment.adjustment.open
+      end
+
+      @shipment.update_attributes(params[:shipment])
+
+      if unlock == 'yes'
+        @shipment.adjustment.close
+      end
+
+      render json: @shipment.reload, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def ready
+      authorize! :read, Spree::Shipment
+      unless @shipment.ready?
+        if @shipment.can_ready?
+          @shipment.ready!
+        else
+          render(json: { error: I18n.t(:cannot_ready, scope: "spree.api.shipment") },
+                 status: :unprocessable_entity) && return
+        end
+      end
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def ship
+      authorize! :read, Spree::Shipment
+      unless @shipment.shipped?
+        @shipment.ship!
+      end
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def add
+      variant = scoped_variant(params[:variant_id])
+      quantity = params[:quantity].to_i
+
+      @order.contents.add(variant, quantity, nil, @shipment)
+
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    def remove
+      variant = scoped_variant(params[:variant_id])
+      quantity = params[:quantity].to_i
+
+      @order.contents.remove(variant, quantity, @shipment)
+      @shipment.reload if @shipment.persisted?
+
+      render json: @shipment, serializer: Api::ShipmentSerializer, status: :ok
+    end
+
+    private
+
+    def find_order
+      @order = Spree::Order.find_by_number!(params[:order_id])
+      authorize! :read, @order
+    end
+
+    def find_and_update_shipment
+      @shipment = @order.shipments.find_by_number!(params[:id])
+      @shipment.update_attributes(params[:shipment])
+      @shipment.reload
+    end
+
+    def scoped_variant(variant_id)
+      variant = Spree::Variant.find(variant_id)
+      OpenFoodNetwork::ScopeVariantToHub.new(@order.distributor).scope(variant)
+      variant
+    end
+
+    def get_or_create_shipment(stock_location_id)
+      @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
+    end
+  end
+end

app/controllers/api/taxonomies_controller.rb

@@ -0,0 +1,12 @@
+module Api
+  class TaxonomiesController < Api::BaseController
+    respond_to :json
+
+    skip_authorization_check only: :jstree
+
+    def jstree
+      @taxonomy = Spree::Taxonomy.find(params[:id])
+      render json: @taxonomy.root, serializer: Api::TaxonJstreeSerializer
+    end
+  end
+end

app/controllers/api/taxons_controller.rb

@@ -0,0 +1,71 @@
+module Api
+  class TaxonsController < Api::BaseController
+    respond_to :json
+
+    skip_authorization_check only: [:index, :show, :jstree]
+
+    def index
+      if taxonomy
+        @taxons = taxonomy.root.children
+      else
+        if params[:ids]
+          @taxons = Spree::Taxon.where(id: params[:ids].split(","))
+        else
+          @taxons = Spree::Taxon.ransack(params[:q]).result
+        end
+      end
+      render json: @taxons, each_serializer: Api::TaxonSerializer
+    end
+
+    def jstree
+      @taxon = taxon
+      render json: @taxon.children, each_serializer: Api::TaxonJstreeSerializer
+    end
+
+    def create
+      authorize! :create, Spree::Taxon
+      @taxon = Spree::Taxon.new(params[:taxon])
+      @taxon.taxonomy_id = params[:taxonomy_id]
+      taxonomy = Spree::Taxonomy.find_by_id(params[:taxonomy_id])
+
+      if taxonomy.nil?
+        @taxon.errors[:taxonomy_id] = I18n.t(:invalid_taxonomy_id, scope: 'spree.api')
+        invalid_resource!(@taxon) && return
+      end
+
+      @taxon.parent_id = taxonomy.root.id unless params[:taxon][:parent_id]
+
+      if @taxon.save
+        render json: @taxon, serializer: Api::TaxonSerializer, status: :created
+      else
+        invalid_resource!(@taxon)
+      end
+    end
+
+    def update
+      authorize! :update, Spree::Taxon
+      if taxon.update_attributes(params[:taxon])
+        render json: taxon, serializer: Api::TaxonSerializer, status: :ok
+      else
+        invalid_resource!(taxon)
+      end
+    end
+
+    def destroy
+      authorize! :delete, Spree::Taxon
+      taxon.destroy
+      render json: taxon, serializer: Api::TaxonSerializer, status: :no_content
+    end
+
+    private
+
+    def taxonomy
+      return if params[:taxonomy_id].blank?
+      @taxonomy ||= Spree::Taxonomy.find(params[:taxonomy_id])
+    end
+
+    def taxon
+      @taxon ||= taxonomy.taxons.find(params[:id])
+    end
+  end
+end

app/controllers/checkout_controller.rb

@@ -152,7 +152,7 @@ class CheckoutController < Spree::CheckoutController
   end
 
   def update_failed
-    clear_ship_address
+    current_order.updater.shipping_address_from_distributor
     RestartCheckout.new(@order).call
 
     respond_to do |format|
@@ -165,15 +165,6 @@ class CheckoutController < Spree::CheckoutController
     end
   end
 
-  # When we have a pickup Shipping Method,
-  #   we clone the distributor address into ship_address before_save
-  # We don't want this data in the form, so we clear it out
-  def clear_ship_address
-    unless current_order.shipping_method.andand.require_ship_address
-      current_order.ship_address = Spree::Address.default
-    end
-  end
-
   def load_order
     @order = current_order
     redirect_to(main_app.shop_path) && return unless @order && @order.checkout_allowed?

app/controllers/shop_controller.rb

@@ -1,5 +1,3 @@
-require 'open_food_network/cached_products_renderer'
-
 class ShopController < BaseController
   layout "darkswarm"
   before_filter :require_distributor_chosen, :set_order_cycles, except: :changeable_orders_alert
@@ -9,19 +7,6 @@ class ShopController < BaseController
     redirect_to main_app.enterprise_shop_path(current_distributor)
   end
 
-  def products
-    renderer = OpenFoodNetwork::CachedProductsRenderer.new(current_distributor,
-                                                           current_order_cycle)
-
-    # If we add any more filtering logic, we should probably
-    # move it all to a lib class like 'CachedProductsFilterer'
-    products_json = filter(renderer.products_json)
-
-    render json: products_json
-  rescue OpenFoodNetwork::CachedProductsRenderer::NoProducts
-    render status: :not_found, json: ''
-  end
-
   def order_cycle
     if request.post?
       if oc = OrderCycle.with_distributor(@distributor).active.find_by_id(params[:order_cycle_id])
@@ -39,27 +24,4 @@ class ShopController < BaseController
   def changeable_orders_alert
     render layout: false
   end
-
-  private
-
-  def filtered_json(products_json)
-    if applicator.rules.any?
-      filter(products_json)
-    else
-      products_json
-    end
-  end
-
-  def filter(products_json)
-    products_hash = JSON.parse(products_json)
-    applicator.filter!(products_hash)
-    JSON.unparse(products_hash)
-  end
-
-  def applicator
-    return @applicator unless @applicator.nil?
-    @applicator = OpenFoodNetwork::TagRuleApplicator.new(current_distributor,
-                                                         "FilterProducts",
-                                                         current_customer.andand.tag_list)
-  end
 end

app/controllers/spree/admin/countries_controller.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    class CountriesController < ResourceController
+      def collection
+        super.order(:name)
+      end
+    end
+  end
+end

app/controllers/spree/admin/general_settings_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Admin
+    class GeneralSettingsController < Spree::Admin::BaseController
+      def edit
+        @preferences_general = [:site_name, :default_seo_title, :default_meta_keywords,
+                                :default_meta_description, :site_url, :bugherd_api_key]
+        @preferences_security = [:allow_ssl_in_production,
+                                 :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
+                                 :check_for_spree_alerts]
+        @preferences_currency = [:display_currency, :hide_cents]
+      end
+
+      def update
+        params.each do |name, value|
+          next unless Spree::Config.has_preference? name
+          Spree::Config[name] = value
+        end
+        flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
+
+        redirect_to edit_admin_general_settings_path
+      end
+
+      def dismiss_alert
+        return unless request.xhr? && params[:alert_id]
+        dismissed = Spree::Config[:dismissed_spree_alerts] || ''
+        Spree::Config.set(dismissed_spree_alerts: dismissed.
+                                                    split(',').
+                                                    push(params[:alert_id]).
+                                                    join(','))
+        filter_dismissed_alerts
+        render nothing: true
+      end
+    end
+  end
+end

app/controllers/spree/admin/general_settings_controller_decorator.rb

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    GeneralSettingsController.class_eval do
-    end
-
-    module GeneralSettingsEditPreferences
-      def edit
-        super
-        @preferences_general << :bugherd_api_key
-      end
-    end
-    GeneralSettingsController.prepend(GeneralSettingsEditPreferences)
-  end
-end

app/controllers/spree/admin/image_settings_controller.rb

@@ -0,0 +1,79 @@
+module Spree
+  module Admin
+    class ImageSettingsController < Spree::Admin::BaseController
+      def edit
+        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      end
+
+      def update
+        update_styles(params)
+        update_headers(params) if Spree::Config[:use_s3]
+
+        Spree::Config.set(params[:preferences])
+        update_paperclip_settings
+
+        respond_to do |format|
+          format.html {
+            flash[:success] = Spree.t(:image_settings_updated)
+            redirect_to spree.edit_admin_image_settings_path
+          }
+        end
+      end
+
+      private
+
+      def update_styles(params)
+        if params[:new_attachment_styles].present?
+          params[:new_attachment_styles].each do |_index, style|
+            params[:attachment_styles][style[:name]] = style[:value] unless style[:value].empty?
+          end
+        end
+
+        styles = params[:attachment_styles]
+
+        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
+      end
+
+      def update_headers(params)
+        if params[:new_s3_headers].present?
+          params[:new_s3_headers].each do |_index, header|
+            params[:s3_headers][header[:name]] = header[:value] unless header[:value].empty?
+          end
+        end
+
+        headers = params[:s3_headers]
+
+        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
+      end
+
+      def update_paperclip_settings
+        if Spree::Config[:use_s3]
+          s3_creds = { access_key_id: Spree::Config[:s3_access_key],
+                       secret_access_key: Spree::Config[:s3_secret],
+                       bucket: Spree::Config[:s3_bucket] }
+          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
+          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+          Spree::Image.attachment_definitions[:attachment][:s3_headers] =
+            ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+        else
+          Spree::Image.attachment_definitions[:attachment].delete :storage
+        end
+
+        Spree::Image.attachment_definitions[:attachment][:styles] =
+          ActiveSupport::JSON.decode(Spree::Config[:attachment_styles]).symbolize_keys!
+        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+        Spree::Image.attachment_definitions[:attachment][:default_url] =
+          Spree::Config[:attachment_default_url]
+        Spree::Image.attachment_definitions[:attachment][:default_style] =
+          Spree::Config[:attachment_default_style]
+
+        # Spree stores attachent definitions in JSON. This converts the style name and format to
+        # strings. However, when paperclip encounters these, it doesn't recognise the format.
+        # Here we solve that problem by converting format and style name to symbols.
+        Spree::Image.reformat_styles
+      end
+    end
+  end
+end

app/controllers/spree/admin/image_settings_controller_decorator.rb

@@ -1,11 +0,0 @@
-Spree::Admin::ImageSettingsController.class_eval do
-  # Spree stores attachent definitions in JSON. This converts the style name and format to
-  # strings. However, when paperclip encounters these, it doesn't recognise the format.
-  # Here we solve that problem by converting format and style name to symbols.
-  def update_paperclip_settings_with_format_styles
-    update_paperclip_settings_without_format_styles
-    Spree::Image.reformat_styles
-  end
-
-  alias_method_chain :update_paperclip_settings, :format_styles
-end

app/controllers/spree/admin/mail_methods_controller.rb

@@ -0,0 +1,39 @@
+module Spree
+  module Admin
+    class MailMethodsController < Spree::Admin::BaseController
+      after_filter :initialize_mail_settings
+
+      def update
+        if params[:smtp_password].blank?
+          params.delete(:smtp_password)
+        end
+
+        params.each do |name, value|
+          next unless Spree::Config.has_preference? name
+          Spree::Config[name] = value
+        end
+
+        flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:mail_methods))
+        render :edit
+      end
+
+      def testmail
+        if TestMailer.test_email(try_spree_current_user).deliver
+          flash[:success] = Spree.t('admin.mail_methods.testmail.delivery_success')
+        else
+          flash[:error] = Spree.t('admin.mail_methods.testmail.delivery_error')
+        end
+      rescue StandardError => e
+        flash[:error] = Spree.t('admin.mail_methods.testmail.error') % { e: e }
+      ensure
+        redirect_to edit_admin_mail_method_url
+      end
+
+      private
+
+      def initialize_mail_settings
+        Spree::Core::MailSettings.init
+      end
+    end
+  end
+end

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -3,7 +3,6 @@ require 'open_food_network/spree_api_key_loader'
 Spree::Admin::OrdersController.class_eval do
   include OpenFoodNetwork::SpreeApiKeyLoader
   helper CheckoutHelper
-  before_filter :load_spree_api_key, only: :bulk_management
   before_filter :load_order, only: %i[show edit update fire resend invoice print print_ticket]
 
   before_filter :load_distribution_choices, only: [:new, :edit, :update]
@@ -27,6 +26,10 @@ Spree::Admin::OrdersController.class_eval do
     # within the page then fetches the data it needs from Api::OrdersController
   end
 
+  def bulk_management
+    load_spree_api_key
+  end
+
   def edit
     @order.shipments.map &:refresh_rates
 

app/controllers/spree/admin/products_controller_decorator.rb

@@ -30,6 +30,11 @@ Spree::Admin::ProductsController.class_eval do
     @show_latest_import = params[:latest_import] || false
   end
 
+  def new
+    @object.shipping_category = DefaultShippingCategory.find_or_create
+    super
+  end
+
   def create
     delete_stock_params_and_set_after do
       super
@@ -44,8 +49,6 @@ Spree::Admin::ProductsController.class_eval do
     delete_stock_params_and_set_after do
       super
     end
-
-    clear_variants_unit_description if @object.variant_unit == 'items'
   end
 
   def bulk_update
@@ -190,10 +193,4 @@ Spree::Admin::ProductsController.class_eval do
   def set_product_master_variant_price_to_zero
     @product.price = 0 if @product.price.nil?
   end
-
-  def clear_variants_unit_description
-    @object.variants.each do |variant|
-      variant.update_attribute :unit_description, ''
-    end
-  end
 end

app/controllers/spree/admin/reports_controller_decorator.rb

@@ -126,7 +126,8 @@ Spree::Admin::ReportsController.class_eval do
     @include_blank = I18n.t(:all)
 
     # -- Build Report with Order Grouper
-    @report = OpenFoodNetwork::OrdersAndFulfillmentsReport.new spree_current_user, params, render_content?
+    @report = OpenFoodNetwork::OrdersAndFulfillmentsReport.new(permissions,
+                                                               params, render_content?)
     @table = order_grouper_table
     csv_file_name = "#{params[:report_type]}_#{timestamp}.csv"
 

app/controllers/spree/admin/shipping_categories_controller.rb

@@ -0,0 +1,6 @@
+module Spree
+  module Admin
+    class ShippingCategoriesController < ResourceController
+    end
+  end
+end

app/controllers/spree/admin/shipping_methods_controller.rb

@@ -0,0 +1,84 @@
+module Spree
+  module Admin
+    class ShippingMethodsController < ResourceController
+      before_filter :load_data, except: [:index]
+      before_filter :set_shipping_category, only: [:create, :update]
+      before_filter :set_zones, only: [:create, :update]
+      before_filter :load_hubs, only: [:new, :edit, :create, :update]
+
+      # Sort shipping methods by distributor name
+      def collection
+        collection = super
+        collection = collection.managed_by(spree_current_user).by_name
+
+        if params.key? :enterprise_id
+          distributor = Enterprise.find params[:enterprise_id]
+          collection = collection.for_distributor(distributor)
+        end
+
+        collection
+      end
+
+      def new
+        @object.shipping_categories = [DefaultShippingCategory.find_or_create]
+        super
+      end
+
+      def destroy
+        # Our reports are not adapted to soft deleted shipping_methods so here we prevent
+        #   the deletion (even soft) of shipping_methods that are referenced in orders
+        if order = order_referenced_by_shipping_method
+          flash[:error] = I18n.t(:shipping_method_destroy_error, number: order.number)
+          redirect_to(collection_url) && return
+        end
+
+        @object.touch :deleted_at
+        flash[:success] = flash_message_for(@object, :successfully_removed)
+
+        respond_with(@object) do |format|
+          format.html { redirect_to collection_url }
+        end
+      end
+
+      private
+
+      def order_referenced_by_shipping_method
+        Order.joins(shipments: :shipping_rates)
+          .where( spree_shipping_rates: { shipping_method_id: @object } )
+          .first
+      end
+
+      def load_hubs
+        # rubocop:disable Style/TernaryParentheses
+        @hubs = Enterprise.managed_by(spree_current_user).is_distributor.sort_by! do |d|
+          [(@shipping_method.has_distributor? d) ? 0 : 1, d.name]
+        end
+        # rubocop:enable Style/TernaryParentheses
+      end
+
+      def set_shipping_category
+        return true if params["shipping_method"][:shipping_categories] == ""
+        @shipping_method.shipping_categories =
+          Spree::ShippingCategory.where(id: params["shipping_method"][:shipping_categories])
+        @shipping_method.save
+        params[:shipping_method].delete(:shipping_categories)
+      end
+
+      def set_zones
+        return true if params["shipping_method"][:zones] == ""
+        @shipping_method.zones = Spree::Zone.where(id: params["shipping_method"][:zones])
+        @shipping_method.save
+        params[:shipping_method].delete(:zones)
+      end
+
+      def location_after_save
+        edit_admin_shipping_method_path(@shipping_method)
+      end
+
+      def load_data
+        @available_zones = Zone.order(:name)
+        @calculators = ShippingMethod.calculators.sort_by(&:name)
+      end
+    end
+  end
+end

app/controllers/spree/admin/shipping_methods_controller_decorator.rb

@@ -1,42 +0,0 @@
-module Spree
-  module Admin
-    ShippingMethodsController.class_eval do
-      before_filter :do_not_destroy_referenced_shipping_methods, only: :destroy
-      before_filter :load_hubs, only: [:new, :edit, :create, :update]
-
-      # Sort shipping methods by distributor name
-      def collection
-        collection = super
-        collection = collection.managed_by(spree_current_user).by_name
-
-        if params.key? :enterprise_id
-          distributor = Enterprise.find params[:enterprise_id]
-          collection = collection.for_distributor(distributor)
-        end
-
-        collection
-      end
-
-      # Spree allows soft deletes of shipping_methods but our reports are not adapted to that
-      #   Here we prevent the deletion (even soft) of shipping_methods that are referenced in orders
-      def do_not_destroy_referenced_shipping_methods
-        order = Order.joins(shipments: :shipping_rates)
-          .where( spree_shipping_rates: { shipping_method_id: @object } )
-          .first
-        return unless order
-        flash[:error] = I18n.t(:shipping_method_destroy_error, number: order.number)
-        redirect_to(collection_url) && return
-      end
-
-      private
-
-      def load_hubs
-        # rubocop:disable Style/TernaryParentheses
-        @hubs = Enterprise.managed_by(spree_current_user).is_distributor.sort_by! do |d|
-          [(@shipping_method.has_distributor? d) ? 0 : 1, d.name]
-        end
-        # rubocop:enable Style/TernaryParentheses
-      end
-    end
-  end
-end

app/controllers/spree/admin/states_controller.rb

@@ -0,0 +1,29 @@
+module Spree
+  module Admin
+    class StatesController < ResourceController
+      belongs_to 'spree/country'
+      before_filter :load_data
+
+      def index
+        respond_with(@collection) do |format|
+          format.html
+          format.js { render partial: 'state_list' }
+        end
+      end
+
+      protected
+
+      def location_after_save
+        admin_country_states_url(@country)
+      end
+
+      def collection
+        super.order(:name)
+      end
+
+      def load_data
+        @countries = Country.order(:name)
+      end
+    end
+  end
+end

app/controllers/spree/admin/tax_categories_controller.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Admin
+    class TaxCategoriesController < ResourceController
+      def destroy
+        if @object.destroy
+          flash[:success] = flash_message_for(@object, :successfully_removed)
+          respond_with(@object) do |format|
+            format.html { redirect_to collection_url }
+            format.js   { render partial: "spree/admin/shared/destroy" }
+          end
+        else
+          respond_with(@object) do |format|
+            format.html { redirect_to collection_url }
+          end
+        end
+      end
+    end
+  end
+end

app/controllers/spree/admin/tax_rates_controller.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class TaxRatesController < ResourceController
+      before_filter :load_data
+
+      update.after :update_after
+      create.after :create_after
+
+      private
+
+      def load_data
+        @available_zones = Zone.order(:name)
+        @available_categories = TaxCategory.order(:name)
+        @calculators = TaxRate.calculators.sort_by(&:name)
+      end
+
+      def update_after
+        Rails.cache.delete('vat_rates')
+      end
+
+      def create_after
+        Rails.cache.delete('vat_rates')
+      end
+    end
+  end
+end

app/controllers/spree/admin/tax_settings_controller.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    class TaxSettingsController < Spree::Admin::BaseController
+      def update
+        Spree::Config.set(params[:preferences])
+
+        respond_to do |format|
+          format.html {
+            redirect_to edit_admin_tax_settings_path
+          }
+        end
+      end
+    end
+  end
+end

app/controllers/spree/admin/taxonomies_controller.rb

@@ -0,0 +1,21 @@
+module Spree
+  module Admin
+    class TaxonomiesController < ResourceController
+      respond_to :json, :only => [:get_children]
+
+      def get_children
+        @taxons = Taxon.find(params[:parent_id]).children
+      end
+
+      private
+
+      def location_after_save
+        if @taxonomy.created_at == @taxonomy.updated_at
+          edit_admin_taxonomy_url(@taxonomy)
+        else
+          admin_taxonomies_url
+        end
+      end
+    end
+  end
+end

app/controllers/spree/admin/taxons_controller.rb

@@ -0,0 +1,118 @@
+module Spree
+  module Admin
+    class TaxonsController < Spree::Admin::BaseController
+      respond_to :html, :json, :js
+
+      def search
+        if params[:ids]
+          @taxons = Spree::Taxon.where(id: params[:ids].split(','))
+        else
+          @taxons = Spree::Taxon.limit(20).search(name_cont: params[:q]).result
+        end
+      end
+
+      def create
+        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxon = @taxonomy.taxons.build(params[:taxon])
+        if @taxon.save
+          respond_with(@taxon) do |format|
+            format.json { render json: @taxon.to_json }
+          end
+        else
+          flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
+          respond_with(@taxon) do |format|
+            format.html do
+              if redirect_to @taxonomy
+                edit_admin_taxonomy_url(@taxonomy)
+              else
+                admin_taxonomies_url
+              end
+            end
+          end
+        end
+      end
+
+      def edit
+        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxon = @taxonomy.taxons.find(params[:id])
+        @permalink_part = @taxon.permalink.split("/").last
+      end
+
+      def update
+        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxon = @taxonomy.taxons.find(params[:id])
+        parent_id = params[:taxon][:parent_id]
+        new_position = params[:taxon][:position]
+
+        if parent_id || new_position # taxon is being moved
+          new_parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
+          new_position = new_position.nil? ? -1 : new_position.to_i
+
+          # Bellow is a very complicated way of finding where in nested set we
+          # should actually move the taxon to achieve sane results,
+          # JS is giving us the desired position, which was awesome for previous setup,
+          # but now it's quite complicated to find where we should put it as we have
+          # to differenciate between moving to the same branch, up down and into
+          # first position.
+          new_siblings = new_parent.children
+          if new_position <= 0 && new_siblings.empty?
+            @taxon.move_to_child_of(new_parent)
+          elsif new_parent.id != @taxon.parent_id
+            if new_position.zero?
+              @taxon.move_to_left_of(new_siblings.first)
+            else
+              @taxon.move_to_right_of(new_siblings[new_position - 1])
+            end
+          elsif new_position < new_siblings.index(@taxon)
+            @taxon.move_to_left_of(new_siblings[new_position]) # we move up
+          else
+            @taxon.move_to_right_of(new_siblings[new_position - 1]) # we move down
+          end
+          # Reset legacy position, if any extensions still rely on it
+          new_parent.children.reload.each{ |t| t.update_column(:position, t.position) }
+
+          if parent_id
+            @taxon.reload
+            @taxon.set_permalink
+            @taxon.save!
+            @update_children = true
+          end
+        end
+
+        if params.key? "permalink_part"
+          parent_permalink = @taxon.permalink.split("/")[0...-1].join("/")
+          parent_permalink += "/" if parent_permalink.present?
+          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
+        end
+        # check if we need to rename child taxons if parent name or permalink changes
+        if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
+          @update_children = true
+        end
+
+        if @taxon.update_attributes(params[:taxon])
+          flash[:success] = flash_message_for(@taxon, :successfully_updated)
+        end
+
+        # rename child taxons
+        if @update_children
+          @taxon.descendants.each do |taxon|
+            taxon.reload
+            taxon.set_permalink
+            taxon.save!
+          end
+        end
+
+        respond_with(@taxon) do |format|
+          format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) }
+          format.json { render json: @taxon.to_json }
+        end
+      end
+
+      def destroy
+        @taxon = Taxon.find(params[:id])
+        @taxon.destroy
+        respond_with(@taxon) { |format| format.json { render json: '' } }
+      end
+    end
+  end
+end

app/controllers/spree/admin/users_controller.rb

@@ -46,7 +46,12 @@ module Spree
             @user.spree_roles = roles.reject(&:blank?).collect{ |r| Spree::Role.find(r) }
           end
 
-          flash.now[:success] = Spree.t(:account_updated)
+          message = if new_email_unconfirmed?
+                      Spree.t(:email_updated)
+                    else
+                      Spree.t(:account_updated)
+                    end
+          flash.now[:success] = message
         end
         render :edit
       end
@@ -126,6 +131,10 @@ module Spree
       def load_roles
         @roles = Spree::Role.scoped
       end
+
+      def new_email_unconfirmed?
+        params[:user][:email] != @user.email
+      end
     end
   end
 end

app/controllers/spree/admin/zones_controller.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class ZonesController < ResourceController
+      before_filter :load_data, except: [:index]
+
+      def new
+        @zone.zone_members.build
+      end
+
+      protected
+
+      def collection
+        params[:q] ||= {}
+        params[:q][:s] ||= "ascend_by_name"
+        @search = super.ransack(params[:q])
+        @zones = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
+      end
+
+      def load_data
+        @countries = Country.order(:name)
+        @states = State.order(:name)
+        @zones = Zone.order(:name)
+      end
+    end
+  end
+end

app/controllers/spree/api/shipments_controller.rb

@@ -1,108 +0,0 @@
-require 'open_food_network/scope_variant_to_hub'
-
-module Spree
-  module Api
-    class ShipmentsController < Spree::Api::BaseController
-      respond_to :json
-
-      before_filter :find_order
-      before_filter :find_and_update_shipment, only: [:ship, :ready, :add, :remove]
-
-      def create
-        variant = scoped_variant(params[:variant_id])
-        quantity = params[:quantity].to_i
-        @shipment = get_or_create_shipment(params[:stock_location_id])
-
-        @order.contents.add(variant, quantity, nil, @shipment)
-
-        @shipment.refresh_rates
-        @shipment.save!
-
-        respond_with(@shipment.reload, default_template: :show)
-      end
-
-      def update
-        authorize! :read, Shipment
-        @shipment = @order.shipments.find_by_number!(params[:id])
-        params[:shipment] ||= []
-        unlock = params[:shipment].delete(:unlock)
-
-        if unlock == 'yes'
-          @shipment.adjustment.open
-        end
-
-        @shipment.update_attributes(params[:shipment])
-
-        if unlock == 'yes'
-          @shipment.adjustment.close
-        end
-
-        @shipment.reload
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def ready
-        authorize! :read, Shipment
-        unless @shipment.ready?
-          if @shipment.can_ready?
-            @shipment.ready!
-          else
-            render "spree/api/shipments/cannot_ready_shipment", status: :unprocessable_entity
-            return
-          end
-        end
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def ship
-        authorize! :read, Shipment
-        unless @shipment.shipped?
-          @shipment.ship!
-        end
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def add
-        variant = scoped_variant(params[:variant_id])
-        quantity = params[:quantity].to_i
-
-        @order.contents.add(variant, quantity, nil, @shipment)
-
-        respond_with(@shipment, default_template: :show)
-      end
-
-      def remove
-        variant = scoped_variant(params[:variant_id])
-        quantity = params[:quantity].to_i
-
-        @order.contents.remove(variant, quantity, @shipment)
-        @shipment.reload if @shipment.persisted?
-
-        respond_with(@shipment, default_template: :show)
-      end
-
-      private
-
-      def find_order
-        @order = Spree::Order.find_by_number!(params[:order_id])
-        authorize! :read, @order
-      end
-
-      def find_and_update_shipment
-        @shipment = @order.shipments.find_by_number!(params[:id])
-        @shipment.update_attributes(params[:shipment])
-        @shipment.reload
-      end
-
-      def scoped_variant(variant_id)
-        variant = Spree::Variant.find(variant_id)
-        OpenFoodNetwork::ScopeVariantToHub.new(@order.distributor).scope(variant)
-        variant
-      end
-
-      def get_or_create_shipment(stock_location_id)
-        @order.shipment || @order.shipments.create(stock_location_id: stock_location_id)
-      end
-    end
-  end
-end

app/controllers/spree/api/taxons_controller.rb

@@ -1,75 +0,0 @@
-module Spree
-  module Api
-    class TaxonsController < Spree::Api::BaseController
-      respond_to :json
-
-      def index
-        if taxonomy
-          @taxons = taxonomy.root.children
-        else
-          if params[:ids]
-            @taxons = Taxon.where(id: params[:ids].split(","))
-          else
-            @taxons = Taxon.ransack(params[:q]).result
-          end
-        end
-        respond_with(@taxons)
-      end
-
-      def show
-        @taxon = taxon
-        respond_with(@taxon)
-      end
-
-      def jstree
-        show
-      end
-
-      def create
-        authorize! :create, Taxon
-        @taxon = Taxon.new(params[:taxon])
-        @taxon.taxonomy_id = params[:taxonomy_id]
-        taxonomy = Taxonomy.find_by_id(params[:taxonomy_id])
-
-        if taxonomy.nil?
-          @taxon.errors[:taxonomy_id] = I18n.t(:invalid_taxonomy_id, scope: 'spree.api')
-          invalid_resource!(@taxon) && return
-        end
-
-        @taxon.parent_id = taxonomy.root.id unless params[:taxon][:parent_id]
-
-        if @taxon.save
-          respond_with(@taxon, status: 201, default_template: :show)
-        else
-          invalid_resource!(@taxon)
-        end
-      end
-
-      def update
-        authorize! :update, Taxon
-        if taxon.update_attributes(params[:taxon])
-          respond_with(taxon, status: 200, default_template: :show)
-        else
-          invalid_resource!(taxon)
-        end
-      end
-
-      def destroy
-        authorize! :delete, Taxon
-        taxon.destroy
-        respond_with(taxon, status: 204)
-      end
-
-      private
-
-      def taxonomy
-        return if params[:taxonomy_id].blank?
-        @taxonomy ||= Taxonomy.find(params[:taxonomy_id])
-      end
-
-      def taxon
-        @taxon ||= taxonomy.taxons.find(params[:id])
-      end
-    end
-  end
-end

app/controllers/spree/user_sessions_controller.rb

@@ -38,10 +38,6 @@ module Spree
       end
     end
 
-    def nav_bar
-      render partial: 'spree/shared/nav_bar'
-    end
-
     private
 
     def accurate_title

app/helpers/spree/admin/general_settings_helper.rb

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    module GeneralSettingsHelper
+      def currency_options
+        currencies = ::Money::Currency.table.map do |_code, details|
+          iso = details[:iso_code]
+          [iso, "#{details[:name]} (#{iso})"]
+        end
+        options_from_collection_for_select(currencies, :first, :last, Spree::Config[:currency])
+      end
+    end
+  end
+end

app/helpers/spree/admin/taxons_helper.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Admin
+    module TaxonsHelper
+      def taxon_path(taxon)
+        taxon.ancestors.reverse.collect(&:name).join( " >> ")
+      end
+    end
+  end
+end

app/jobs/products_cache_integrity_checker_job.rb

@@ -1,30 +0,0 @@
-require 'open_food_network/products_cache_integrity_checker'
-
-ProductsCacheIntegrityCheckerJob = Struct.new(:distributor_id, :order_cycle_id) do
-  def perform
-    unless checker.ok?
-      exception = RuntimeError.new(
-        "Products JSON differs from cached version for distributor: #{distributor_id}, " \
-        "order cycle: #{order_cycle_id}"
-      )
-
-      Bugsnag.notify(exception) do |report|
-        report.add_tab(:products_cache, diff: checker.diff.to_s(:text))
-      end
-    end
-  end
-
-  private
-
-  def checker
-    OpenFoodNetwork::ProductsCacheIntegrityChecker.new(distributor, order_cycle)
-  end
-
-  def distributor
-    Enterprise.find distributor_id
-  end
-
-  def order_cycle
-    OrderCycle.find order_cycle_id
-  end
-end

app/jobs/refresh_products_cache_job.rb

@@ -1,21 +0,0 @@
-require 'open_food_network/products_renderer'
-
-RefreshProductsCacheJob = Struct.new(:distributor_id, :order_cycle_id) do
-  def perform
-    Rails.cache.write(key, products_json)
-  rescue ActiveRecord::RecordNotFound
-    true
-  end
-
-  private
-
-  def key
-    "products-json-#{distributor_id}-#{order_cycle_id}"
-  end
-
-  def products_json
-    distributor = Enterprise.find distributor_id
-    order_cycle = OrderCycle.find order_cycle_id
-    OpenFoodNetwork::ProductsRenderer.new(distributor, order_cycle).products_json
-  end
-end

app/models/calculator/weight.rb

@@ -13,8 +13,43 @@ module Calculator
 
     def compute(object)
       line_items = line_items_for object
-      total_weight = line_items.sum { |li| ((li.variant.andand.weight || 0) * li.quantity) }
-      total_weight * preferred_per_kg
+      (total_weight(line_items) * preferred_per_kg).round(2)
+    end
+
+    private
+
+    def total_weight(line_items)
+      line_items.sum do |line_item|
+        line_item_weight(line_item)
+      end
+    end
+
+    def line_item_weight(line_item)
+      if line_item.final_weight_volume.present?
+        weight_per_final_weight_volume(line_item)
+      else
+        weight_per_variant(line_item) * line_item.quantity
+      end
+    end
+
+    def weight_per_variant(line_item)
+      line_item.variant.andand.weight || 0
+    end
+
+    def weight_per_final_weight_volume(line_item)
+      if line_item.variant.product.andand.variant_unit == 'weight'
+        # Divided by 1000 because grams is the base weight unit and the calculator price is per_kg
+        line_item.final_weight_volume / 1000.0
+      else
+        weight_per_variant(line_item) * quantity_implied_in_final_weight_volume(line_item)
+      end
+    end
+
+    #  Example: 2 (line_item.quantity) wine glasses of 125mL (line_item.variant.unit_value)
+    #    Customer ends up getting 350mL (line_item.final_weight_volume) of wine
+    #      that represent 2.8 (quantity_implied_in_final_weight_volume) glasses of wine
+    def quantity_implied_in_final_weight_volume(line_item)
+      (1.0 * line_item.final_weight_volume / line_item.variant.unit_value).round(3)
     end
   end
 end

app/models/concerns/order_shipment.rb

@@ -19,7 +19,7 @@ module OrderShipment
   #
   # @return [ShippingMethod]
   def shipping_method
-    return if shipments.empty?
+    return if shipments.blank?
     shipments.first.shipping_method
   end
 

app/models/concerns/variant_stock.rb

@@ -25,36 +25,21 @@ module VariantStock
   #
   # @return [Float|Integer]
   def on_hand
-    warn_deprecation(__method__, '#total_on_hand')
-
     total_on_hand
   end
 
   # Sets the stock level of the variant.
-  # This will only work if `track_inventory_levels` config is set
-  #   and if there is a stock item for the variant.
+  # This will only work if there is a stock item for the variant.
   #
-  # @raise [StandardError] when the track_inventory_levels config key is not set
-  #   and when the variant has no stock item
+  # @raise [StandardError] when the variant has no stock item
   def on_hand=(new_level)
-    warn_deprecation(__method__, '#total_on_hand')
-
-    error = 'Cannot set on_hand value when Spree::Config[:track_inventory_levels] is false'
-    raise error unless Spree::Config.track_inventory_levels
-
     raise_error_if_no_stock_item_available
 
     overwrite_stock_levels(new_level)
   end
 
   # Checks whether this variant is produced on demand.
-  #
-  # In Spree 2.0 this attribute is removed in favour of
-  # track_inventory_levels only. It was initially introduced in
-  # https://github.com/openfoodfoundation/spree/commit/20b5ad9835dca7f41a40ad16c7b45f987eea6dcc
   def on_demand
-    warn_deprecation(__method__, 'StockItem#backorderable?')
-
     # A variant that has not been saved yet, doesn't have a stock item
     #   This provides a default value for variant.on_demand using Spree::StockLocation.backorderable_default
     return Spree::StockLocation.first.backorderable_default if stock_items.empty?
@@ -69,8 +54,6 @@ module VariantStock
   #
   # @raise [StandardError] when the variant has no stock item yet
   def on_demand=(new_value)
-    warn_deprecation(__method__, 'StockItem#backorderable=')
-
     raise_error_if_no_stock_item_available
 
     # There should be only one at the default stock location.
@@ -89,8 +72,6 @@ module VariantStock
   # Here we depend only on variant.total_on_hand and variant.on_demand.
   #   This way, variant_overrides only need to override variant.total_on_hand and variant.on_demand.
   def can_supply?(quantity)
-    return true unless Spree::Config[:track_inventory_levels]
-
     on_demand || total_on_hand >= quantity
   end
 
@@ -100,13 +81,13 @@ module VariantStock
   # Here we depend only on variant.total_on_hand and variant.on_demand.
   #   This way, variant_overrides only need to override variant.total_on_hand and variant.on_demand.
   def fill_status(quantity)
-    if on_hand >= quantity
-      on_hand = quantity
-      backordered = 0
-    else
-      on_hand = [0, total_on_hand].max
-      backordered = on_demand ? (quantity - on_hand) : 0
-    end
+    on_hand = if total_on_hand >= quantity || on_demand
+                quantity
+              else
+                [0, total_on_hand].max
+              end
+
+    backordered = 0
 
     [on_hand, backordered]
   end
@@ -117,6 +98,9 @@ module VariantStock
   def move(quantity, originator = nil)
     raise_error_if_no_stock_item_available
 
+    # Don't change variant stock if variant is on_demand
+    return if on_demand
+
     # Creates a stock movement: it updates stock_item.count_on_hand and fills backorders
     #
     # This is the original Spree::StockLocation#move,
@@ -155,11 +139,4 @@ module VariantStock
   def stock_item
     stock_items.first
   end
-
-  def warn_deprecation(method_name, new_method_name)
-    ActiveSupport::Deprecation.warn(
-      "`##{method_name}` is deprecated and will be removed. " \
-      "Please use `#{new_method_name}` instead."
-    )
-  end
 end

app/models/coordinator_fee.rb

@@ -1,13 +1,4 @@
 class CoordinatorFee < ActiveRecord::Base
   belongs_to :order_cycle
   belongs_to :enterprise_fee
-
-  after_save :refresh_products_cache
-  after_destroy :refresh_products_cache
-
-  private
-
-  def refresh_products_cache
-    order_cycle.refresh_products_cache
-  end
 end

app/models/enterprise_fee.rb

@@ -10,10 +10,6 @@ class EnterpriseFee < ActiveRecord::Base
   has_many :exchange_fees, dependent: :destroy
   has_many :exchanges, through: :exchange_fees
 
-  after_save :refresh_products_cache
-  # After destroy, the products cache is refreshed via the after_destroy hook for
-  # coordinator_fees and exchange_fees
-
   attr_accessible :enterprise_id, :fee_type, :name, :tax_category_id, :calculator_type, :inherits_tax_category
 
   FEE_TYPES = %w(packing transport admin sales fundraising).freeze
@@ -59,8 +55,4 @@ class EnterpriseFee < ActiveRecord::Base
     end
     true
   end
-
-  def refresh_products_cache
-    OpenFoodNetwork::ProductsCache.enterprise_fee_changed self
-  end
 end

app/models/exchange.rb

@@ -23,9 +23,6 @@ class Exchange < ActiveRecord::Base
   validates :order_cycle, :sender, :receiver, presence: true
   validates :sender_id, uniqueness: { scope: [:order_cycle_id, :receiver_id, :incoming] }
 
-  after_save :refresh_products_cache
-  after_destroy :refresh_products_cache_from_destroy
-
   accepts_nested_attributes_for :variants
 
   scope :in_order_cycle, lambda { |order_cycle| where(order_cycle_id: order_cycle) }
@@ -98,12 +95,4 @@ class Exchange < ActiveRecord::Base
   def participant
     incoming? ? sender : receiver
   end
-
-  def refresh_products_cache
-    OpenFoodNetwork::ProductsCache.exchange_changed self
-  end
-
-  def refresh_products_cache_from_destroy
-    OpenFoodNetwork::ProductsCache.exchange_destroyed self
-  end
 end

app/models/exchange_fee.rb

@@ -1,13 +1,4 @@
 class ExchangeFee < ActiveRecord::Base
   belongs_to :exchange
   belongs_to :enterprise_fee
-
-  after_save :refresh_products_cache
-  after_destroy :refresh_products_cache
-
-  private
-
-  def refresh_products_cache
-    exchange.refresh_products_cache
-  end
 end

app/models/inventory_item.rb

@@ -1,5 +1,3 @@
-require 'open_food_network/products_cache'
-
 class InventoryItem < ActiveRecord::Base
   attr_accessible :enterprise, :enterprise_id, :variant, :variant_id, :visible
 
@@ -13,12 +11,4 @@ class InventoryItem < ActiveRecord::Base
 
   scope :visible, -> { where(visible: true) }
   scope :hidden, -> { where(visible: false) }
-
-  after_save :refresh_products_cache
-
-  private
-
-  def refresh_products_cache
-    OpenFoodNetwork::ProductsCache.inventory_item_changed self
-  end
 end

app/models/order_cycle.rb

@@ -23,8 +23,6 @@ class OrderCycle < ActiveRecord::Base
   validates :name, :coordinator_id, presence: true
   validate :orders_close_at_after_orders_open_at?
 
-  after_save :refresh_products_cache
-
   preference :product_selection_from_coordinator_inventory_only, :boolean, default: false
 
   scope :active, lambda {
@@ -247,10 +245,6 @@ class OrderCycle < ActiveRecord::Base
     coordinator.users.include? user
   end
 
-  def refresh_products_cache
-    OpenFoodNetwork::ProductsCache.order_cycle_changed self
-  end
-
   def items_bought_by_user(user, distributor)
     # The Spree::Order.complete scope only checks for completed_at date
     #   it does not ensure state is "complete"

app/models/producer_property.rb

@@ -4,9 +4,6 @@ class ProducerProperty < ActiveRecord::Base
 
   default_scope order("#{table_name}.position")
 
-  after_save :refresh_products_cache
-  after_destroy :refresh_products_cache_from_destroy
-
   scope :ever_sold_by, ->(shop) {
     joins(producer: { supplied_products: { variants: { exchanges: :order_cycle } } }).
       merge(Exchange.outgoing).
@@ -29,14 +26,4 @@ class ProducerProperty < ActiveRecord::Base
                       Spree::Property.create(name: name, presentation: name)
     end
   end
-
-  private
-
-  def refresh_products_cache
-    OpenFoodNetwork::ProductsCache.producer_property_changed self
-  end
-
-  def refresh_products_cache_from_destroy
-    OpenFoodNetwork::ProductsCache.producer_property_destroyed self
-  end
 end

app/models/spree/ability_decorator.rb

@@ -207,12 +207,15 @@ class AbilityDecorator
   end
 
   def add_order_management_abilities(user)
-    # Enterprise User can only access orders that they are a distributor for
     can [:index, :create], Spree::Order
     can [:read, :update, :fire, :resend, :invoice, :print, :print_ticket], Spree::Order do |order|
       # We allow editing orders with a nil distributor as this state occurs
       # during the order creation process from the admin backend
-      order.distributor.nil? || user.enterprises.include?(order.distributor) || order.order_cycle.andand.coordinated_by?(user)
+      order.distributor.nil? ||
+        # Enterprise User can access orders that they are a distributor for
+        user.enterprises.include?(order.distributor) ||
+        # Enterprise User can access orders that are placed inside a OC they coordinate
+        order.order_cycle.andand.coordinated_by?(user)
     end
     can [:admin, :bulk_management, :managed], Spree::Order do
       user.admin? || user.enterprises.any?(&:is_distributor)

app/models/spree/classification_decorator.rb

@@ -2,16 +2,9 @@ Spree::Classification.class_eval do
   belongs_to :product, class_name: "Spree::Product", touch: true
 
   before_destroy :dont_destroy_if_primary_taxon
-  after_destroy :refresh_products_cache
-  after_save :refresh_products_cache
 
   private
 
-  def refresh_products_cache
-    product = Spree::Product.with_deleted.find(product_id) if product.blank?
-    product.refresh_products_cache
-  end
-
   def dont_destroy_if_primary_taxon
     if product.primary_taxon == taxon
       errors.add :base, I18n.t(:spree_classification_primary_taxon_error, taxon: taxon.name, product: product.name)

app/models/spree/image_decorator.rb

@@ -1,7 +1,4 @@
 Spree::Image.class_eval do
-  after_save :refresh_products_cache
-  after_destroy :refresh_products_cache
-
   # Spree stores attachent definitions in JSON. This converts the style name and format to
   # strings. However, when paperclip encounters these, it doesn't recognise the format.
   # Here we solve that problem by converting format and style name to symbols.
@@ -23,10 +20,4 @@ Spree::Image.class_eval do
   end
 
   reformat_styles
-
-  private
-
-  def refresh_products_cache
-    viewable.try :refresh_products_cache
-  end
 end

app/models/spree/option_type_decorator.rb

@@ -1,12 +1,5 @@
 module Spree
   OptionType.class_eval do
     has_many :products, through: :product_option_types
-    after_save :refresh_products_cache
-
-    private
-
-    def refresh_products_cache
-      products(:reload).each(&:refresh_products_cache)
-    end
   end
 end

app/models/spree/option_value_decorator.rb

@@ -1,18 +0,0 @@
-module Spree
-  OptionValue.class_eval do
-    after_save :refresh_products_cache
-    around_destroy :refresh_products_cache_from_destroy
-
-    private
-
-    def refresh_products_cache
-      variants(:reload).each(&:refresh_products_cache)
-    end
-
-    def refresh_products_cache_from_destroy
-      vs = variants(:reload).to_a
-      yield
-      vs.each(&:refresh_products_cache)
-    end
-  end
-end

app/models/spree/preference_decorator.rb

@@ -1,30 +0,0 @@
-require 'open_food_network/products_cache'
-
-module Spree
-  Preference.class_eval do
-    after_save :refresh_products_cache
-
-    # When the setting preferred_product_selection_from_inventory_only has changed, we want to
-    # refresh all active exchanges for this enterprise.
-    def refresh_products_cache
-      if product_selection_from_inventory_only_changed?
-        OpenFoodNetwork::ProductsCache.distributor_changed(enterprise)
-      end
-    end
-
-    private
-
-    def product_selection_from_inventory_only_changed?
-      !!(key =~ product_selection_from_inventory_only_regex)
-    end
-
-    def enterprise
-      enterprise_id = key.match(product_selection_from_inventory_only_regex)[1]
-      Enterprise.find(enterprise_id)
-    end
-
-    def product_selection_from_inventory_only_regex
-      /^enterprise\/product_selection_from_inventory_only\/(\d+)$/
-    end
-  end
-end

app/models/spree/price_decorator.rb

@@ -1,6 +1,11 @@
 module Spree
   Price.class_eval do
-    after_save :refresh_products_cache
+    acts_as_paranoid without_default_scope: true
+
+    # Allow prices to access associated soft-deleted variants.
+    def variant
+      Spree::Variant.unscoped { super }
+    end
 
     private
 
@@ -9,9 +14,5 @@ module Spree
         self.currency = Spree::Config[:currency]
       end
     end
-
-    def refresh_products_cache
-      variant.andand.refresh_products_cache
-    end
   end
 end

app/models/spree/product_decorator.rb

@@ -38,7 +38,6 @@ Spree::Product.class_eval do
   after_save :remove_previous_primary_taxon_from_taxons
   after_save :ensure_standard_variant
   after_save :update_units
-  after_save :refresh_products_cache
 
   # -- Joins
   scope :with_order_cycles_outer, -> {
@@ -192,23 +191,17 @@ Spree::Product.class_eval do
 
   def destroy_with_delete_from_order_cycles
     transaction do
-      OpenFoodNetwork::ProductsCache.product_deleted(self) do
-        touch_distributors
+      touch_distributors
 
-        ExchangeVariant.
-          where('exchange_variants.variant_id IN (?)', variants_including_master.with_deleted.
-          select(:id)).destroy_all
+      ExchangeVariant.
+        where('exchange_variants.variant_id IN (?)', variants_including_master.with_deleted.
+        select(:id)).destroy_all
 
-        destroy_without_delete_from_order_cycles
-      end
+      destroy_without_delete_from_order_cycles
     end
   end
   alias_method_chain :destroy, :delete_from_order_cycles
 
-  def refresh_products_cache
-    OpenFoodNetwork::ProductsCache.product_changed self
-  end
-
   private
 
   def set_available_on_to_now

app/models/spree/product_property_decorator.rb

@@ -1,10 +1,5 @@
 module Spree
   ProductProperty.class_eval do
     belongs_to :product, class_name: "Spree::Product", touch: true
-
-    after_save :refresh_products_cache
-    after_destroy :refresh_products_cache
-
-    delegate :refresh_products_cache, to: :product
   end
 end

app/models/spree/property_decorator.rb

@@ -20,19 +20,8 @@ module Spree
         merge(OrderCycle.active)
     }
 
-    after_save :refresh_products_cache
-
-    # When a Property is destroyed, dependent-destroy will destroy all ProductProperties,
-    # which will take care of refreshing the products cache
-
     def property
       self
     end
-
-    private
-
-    def refresh_products_cache
-      product_properties(:reload).each(&:refresh_products_cache)
-    end
   end
 end

app/models/spree/shipment_decorator.rb

@@ -32,7 +32,7 @@ module Spree
     # NOTE: This is an override of spree's method, needed to allow orders
     # without line items (ie. user invoices) to not have inventory units
     def require_inventory
-      return false unless Spree::Config[:track_inventory_levels] && line_items.count > 0 # This line altered
+      return false unless line_items.count > 0 # This line altered
       order.completed? && !order.canceled?
     end
   end

app/models/spree/stock_movement_decorator.rb

@@ -1,10 +0,0 @@
-Spree::StockMovement.class_eval do
-  after_save :refresh_products_cache
-
-  private
-
-  def refresh_products_cache
-    return if stock_item.variant.blank?
-    OpenFoodNetwork::ProductsCache.variant_changed stock_item.variant
-  end
-end

app/models/spree/taxon_decorator.rb

@@ -4,8 +4,6 @@ Spree::Taxon.class_eval do
   attachment_definitions[:icon][:path] = 'public/images/spree/taxons/:id/:style/:basename.:extension'
   attachment_definitions[:icon][:url] = '/images/spree/taxons/:id/:style/:basename.:extension'
 
-  after_save :refresh_products_cache
-
   # Indicate which filters should be used for this taxon
   def applicable_filters
     fs = []
@@ -49,10 +47,4 @@ Spree::Taxon.class_eval do
       ts[t.enterprise_id.to_i] << t.id
     end
   end
-
-  private
-
-  def refresh_products_cache
-    products(:reload).each(&:refresh_products_cache)
-  end
 end

app/models/spree/variant_decorator.rb

@@ -1,7 +1,6 @@
 require 'open_food_network/enterprise_fee_calculator'
 require 'open_food_network/variant_and_line_item_naming'
 require 'concerns/variant_stock'
-require 'open_food_network/products_cache'
 
 Spree::Variant.class_eval do
   extend Spree::LocalizedNumber
@@ -30,7 +29,6 @@ Spree::Variant.class_eval do
 
   before_validation :update_weight_from_unit_value, if: ->(v) { v.product.present? }
   after_save :update_units
-  after_save :refresh_products_cache
   around_destroy :destruction
 
   scope :with_order_cycles_inner, -> { joins(exchanges: :order_cycle) }
@@ -91,6 +89,11 @@ Spree::Variant.class_eval do
     can_supply?(quantity)
   end
 
+  # Allow variant to access associated soft-deleted prices.
+  def default_price
+    Spree::Price.unscoped { super }
+  end
+
   def price_with_fees(distributor, order_cycle)
     price + fees_for(distributor, order_cycle)
   end
@@ -103,14 +106,6 @@ Spree::Variant.class_eval do
     OpenFoodNetwork::EnterpriseFeeCalculator.new(distributor, order_cycle).fees_by_type_for self
   end
 
-  def refresh_products_cache
-    if is_master?
-      product.refresh_products_cache
-    else
-      OpenFoodNetwork::ProductsCache.variant_changed self
-    end
-  end
-
   private
 
   def update_weight_from_unit_value
@@ -118,21 +113,7 @@ Spree::Variant.class_eval do
   end
 
   def destruction
-    if is_master?
-      exchange_variants(:reload).destroy_all
-      yield
-      product.refresh_products_cache
-
-    else
-      OpenFoodNetwork::ProductsCache.variant_destroyed(self) do
-        # Remove this association here instead of using dependent: :destroy because
-        # dependent-destroy acts before this around_filter is called, so ProductsCache
-        # has no way of knowing which exchanges the variant was a member of.
-        exchange_variants(:reload).destroy_all
-
-        # Destroy the variant
-        yield
-      end
-    end
+    exchange_variants(:reload).destroy_all
+    yield
   end
 end

app/models/subscription_line_item.rb

@@ -10,6 +10,11 @@ class SubscriptionLineItem < ActiveRecord::Base
     (price_estimate || 0) * (quantity || 0)
   end
 
+  # Ensure SubscriptionLineItem always has access to soft-deleted Variant attribute
+  def variant
+    Spree::Variant.unscoped { super }
+  end
+
   # Used to calculators to estimate fees
   alias_method :amount, :total_estimate
 

app/models/variant_override.rb

@@ -12,9 +12,6 @@ class VariantOverride < ActiveRecord::Base
   # Default stock can be nil, indicating stock should not be reset or zero, meaning reset to zero. Need to ensure this can be set by the user.
   validates :default_stock, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
 
-  after_save :refresh_products_cache_from_save
-  after_destroy :refresh_products_cache_from_destroy
-
   default_scope where(permission_revoked_at: nil)
 
   scope :for_hubs, lambda { |hubs|
@@ -73,14 +70,4 @@ class VariantOverride < ActiveRecord::Base
     end
     self
   end
-
-  private
-
-  def refresh_products_cache_from_save
-    OpenFoodNetwork::ProductsCache.variant_override_changed self
-  end
-
-  def refresh_products_cache_from_destroy
-    OpenFoodNetwork::ProductsCache.variant_override_destroyed self
-  end
 end

app/overrides/admin_tab.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/admin",
-                     name: "user_admin_tabs",
-                     insert_bottom: "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     partial: "spree/admin/users_tab",
-                     disabled: false,
-                     original: '031652cf5a054796022506622082ab6d2693699f')

app/overrides/auth_admin_login_navigation_bar.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/admin",
-                     name: "auth_admin_login_navigation_bar",
-                     insert_top: "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]",
-                     partial: "spree/layouts/admin/login_nav",
-                     original: '841227d0aedf7909d62237d8778df99100087715')

app/overrides/auth_shared_login_bar.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(virtual_path: "spree/shared/_nav_bar",
-                     name: "auth_shared_login_bar",
-                     insert_before: "li#search-bar",
-                     partial: "spree/shared/login_bar",
-                     disabled: false,
-                     original: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')

app/overrides/remove_search_bar.rb

@@ -1,3 +0,0 @@
-Deface::Override.new(virtual_path: "spree/shared/_nav_bar",
-                     remove: "#search-bar",
-                     name: "search_removal")

app/overrides/remove_side_bar.rb

@@ -1,3 +0,0 @@
-Deface::Override.new(virtual_path: "spree/shared/_sidebar",
-                     remove: "#sidebar",
-                     name: "sidebar_removal")

app/overrides/set_auth_token_in_backend.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/admin",
-                     insert_bottom: "[data-hook='admin_inside_head']",
-                     partial: "layouts/auth_token_script",
-                     name: "set_auth_token_in_backend",
-                     original: '6bc2c5de1c8f7542d033548557437c9fe4b3ba02')

app/overrides/set_auth_token_in_frontend.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(virtual_path: "spree/layouts/spree_application",
-                     insert_bottom: "[data-hook='inside_head']",
-                     partial: "layouts/auth_token_script",
-                     name: "set_auth_token_in_frontend",
-                     original: '5659ac7dbf6ac6469907b005b85285b894677815')

app/overrides/spree/layouts/admin/add_app_wrapper.html.erb.deface

@@ -1,5 +0,0 @@
-<!-- surround_contents 'body' -->
-
-<div <%= yield(:app_wrapper_attrs).strip.html_safe %>>
-  <%= render_original %>
-</div>

app/overrides/spree/shared/_footer/footer.html.haml.deface

@@ -1,19 +0,0 @@
-/ replace "footer"
-
--#= render partial: "shared/footer"
-%footer
-  %hr/
-
-  -#.row
-    -#.seven.columns.offset-by-three
-      -#%center
-        -#%h1 What is open food network?
-        -#%p
-          -#%i
-            -#Open food network is an online space in which people can connect with, trade and sell food directly with
-            -#Australian farmers.  We aim to reconnect people with their food.
-  -#%hr/
-
-  -#.row
-    -#.five.columns.secondary.offset-by-seven.secondary
-      -#All rights reserved. © 2013 Open Food Foundation

app/overrides/spree/shared/_header/replace_logo_with_link_text.html.haml.deface

@@ -1,8 +0,0 @@
-/ replace "#logo"
-
-%figure#logo.columns.eight
-  - if current_distributor
-    %h1= link_to current_distributor.name, main_app.enterprise_shop_path(current_distributor)
-    .change-location= link_to 'Change Location', root_path
-  - else
-    %h1= link_to "OPEN FOOD NETWORK", root_path

app/overrides/spree/shared/_nav_bar/adjust_top_nav_columns.html.haml.deface

@@ -1,2 +0,0 @@
-/ set_attributes '#top-nav-bar'
-/ attributes({:class => "columns eight"})

app/overrides/spree/shared/_user_form/add_confirmation_message.html.haml.deface

@@ -1,5 +0,0 @@
-/ insert_before "#password-credentials"
-
-- if @unconfirmed_email
-  %p.alert-box
-    = t('spree.users.show.unconfirmed_email', unconfirmed_email: @unconfirmed_email)

app/serializers/api/address_serializer.rb

@@ -4,7 +4,11 @@ class Api::AddressSerializer < ActiveModel::Serializer
 
   attributes :id, :zipcode, :city, :state_name, :state_id,
              :phone, :firstname, :lastname, :address1, :address2, :city, :country_id,
-             :zipcode
+             :zipcode, :country_name
+
+  def country_name
+    object.country.andand.name
+  end
 
   def state_name
     object.state.andand.abbr

app/serializers/api/adjustment_serializer.rb

@@ -0,0 +1,8 @@
+module Api
+  class AdjustmentSerializer < ActiveModel::Serializer
+    attributes :id, :amount, :label, :eligible,
+               :source_type, :source_id,
+               :adjustable_type, :adjustable_id,
+               :originator_type, :originator_id
+  end
+end

app/serializers/api/admin/basic_enterprise_serializer.rb

@@ -1,4 +1,4 @@
 class Api::Admin::BasicEnterpriseSerializer < ActiveModel::Serializer
-  attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :payment_method_ids, :shipping_method_ids
-  attributes :producer_profile_only, :permalink
+  attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category,
+             :payment_method_ids, :shipping_method_ids, :producer_profile_only, :permalink
 end

app/serializers/api/admin/customer_serializer.rb

@@ -1,6 +1,6 @@
 class Api::Admin::CustomerSerializer < ActiveModel::Serializer
-  attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :name
-  attributes :allow_charges, :default_card_present?
+  attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :name,
+             :allow_charges, :default_card_present?
 
   has_one :ship_address, serializer: Api::AddressSerializer
   has_one :bill_address, serializer: Api::AddressSerializer

app/serializers/api/admin/enterprise_fee_serializer.rb

@@ -1,6 +1,6 @@
 class Api::Admin::EnterpriseFeeSerializer < ActiveModel::Serializer
-  attributes :id, :enterprise_id, :fee_type, :name, :tax_category_id, :inherits_tax_category, :calculator_type
-  attributes :enterprise_name, :calculator_description, :calculator_settings
+  attributes :id, :enterprise_id, :fee_type, :name, :tax_category_id, :inherits_tax_category,
+             :calculator_type, :enterprise_name, :calculator_description, :calculator_settings
 
   def enterprise_name
     object.enterprise.andand.name
@@ -16,7 +16,9 @@ class Api::Admin::EnterpriseFeeSerializer < ActiveModel::Serializer
     result = nil
 
     options[:controller].__send__(:with_format, :html) do
-      result = options[:controller].render_to_string partial: 'admin/enterprise_fees/calculator_settings', locals: { enterprise_fee: object }
+      result = options[:controller].
+        render_to_string(partial: 'admin/enterprise_fees/calculator_settings',
+                         locals: { enterprise_fee: object })
     end
 
     result.gsub('[0]', '[{{ $index }}]').gsub('_0_', '_{{ $index }}_')

app/serializers/api/admin/enterprise_serializer.rb

@@ -1,11 +1,12 @@
 class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
-  attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :payment_method_ids, :shipping_method_ids
-  attributes :producer_profile_only, :long_description, :permalink
-  attributes :preferred_shopfront_message, :preferred_shopfront_closed_message, :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order
-  attributes :preferred_product_selection_from_inventory_only
-  attributes :owner, :contact, :users, :tag_groups, :default_tag_group
-  attributes :require_login, :allow_guest_orders, :allow_order_changes
-  attributes :logo, :promo_image
+  attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :permalink,
+             :payment_method_ids, :shipping_method_ids, :producer_profile_only, :long_description,
+             :preferred_shopfront_message, :preferred_shopfront_closed_message,
+             :preferred_shopfront_taxon_order, :preferred_shopfront_order_cycle_order,
+             :preferred_product_selection_from_inventory_only,
+             :owner, :contact, :users, :tag_groups, :default_tag_group,
+             :require_login, :allow_guest_orders, :allow_order_changes,
+             :logo, :promo_image
 
   has_one :owner, serializer: Api::Admin::UserSerializer
   has_many :users, serializer: Api::Admin::UserSerializer
@@ -21,7 +22,9 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
 
   def tag_groups
     object.tag_rules.prioritised.reject(&:is_default).each_with_object([]) do |tag_rule, tag_groups|
-      tag_group = find_match(tag_groups, tag_rule.preferred_customer_tags.split(",").map{ |t| { text: t } })
+      tag_group = find_match(tag_groups, tag_rule.preferred_customer_tags.
+                                           split(",").
+                                           map{ |t| { text: t } })
       if tag_group[:rules].empty?
         tag_groups << tag_group
         tag_group[:position] = tag_groups.count
@@ -32,13 +35,16 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
 
   def default_tag_group
     default_rules = object.tag_rules.select(&:is_default)
-    serialized_rules = ActiveModel::ArraySerializer.new(default_rules, each_serializer: Api::Admin::TagRuleSerializer)
+    serialized_rules =
+      ActiveModel::ArraySerializer.new(default_rules,
+                                       each_serializer: Api::Admin::TagRuleSerializer)
     { tags: [], rules: serialized_rules }
   end
 
   def find_match(tag_groups, tags)
     tag_groups.each do |tag_group|
-      return tag_group if tag_group[:tags].length == tags.length && (tag_group[:tags] & tags) == tag_group[:tags]
+      return tag_group if tag_group[:tags].length == tags.length &&
+                          (tag_group[:tags] & tags) == tag_group[:tags]
     end
     { tags: tags, rules: [] }
   end
@@ -56,7 +62,7 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
   #   #   medium: LOGO_MEDIUM_URL
   #   # }
   def attachment_urls(attachment, versions)
-    return unless attachment.exists?
+    return unless attachment.file?
 
     versions.each_with_object({}) do |version, urls|
       urls[version] = attachment.url(version)

app/serializers/api/admin/exchange_serializer.rb

@@ -1,6 +1,7 @@
 class Api::Admin::ExchangeSerializer < ActiveModel::Serializer
-  attributes :id, :sender_id, :receiver_id, :incoming, :variants, :receival_instructions, :pickup_time, :pickup_instructions
-  attributes :tags, :tag_list
+  attributes :id, :sender_id, :receiver_id, :incoming, :variants,
+             :receival_instructions, :pickup_time, :pickup_instructions,
+             :tags, :tag_list
 
   has_many :enterprise_fees, serializer: Api::Admin::BasicEnterpriseFeeSerializer
 

app/serializers/api/admin/for_order_cycle/enterprise_serializer.rb

@@ -1,12 +1,16 @@
 require 'open_food_network/enterprise_issue_validator'
 
 class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
-  attributes :id, :name, :managed, :supplied_products
-  attributes :issues_summary_supplier, :issues_summary_distributor
-  attributes :is_primary_producer, :is_distributor, :sells
+  attributes :id, :name, :managed, :supplied_products,
+             :issues_summary_supplier, :issues_summary_distributor,
+             :is_primary_producer, :is_distributor, :sells
 
   def issues_summary_supplier
-    issues = OpenFoodNetwork::EnterpriseIssueValidator.new(object).issues_summary confirmation_only: true
+    issues =
+      OpenFoodNetwork::EnterpriseIssueValidator.
+        new(object).
+        issues_summary(confirmation_only: true)
+
     if issues.nil? && products.empty?
       issues = "no products in inventory"
     end
@@ -23,7 +27,8 @@ class Api::Admin::ForOrderCycle::EnterpriseSerializer < ActiveModel::Serializer
 
   def supplied_products
     serializer = Api::Admin::ForOrderCycle::SuppliedProductSerializer
-    ActiveModel::ArraySerializer.new(products, each_serializer: serializer, order_cycle: order_cycle)
+    ActiveModel::ArraySerializer.new(products, each_serializer: serializer,
+                                               order_cycle: order_cycle)
   end
 
   private