spree_core 4.1.15 → 4.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 839249efbd80112c669ba2a4790ab353b6c31476be2c845de2edfbda03d6cd6b
-  data.tar.gz: 170887f258fae01503d713b33f709fdff05f8f8298c3bdfb11d659881be58a3d
+  metadata.gz: dd3e3f16eb808f16f592360085f02f1382ee4ddd6ee0903c3eb8a8079e5d8bad
+  data.tar.gz: 8567b7555de6f0f578d6277e6943af11b68329e5e17a77d13c7e66085e7fe09f
 SHA512:
-  metadata.gz: b8492dc3ea5d4c89f2cc6de08ac9aee6b28bbc04fa9518550c72c51c9ccf60bf1930fe0c5db5000a5baee6faa1a2924d84e32c20bfd1fc58cbe3c73db27b593a
-  data.tar.gz: 95128587c2913170eccf5dd5bcf1cd39686c5e57cd4ec952e8fcfa89079ff28671f7630c975fd6e2af0243a71c54fab8f6605d01a9b038f368e3aa6dde90c2e8
+  metadata.gz: 113900d45a999bb7aa47209797e8ab47a5ed6f40caa445242952eac3a604cc43bc658fec8fb86dc148743032f71341d97331cd7d6d7b77d84df36ffc979f122b
+  data.tar.gz: a175395cbe157f6ca1704ab5bdacbbf5c9abbee4bdae89f19363c06fc7a1fe06610fab87347342ecddd297d3bf22bf9354116340e8e408270a4f968a78883a0e

data/app/controllers/spree/base_controller.rb

@@ -7,6 +7,7 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
+  include Spree::Core::ControllerHelpers::CurrencyHelpers
 
   respond_to :html
 end

data/app/helpers/spree/base_helper.rb

@@ -22,6 +22,13 @@ module Spree
         to_html
     end
 
+    def display_compare_at_price(product_or_variant)
+      product_or_variant.
+        price_in(current_currency).
+        display_compare_at_price_including_vat_for(current_price_options).
+        to_html
+    end
+
     def link_to_tracking(shipment, options = {})
       return unless shipment.tracking && shipment.shipping_method
 
@@ -34,7 +41,15 @@ module Spree
       end
     end
 
-    def logo(image_path = Spree::Config[:logo], options = {})
+    def logo(image_path = nil, options = {})
+      image_path ||= if current_store.logo.attached? && current_store.logo.variable?
+                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
+                     elsif current_store.logo.attached? && current_store.logo.image?
+                       main_app.url_for(current_store.logo)
+                     else
+                       Spree::Config[:logo]
+                     end
+
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
 
       link_to path, 'aria-label': current_store.name, method: options[:method] do
@@ -97,7 +112,13 @@ module Spree
     def pretty_time(time)
       return '' if time.blank?
 
-      [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p')].join(' ')
+      [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p %Z')].join(' ')
+    end
+
+    def pretty_date(date)
+      return '' if date.blank?
+
+      [I18n.l(date.to_date, format: :long)].join(' ')
     end
 
     def seo_url(taxon, options = nil)

data/app/helpers/spree/mail_helper.rb

@@ -0,0 +1,24 @@
+module Spree
+  module MailHelper
+    include BaseHelper
+
+    def variant_image_url(variant)
+      image = default_image_for_product_or_variant(variant)
+      image ? main_app.url_for(image.url(:small)) : 'noimage/small.png'
+    end
+
+    def name_for(order)
+      order.name || Spree.t('customer')
+    end
+
+    def logo_path
+      if current_store.present? && current_store.logo.attached? && current_store.logo.variable?
+        main_app.url_for(current_store.logo.variant(resize: '244x104>'))
+      elsif current_store.present? && current_store.logo.attached? && current_store.logo.image?
+        main_app.url_for(current_store.logo)
+      else
+        Spree::Config.mailer_logo || Spree::Config.logo
+      end
+    end
+  end
+end

data/app/mailers/spree/base_mailer.rb

@@ -1,10 +1,18 @@
 module Spree
   class BaseMailer < ActionMailer::Base
+    add_template_helper(MailHelper)
+
+    def current_store
+      @current_store ||= Spree::Store.current
+    end
+    helper_method :current_store
+
     def from_address
-      Spree::Store.current.mail_from_address
+      current_store.mail_from_address
     end
 
-    def money(amount, currency = Spree::Config[:currency])
+    def money(amount, currency = nil)
+      currency ||= current_store.default_currency
       Spree::Money.new(amount, currency: currency).to_s
     end
     helper_method :money
@@ -16,6 +24,7 @@ module Spree
 
     def mail(headers = {}, &block)
       ensure_default_action_mailer_url_host
+      set_email_locale
       super if Spree::Config[:send_core_emails]
     end
 
@@ -26,7 +35,12 @@ module Spree
     # http://guides.rubyonrails.org/action_mailer_basics.html#generating-urls-in-action-mailer-views
     def ensure_default_action_mailer_url_host
       ActionMailer::Base.default_url_options ||= {}
-      ActionMailer::Base.default_url_options[:host] ||= Spree::Store.current.url
+      ActionMailer::Base.default_url_options[:host] ||= current_store.url
+    end
+
+    def set_email_locale
+      locale = @order&.store&.default_locale || current_store&.default_locale
+      I18n.locale = locale if locale.present?
     end
   end
 end

data/app/mailers/spree/order_mailer.rb

@@ -2,15 +2,24 @@ module Spree
   class OrderMailer < BaseMailer
     def confirm_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
+      subject += "#{current_store.name} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
       mail(to: @order.email, from: from_address, subject: subject)
     end
 
+    def store_owner_notification_email(order)
+      @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      current_store = @order.store
+      subject = Spree.t('order_mailer.store_owner_notification_email.subject', store_name: current_store.name)
+      mail(to: current_store.new_order_notifications_email, from: from_address, subject: subject)
+    end
+
     def cancel_email(order, resend = false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+      current_store = @order.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
+      subject += "#{current_store.name} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
       mail(to: @order.email, from: from_address, subject: subject)
     end
   end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -2,9 +2,11 @@ module Spree
   class ReimbursementMailer < BaseMailer
     def reimbursement_email(reimbursement, resend = false)
       @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
+      @order = @reimbursement.order
+      current_store = @reimbursement.store || Spree::Store.current
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
-      mail(to: @reimbursement.order.email, from: from_address, subject: subject)
+      subject += "#{current_store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: current_store.mail_from_address, subject: subject)
     end
   end
 end

data/app/mailers/spree/shipment_mailer.rb

@@ -2,9 +2,11 @@ module Spree
   class ShipmentMailer < BaseMailer
     def shipped_email(shipment, resend = false)
       @shipment = shipment.respond_to?(:id) ? shipment : Spree::Shipment.find(shipment)
+      @order = @shipment.order
+      current_store = @shipment.store
       subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      subject += "#{Spree::Store.current.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@shipment.order.number}"
-      mail(to: @shipment.order.email, from: from_address, subject: subject)
+      subject += "#{current_store.name} #{Spree.t('shipment_mailer.shipped_email.subject')} ##{@order.number}"
+      mail(to: @order.email, from: from_address, subject: subject)
     end
   end
 end

data/app/models/concerns/spree/default_price.rb

@@ -9,7 +9,8 @@ module Spree
               dependent: :destroy
 
       delegate :display_price, :display_amount, :price, :currency, :price=,
-               :price_including_vat_for, :currency=, to: :find_or_build_default_price
+               :price_including_vat_for, :currency=, :display_compare_at_price,
+               :compare_at_price, :compare_at_price=, to: :find_or_build_default_price
 
       after_save :save_default_price
 

data/app/models/concerns/spree/user_methods.rb

@@ -30,15 +30,20 @@ module Spree
       self.whitelisted_ransackable_associations = %w[bill_address ship_address]
       self.whitelisted_ransackable_attributes = %w[id email]
 
+      def self.with_email(query)
+        where('email LIKE ?', "%#{query}%")
+      end
+
       def self.with_address(query, address = :ship_address)
         left_outer_joins(address).
           where("#{Spree::Address.table_name}.firstname like ?", "%#{query}%").
           or(left_outer_joins(address).where("#{Spree::Address.table_name}.lastname like ?", "%#{query}%"))
       end
 
-      def self.with_email_or_addresses_ids(query, addresses_ids = [])
-        where('email LIKE ?', "%#{query}%").
-          or(where(id: addresses_ids))
+      def self.with_email_or_address(email, address)
+        left_outer_joins(:addresses).
+          where("#{Spree::Address.table_name}.firstname LIKE ? or #{Spree::Address.table_name}.lastname LIKE ? or email LIKE ?",
+                "%#{address}%", "%#{address}%", "%#{email}%")
       end
     end
 
@@ -54,8 +59,9 @@ module Spree
         first
     end
 
-    def total_available_store_credit
-      store_credits.reload.to_a.sum(&:amount_remaining)
+    def total_available_store_credit(currency = nil)
+      currency ||= Spree::Config[:currency]
+      store_credits.where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
     private

data/app/models/spree/app_configuration.rb

@@ -49,6 +49,7 @@ module Spree
     preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
     preference :layout, :string, default: 'spree/layouts/spree_application'
     preference :logo, :string, default: 'logo/spree_50.png'
+    preference :mailer_logo, :string, default: 'logo/spree_50.png'
     preference :max_level_in_taxons_menu, :integer, default: 1 # maximum nesting level in taxons menu
     preference :products_per_page, :integer, default: 12
     preference :require_master_price, :boolean, default: true
@@ -67,6 +68,10 @@ module Spree
     preference :non_expiring_credit_types, :array, default: []
     preference :credit_to_new_allocation, :boolean, default: false
 
+    # Multi currency configurations
+    preference :allow_currency_change,  :boolean, default: false
+    preference :show_currency_selector, :boolean, default: false
+
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class
       @searcher_class ||= Spree::Core::Search::Base

data/app/models/spree/app_dependencies.rb

@@ -11,8 +11,7 @@ module Spree
       :checkout_remove_store_credit_service, :checkout_get_shipping_rates_service,
       :coupon_handler, :country_finder, :current_order_finder, :credit_card_finder,
       :completed_order_finder, :order_sorter, :cart_compare_line_items_service, :collection_paginator, :products_sorter,
-      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
-      :account_create_address_service, :account_update_address_service, :address_finder
+      :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -60,14 +59,9 @@ module Spree
       # coupons
       # TODO: we should split this service into 2 seperate - Add and Remove
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
-
-      # account
-      @account_create_address_service = 'Spree::Account::Addresses::Create'
-      @account_update_address_service = 'Spree::Account::Addresses::Update'
     end
 
     def set_default_finders
-      @address_finder = 'Spree::Addresses::Find'
       @country_finder = 'Spree::Countries::Find'
       @current_order_finder = 'Spree::Orders::FindCurrent'
       @completed_order_finder = 'Spree::Orders::FindComplete'

data/app/models/spree/line_item.rb

@@ -57,7 +57,16 @@ module Spree
     end
 
     def update_price
-      self.price = variant.price_including_vat_for(tax_zone: tax_zone)
+      if Spree::Config.allow_currency_change == true
+        currency_price = Spree::Price.where(
+          currency: order.currency,
+          variant_id: variant_id
+        ).first
+
+        self.price = currency_price.price_including_vat_for(tax_zone: tax_zone)
+      else
+        self.price = variant.price_including_vat_for(tax_zone: tax_zone)
+      end
     end
 
     def copy_tax_category
@@ -66,8 +75,7 @@ module Spree
 
     extend DisplayMoney
     money_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,
-                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,
-                  :pre_tax_amount
+                  :adjustment_total, :additional_tax_total, :promo_total, :included_tax_total
 
     alias single_money display_price
     alias single_display_amount display_price

data/app/models/spree/option_type.rb

@@ -24,7 +24,11 @@ module Spree
     after_touch :touch_all_products
 
     def filter_param
-      presentation.titleize.delete(' ').downcase
+      name.titleize.delete(' ').downcase
+    end
+
+    def self.color
+      find_by(name: 'color')
     end
 
     private

data/app/models/spree/order/address_book.rb

@@ -55,18 +55,31 @@ module Spree
       def update_or_create_address(attributes = {})
         return if attributes.blank?
 
-        attributes.transform_values! { |v| v == '' ? nil : v }
+        attributes = attributes.select { |_k, v| v.present? }
 
-        default_address_scope = user ? user.addresses : ::Spree::Address
-        default_address = default_address_scope.find_by(id: attributes[:id])
+        if user
+          address = user.addresses.build(attributes.except(:id)).check
+          return address if address.id
+        end
+
+        if attributes[:id]
+          address = Spree::Address.find(attributes[:id])
+          attributes.delete(:id)
 
-        if default_address&.editable?
-          default_address.update(attributes)
+          if address&.editable?
+            address.update(attributes)
+            return address
+          else
+            attributes.delete(:id)
+          end
+        end
 
-          return default_address
+        unless attributes[:id]
+          address = Spree::Address.new(attributes)
+          address.save
         end
 
-        ::Spree::Address.find_or_create_by(attributes.except(:id, :updated_at, :created_at))
+        address
       end
     end
   end

data/app/models/spree/order/store_credit.rb

@@ -1,14 +1,6 @@
 module Spree
   class Order < Spree::Base
     module StoreCredit
-      def add_store_credit_payments(amount = nil)
-        Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self, amount: amount)
-      end
-
-      def remove_store_credit_payments
-        Spree::Dependencies.checkout_remove_store_credit_service.constantize.call(order: self)
-      end
-
       def covered_by_store_credit?
         return false unless user
 

data/app/models/spree/order.rb

@@ -22,7 +22,7 @@ module Spree
     money_methods :outstanding_balance, :item_total,           :adjustment_total,
                   :included_tax_total,  :additional_tax_total, :tax_total,
                   :shipment_total,      :promo_total,          :total,
-                  :cart_promo_total,    :pre_tax_item_amount,  :pre_tax_total
+                  :cart_promo_total
 
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
@@ -174,12 +174,7 @@ module Spree
 
     # Sum of all line item amounts pre-tax
     def pre_tax_item_amount
-      line_items.sum(:pre_tax_amount)
-    end
-
-    # Sum of all line item and shipment pre-tax
-    def pre_tax_total
-      pre_tax_item_amount + shipments.sum(:pre_tax_amount)
+      line_items.to_a.sum(&:pre_tax_amount)
     end
 
     def shipping_discount
@@ -302,15 +297,15 @@ module Spree
     def outstanding_balance
       if canceled?
         -1 * payment_total
-      elsif refunds.exists?
-        # If refund has happened add it back to total to prevent balance_due payment state
-        # See: https://github.com/spree/spree/issues/6229 & https://github.com/spree/spree/issues/8136
-        total - (payment_total + refunds.sum(:amount))
       else
-        total - payment_total
+        total - (payment_total + reimbursement_paid_total)
       end
     end
 
+    def reimbursement_paid_total
+      reimbursements.sum(&:paid_amount)
+    end
+
     def outstanding_balance?
       outstanding_balance != 0
     end
@@ -356,6 +351,8 @@ module Spree
 
       deliver_order_confirmation_email unless confirmation_delivered?
 
+      deliver_store_owner_order_notification_email if deliver_store_owner_order_notification_email?
+
       consider_risk
     end
 
@@ -646,6 +643,13 @@ module Spree
         sum(:amount)
     end
 
+    def has_free_shipping?
+      promotions.
+        joins(:promotion_actions).
+        where(spree_promotion_actions: { type: 'Spree::Promotion::Actions::FreeShipping' }).
+        exists?
+    end
+
     private
 
     def link_by_email
@@ -711,5 +715,17 @@ module Spree
     def credit_card_nil_payment?(attributes)
       payments.store_credits.present? && attributes[:amount].to_f.zero?
     end
+
+    # Returns true if:
+    #   1. an email address is set for new order notifications AND
+    #   2. no notification for this order has been sent yet.
+    def deliver_store_owner_order_notification_email?
+      store.new_order_notifications_email.present? && !store_owner_notification_delivered?
+    end
+
+    def deliver_store_owner_order_notification_email
+      OrderMailer.store_owner_notification_email(id).deliver_later
+      update_column(:store_owner_notification_delivered, true)
+    end
   end
 end

data/app/models/spree/price.rb

@@ -15,10 +15,16 @@ module Spree
       less_than_or_equal_to: MAXIMUM_AMOUNT
     }
 
+    validates :compare_at_amount, allow_nil: true, numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: MAXIMUM_AMOUNT
+    }
+
     extend DisplayMoney
-    money_methods :amount, :price
+    money_methods :amount, :price, :compare_at_amount
+    alias display_compare_at_price display_compare_at_amount
 
-    self.whitelisted_ransackable_attributes = ['amount']
+    self.whitelisted_ransackable_attributes = ['amount', 'compare_at_amount']
 
     def money
       Spree::Money.new(amount || 0, currency: currency)
@@ -28,17 +34,35 @@ module Spree
       self[:amount] = Spree::LocalizedNumber.parse(amount)
     end
 
+    def compare_at_money
+      Spree::Money.new(compare_at_amount || 0, currency: currency)
+    end
+
+    def compare_at_amount=(compare_at_amount)
+      self[:compare_at_amount] = Spree::LocalizedNumber.parse(compare_at_amount)
+    end
+
     alias_attribute :price, :amount
+    alias_attribute :compare_at_price, :compare_at_amount
 
     def price_including_vat_for(price_options)
       options = price_options.merge(tax_category: variant.tax_category)
       gross_amount(price, options)
     end
 
+    def compare_at_price_including_vat_for(price_options)
+      options = price_options.merge(tax_category: variant.tax_category)
+      gross_amount(compare_at_price, options)
+    end
+
     def display_price_including_vat_for(price_options)
       Spree::Money.new(price_including_vat_for(price_options), currency: currency)
     end
 
+    def display_compare_at_price_including_vat_for(price_options)
+      Spree::Money.new(compare_at_price_including_vat_for(price_options), currency: currency)
+    end
+
     # Remove variant default_scope `deleted_at: nil`
     def variant
       Spree::Variant.unscoped { super }

data/app/models/spree/product.rb

@@ -113,17 +113,17 @@ module Spree
 
     self.whitelisted_ransackable_associations = %w[taxons stores variants_including_master master variants]
     self.whitelisted_ransackable_attributes = %w[description name slug discontinue_on]
-    self.whitelisted_ransackable_scopes = %w[not_discontinued]
+    self.whitelisted_ransackable_scopes = %w[not_discontinued search_by_name]
 
     [
       :sku, :price, :currency, :weight, :height, :width, :depth, :is_master,
-      :cost_currency, :price_in, :amount_in, :cost_price
+      :cost_currency, :price_in, :amount_in, :cost_price, :compare_at_price
     ].each do |method_name|
       delegate method_name, :"#{method_name}=", to: :find_or_build_master
     end
 
     delegate :display_amount, :display_price, :has_default_price?,
-             :images, to: :find_or_build_master
+             :display_compare_at_price, :images, to: :find_or_build_master
 
     alias master_images images
 
@@ -160,10 +160,8 @@ module Spree
     #
     # @return [Spree::Variant]
     def default_variant
-      track_inventory = Spree::Config[:track_inventory_levels]
-
-      Rails.cache.fetch("spree/default-variant/#{cache_key_with_version}/#{track_inventory}") do
-        if track_inventory && variants.in_stock_or_backorderable.any?
+      Rails.cache.fetch(default_variant_cache_key) do
+        if Spree::Config[:track_inventory_levels] && variants.in_stock_or_backorderable.any?
           variants.in_stock_or_backorderable.first
         else
           has_variants? ? variants.first : master
@@ -252,6 +250,14 @@ module Spree
       where conditions.inject(:or)
     end
 
+    def self.search_by_name(query)
+      if defined?(SpreeGlobalize)
+        joins(:translations).order(:name).where("LOWER(#{Product::Translation.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%").distinct
+      else
+        where("LOWER(#{Product.table_name}.name) LIKE LOWER(:query)", query: "%#{query}%")
+      end
+    end
+
     # Suitable for displaying only variants that has at least one option value.
     # There may be scenarios where an option type is removed and along with it
     # all option values. At that point all variants associated with only those
@@ -344,6 +350,10 @@ module Spree
       save
     end
 
+    def default_variant_cache_key
+      "spree/default-variant/#{cache_key_with_version}/#{Spree::Config[:track_inventory_levels]}"
+    end
+
     def ensure_master
       return unless new_record?
 

data/app/models/spree/promotion_handler/coupon.rb

@@ -25,9 +25,10 @@ module Spree
 
       def remove(coupon_code)
         promotion = order.promotions.with_coupon_code(coupon_code)
+
         if promotion.present?
           # Order promotion has to be destroyed before line item removing
-          order.order_promotions.find_by!(promotion_id: promotion.id).destroy
+          order.order_promotions.where(promotion_id: promotion.id).destroy_all
 
           remove_promotion_adjustments(promotion)
           remove_promotion_line_items(promotion)
@@ -75,7 +76,7 @@ module Spree
           line_item = order.find_line_item_by_variant(item.variant)
           next if line_item.blank?
 
-          Spree::Dependencies.cart_remove_item_service.constantize.call(order: order, item: item.variant, quantity: item.quantity)
+          Spree::Dependencies.cart_remove_item_service(order: order, item: item.variant, quantity: item.quantity)
         end
       end
 

data/app/models/spree/reimbursement.rb

@@ -60,6 +60,8 @@ module Spree
     class_attribute :reimbursement_failure_hooks
     self.reimbursement_failure_hooks = []
 
+    delegate :store, :currency, to: :order
+
     state_machine :reimbursement_status, initial: :pending do
       event :errored do
         transition to: :errored, from: :pending

data/app/models/spree/shipment.rb

@@ -42,6 +42,8 @@ module Spree
     scope :reverse_chronological, -> { order(Arel.sql('coalesce(spree_shipments.shipped_at, spree_shipments.created_at) desc'), id: :desc) }
     scope :valid, -> { where.not(state: :canceled) }
 
+    delegate :store, :currency, to: :order
+
     # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :pending, use_transactions: false do
       event :ready do
@@ -104,11 +106,6 @@ module Spree
       inventory_units.any?(&:backordered?)
     end
 
-    # TODO: delegate currency to Order, order.currency is mandatory
-    def currency
-      order ? order.currency : Spree::Config[:currency]
-    end
-
     # Determines the appropriate +state+ according to the following logic:
     #
     # pending    unless order is complete and +order.payment_state+ is +paid+

data/app/models/spree/stock_location.rb

@@ -106,8 +106,19 @@ module Spree
     private
 
     def create_stock_items
-      Variant.includes(:product).find_each do |variant|
-        propagate_variant(variant)
+      variants_scope = Spree::Variant
+      prepared_stock_items = variants_scope.ids.map do |variant_id|
+        Hash[
+          'stock_location_id', id,
+          'variant_id', variant_id,
+          'backorderable', backorderable_default,
+          'created_at', Time.current,
+          'updated_at', Time.current
+        ]
+      end
+      if prepared_stock_items.any?
+        stock_items.insert_all(prepared_stock_items)
+        variants_scope.touch_all
       end
     end