Merge pull request #3891 from openfoodfoundation/2-0-1

Bring changes introduced in v2.0.1 into 2-0-stable

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

@@ -1,6 +1,6 @@
 angular.module('admin.enterpriseFees').controller 'enterpriseFeesCtrl', ($scope, $http, $window, enterprises, tax_categories, calculators) ->
   $scope.enterprises = enterprises
-  $scope.tax_categories =  [{id: -1, name: "Inherit From Product"}].concat tax_categories
+  $scope.tax_categories =  [{id: -1, name: t('js.admin.enterprise_fees.inherit_from_product') }].concat tax_categories
   $scope.calculators = calculators
 
   $scope.enterpriseFeesUrl = ->

app/jobs/products_cache_integrity_checker_job.rb

@@ -3,7 +3,14 @@ require 'open_food_network/products_cache_integrity_checker'
 ProductsCacheIntegrityCheckerJob = Struct.new(:distributor_id, :order_cycle_id) do
   def perform
     unless checker.ok?
-      Bugsnag.notify RuntimeError.new("Products JSON differs from cached version for distributor: #{distributor_id}, order cycle: #{order_cycle_id}"), diff: checker.diff.to_s(:text)
+      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
 

app/views/admin/enterprise_fees/index.html.haml

@@ -6,7 +6,7 @@
   = render "admin/enterprise_fees/data"
   = render :partial => 'spree/shared/error_messages', :locals => { :target => @enterprise_fee_set }
 
-  %input.search{'ng-model' => 'query', 'placeholder' => 'Search'}
+  %input.search{'ng-model' => 'query', 'placeholder' => t('.search')}
 
   %table.index#listing_enterprise_fees
     %thead

config/locales/en.yml

@@ -434,6 +434,7 @@ en:
         tax_category: Tax Category
         calculator: Calculator
         calculator_values: Calculator Values
+        search: "Search"
 
     enterprise_groups:
       index:
@@ -2495,6 +2496,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using
           resolve: Resolve
       new_tag_rule_dialog:
         select_rule_type: "Select a rule type:"
+      enterprise_fees:
+        inherit_from_product: "Inherit From Product"
       orders:
         index:
           per_page: "%{results} per page"

db/migrate/20190506194625_update_stock_locations_backorderable_default.rb

@@ -0,0 +1,5 @@
+class UpdateStockLocationsBackorderableDefault < ActiveRecord::Migration
+  def change
+    Spree::StockLocation.update_all(backorderable_default: false)
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20190501143327) do
+ActiveRecord::Schema.define(:version => 20190506194625) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"