[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)

app/controllers/admin/variant_overrides_controller.rb

@@ -61,10 +61,8 @@ def load_data
 
     def inventory_import_dates
       import_dates = VariantOverride.
-        select('DISTINCT variant_overrides.import_date').
-        where('variant_overrides.hub_id IN (?)
-        AND variant_overrides.import_date IS NOT NULL', editable_enterprises.collect(&:id)).
-        order('import_date DESC')
+        distinct_import_dates.
+        for_hubs(editable_enterprises.collect(&:id))
 
       options = [{ id: '0', name: 'All' }]
       import_dates.collect(&:import_date).map { |i| options.push(id: i.to_date, name: i.to_date.to_formatted_s(:long)) }

app/controllers/spree/admin/orders_controller_decorator.rb

@@ -61,12 +61,7 @@ def index
       format.json do
         render json: {
           orders: ActiveModel::ArraySerializer.new(@orders, each_serializer: Api::Admin::OrderSerializer),
-          pagination: {
-            results: @orders.total_count,
-            pages: @orders.num_pages.to_i,
-            page: params[:page].to_i,
-            per_page: params[:per_page].to_i
-          }
+          pagination: pagination_data
         }
       end
     end
@@ -115,7 +110,30 @@ def orders
       @search.result.includes([:user, :shipments, :payments]).distributed_by_user(spree_current_user)
     end
 
-    @search.result.page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
+    search_results
+  end
+
+  def search_results
+    if using_pagination?
+      @search.result.page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])
+    else
+      @search.result
+    end
+  end
+
+  def using_pagination?
+    params[:per_page]
+  end
+
+  def pagination_data
+    if using_pagination?
+      {
+        results: @orders.total_count,
+        pages: @orders.num_pages,
+        page: params[:page].to_i,
+        per_page: params[:per_page].to_i
+      }
+    end
   end
 
   def require_distributor_abn

app/models/product_import/entry_processor.rb

@@ -135,7 +135,7 @@ def save_new_inventory_item(entry)
         @inventory_created += 1
         @updated_ids.push new_item.id
       else
-        @importer.errors.add("#{I18n.t('admin.product_import.model.line')} #{line_number}:", new_item.errors.full_messages)
+        assign_errors new_item.errors.full_messages, entry.line_number
       end
     end
 
@@ -149,7 +149,7 @@ def save_existing_inventory_item(entry)
         @inventory_updated += 1
         @updated_ids.push existing_item.id
       else
-        @importer.errors.add("#{I18n.t('admin.product_import.model.line')} #{line_number}:", existing_item.errors.full_messages)
+        assign_errors existing_item.errors.full_messages, entry.line_number
       end
     end
 
@@ -173,7 +173,7 @@ def save_new_product(entry)
         @products_created += 1
         @updated_ids.push product.variants.first.id
       else
-        @importer.errors.add("#{I18n.t('admin.product_import.model.line')} #{line_number}:", product.errors.full_messages)
+        assign_errors product.errors.full_messages, entry.line_number
       end
 
       @already_created[entry.supplier_id] = { entry.name => product.id }
@@ -188,11 +188,19 @@ def save_variant(entry)
         @updated_ids.push variant.id
         true
       else
-        @importer.errors.add("#{I18n.t('admin.product_import.model.line')} #{line_number}:", variant.errors.full_messages)
+        assign_errors variant.errors.full_messages, entry.line_number
         false
       end
     end
 
+    def assign_errors(errors, line_number)
+      @importer.errors.add(
+        I18n.t('admin.product_import.model.line_number',
+               number: line_number),
+        errors
+      )
+    end
+
     def assign_defaults(object, entry)
       # Assigns a default value for a specified field e.g. category='Vegetables', setting this value
       # either for all entries (overwrite_all), or only for those entries where the field was blank

app/models/spree/address_decorator.rb

@@ -1,35 +1,27 @@
 Spree::Address.class_eval do
-  has_one :enterprise
+  has_one :enterprise, dependent: :restrict
   belongs_to :country, class_name: "Spree::Country"
 
   after_save :touch_enterprise
 
   geocoded_by :geocode_address
 
-  delegate :name, :to => :state, :prefix => true, :allow_nil => true
+  delegate :name, to: :state, prefix: true, allow_nil: true
 
   def geocode_address
-    geocode_address = [address1, address2, zipcode, city, country.andand.name, state.andand.name]
-    filtered_address = geocode_address.select{ |field| !field.nil? && field != '' }
-    filtered_address.compact.join(', ')
+    render_address([address1, address2, zipcode, city, country.andand.name, state.andand.name])
   end
 
   def full_address
-    full_address = [address1, address2, city, zipcode, state.andand.name]
-    filtered_address = full_address.select{ |field| !field.nil? && field != '' }
-    filtered_address.compact.join(', ')
+    render_address([address1, address2, city, zipcode, state.andand.name])
   end
 
   def address_part1
-    address_part1 = [address1, address2]
-    filtered_address = address_part1.select{ |field| !field.nil? && field != '' }
-    filtered_address.compact.join(', ')
+    render_address([address1, address2])
   end
 
   def address_part2
-    address_part2= [city, zipcode, state.andand.name]
-    filtered_address = address_part2.select{ |field| !field.nil? && field != '' }
-    filtered_address.compact.join(', ')
+    render_address([city, zipcode, state.andand.name])
   end
 
   private
@@ -38,26 +30,7 @@ def touch_enterprise
     enterprise.andand.touch
   end
 
-  # We have a hard-to-track-down bug around invalid addresses with all-nil fields finding
-  # their way into the database. I don't know what the source of them is, so this patch
-  # is designed to track them down.
-  # This is intended to be a temporary investigative measure, and should be removed from the
-  # code base shortly. If it's past 17-10-2013, take it out.
-  #
-  #-- Rohan, 17-9-2913
-  def create
-    if self.zipcode.nil?
-      Bugsnag.notify RuntimeError.new('Creating a Spree::Address with nil values')
-    end
-
-    super
-  end
-
-  def update(attribute_names = @attributes.keys)
-    if self.zipcode.nil?
-      Bugsnag.notify RuntimeError.new('Updating a Spree::Address with nil values')
-    end
-
-    super(attribute_names)
+  def render_address(parts)
+    parts.select(&:present?).join(', ')
   end
 end

app/models/variant_override.rb

@@ -3,8 +3,6 @@ class VariantOverride < ActiveRecord::Base
 
   acts_as_taggable
 
-  attr_accessor :import_date
-
   belongs_to :hub, class_name: 'Enterprise'
   belongs_to :variant, class_name: 'Spree::Variant'
 
@@ -21,6 +19,12 @@ class VariantOverride < ActiveRecord::Base
     where(hub_id: hubs)
   }
 
+  scope :distinct_import_dates, lambda {
+    select('DISTINCT variant_overrides.import_date').
+      where('variant_overrides.import_date IS NOT NULL').
+      order('import_date DESC')
+  }
+
   localize_number :price
 
   def self.indexed(hub)

config/initializers/geocoder.rb

@@ -0,0 +1,6 @@
+# Google requires an API key with a billing account to use their API.
+# The key is stored in config/application.yml.
+Geocoder.configure(
+  use_https: true,
+  api_key: ENV.fetch('GOOGLE_MAPS_API_KEY', nil)
+)

config/initializers/spree.rb

@@ -24,6 +24,9 @@
   config.order_updater_decorator = OrderUpdater
 end
 
+# Don't log users out when setting a new password
+Spree::Auth::Config[:signout_after_password_change] = false
+
 # TODO Work out why this is necessary
 # Seems like classes within OFN module become 'uninitialized' when server reloads
 # unless the empty module is explicity 'registered' here. Something to do with autoloading?

config/initializers/stripe.rb

@@ -4,6 +4,8 @@
 # a bit cleaner than accessing keys in different ways.
 module Stripe
   class << self
+    # Returns the value of Stripe.publishable_key and Stripe.endpoint_secret.
+    # Attribute values can also be set by doing Stripe.publishable_key = <your_new_value>
     attr_accessor :publishable_key, :endpoint_secret
   end
 end

config/locales/en.yml

@@ -519,7 +519,7 @@ en:
         products_no_permission: you do not have permission to manage products for this enterprise
         inventory_no_permission: you do not have permission to create inventory for this producer
         none_saved: did not save any products successfully
-        line: Line
+        line_number: "Line %{number}:"
       index:
         select_file: Select a spreadsheet to upload
         spreadsheet: Spreadsheet