spree_core 4.4.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f1530fed2a687bd1eb187fbc25fc58fcd257d498f9e9f641291f99991f0e46
-  data.tar.gz: fd670b73289d5515e3e27dd5f80451f3c866865ea278cfb8e8d9b43d3c650a46
+  metadata.gz: f53d1d3ed70fd19d1ae3665df1dfabac01948cd28e71b3a68c86c8a8f7afcf1a
+  data.tar.gz: 87e8a6e4d121d979fadbe0d44d89d30f0f6d55c89b64d3bcd0c2354c794b9ef1
 SHA512:
-  metadata.gz: d83b92fbf213054613dd642a968a6958c6a54dcdd4177c54385b3a82bf567de92cc5d0c21a18deda0768dfeafb2b955fcf508c1392ded7071e7c499c29afcb73
-  data.tar.gz: c4e3da90f798233259263b922a5ac32999d4e34c46a64b0731e316c5eada252b18bce0c53cc4651e977b3984aa343ef80570cdbf96378600f362d23d3bc2b320
+  metadata.gz: 51b6d8e283837db0d607f9528f1527d8cfc46c020a804bc3f2797c392eb040d6b7081df92d52eafac617c2fff64c6e98b500912173266f4c04286f32ab5fbdac
+  data.tar.gz: d2305b19b0364a34e379955ce76fb453702c385f7377a23f40a65ae61f93de5a5d157bd4978c757b563c6c263f5375a32f224840129b29085af424cc00f6712d

data/app/finders/spree/products/find.rb

@@ -4,8 +4,6 @@ module Spree
       def initialize(scope:, params:, current_currency: nil)
         @scope = scope
 
-        ActiveSupport::Deprecation.warn('`current_currency` param is deprecated and will be removed in Spree 5') if current_currency
-
         if current_currency.present?
           ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
             `current_currency` param is deprecated and will be removed in Spree 5.
@@ -257,7 +255,7 @@ module Spree
 
       def map_prices(prices)
         prices.map do |price|
-          price == 'Infinity' ? Float::INFINITY : price.to_f
+          price == 'Infinity' ? BigDecimal::INFINITY : price.to_f
         end
       end
 

data/app/finders/spree/taxons/find.rb

@@ -19,7 +19,7 @@ module Spree
         taxons = by_roots(taxons)
         taxons = by_name(taxons)
 
-        taxons
+        taxons.distinct
       end
 
       private

data/app/helpers/spree/base_helper.rb

@@ -61,11 +61,11 @@ module Spree
       DEPRECATION
 
       image_path ||= if current_store.logo.attached? && current_store.logo.variable?
-                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
+                       main_app.cdn_image_url(current_store.logo.variant(resize_to_limit: [244, 104]))
                      elsif current_store.logo.attached? && current_store.logo.image?
-                       main_app.url_for(current_store.logo)
+                       main_app.cdn_image_url(current_store.logo)
                      else
-                      'logo/spree_50.png'
+                       'logo/spree_50.png'
                      end
 
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
@@ -76,7 +76,11 @@ module Spree
     end
 
     def spree_favicon_path
-      main_app.url_for(current_store.favicon || 'favicon.ico')
+      if current_store.favicon.present?
+        main_app.cdn_image_url(current_store.favicon)
+      else
+        url_for('favicon.ico')
+      end
     end
 
     def object
@@ -88,7 +92,7 @@ module Spree
 
       if object.is_a? Spree::Product
         image                             = default_image_for_product_or_variant(object)
-        og_meta['og:image']               = main_app.url_for(image.attachment) if image&.attachment
+        og_meta['og:image']               = main_app.cdn_image_url(image.attachment) if image&.attachment
 
         og_meta['og:url']                 = spree.url_for(object) if frontend_available? # url_for product needed
         og_meta['og:type']                = object.class.name.demodulize.downcase
@@ -163,8 +167,7 @@ module Spree
     end
 
     def seo_url(taxon, options = {})
-      options.merge(locale: locale_param)
-      spree.nested_taxons_path(taxon.permalink, options)
+      spree.nested_taxons_path(taxon.permalink, options.merge(locale: locale_param))
     end
 
     def frontend_available?
@@ -238,7 +241,7 @@ module Spree
 
     def create_product_image_tag(image, product, options, style)
       options[:alt] = image.alt.blank? ? product.name : image.alt
-      image_tag main_app.url_for(image.url(style)), options
+      image_tag main_app.cdn_image_url(image.url(style)), options
     end
 
     def define_image_method(style)
@@ -249,7 +252,7 @@ module Spree
         img = if image_path.present?
                 create_product_image_tag image_path, product, options, style
               else
-               inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%"
+                inline_svg_tag 'noimage/backend-missing-image.svg', class: 'noimage', size: '60%*60%'
               end
 
         content_tag(:div, img, class: "admin-product-image-container #{style}-img")

data/app/helpers/spree/locale_helper.rb

@@ -15,10 +15,14 @@ module Spree
     end
 
     def locale_presentation(locale)
-      if I18n.exists?('spree.i18n.this_file_language', locale: locale)
+      if I18n.exists?('spree.i18n.this_file_language', locale: locale, fallback: false)
         [locale_full_name(locale), locale.to_s]
+      elsif defined?(SpreeI18n::Locale) && (language_name = SpreeI18n::Locale.local_language_name(locale))
+        ["#{language_name} (#{locale})", locale.to_s]
+      elsif locale.to_s == 'en'
+        ['English (US)', 'en']
       else
-        locale.to_s == 'en' ? ['English (US)', 'en'] : [locale, locale.to_s]
+        [locale, locale.to_s]
       end
     end
 

data/app/helpers/spree/products_helper.rb

@@ -76,15 +76,20 @@ module Spree
 
     # will return a human readable string
     def available_status(product)
-      return Spree.t(:discontinued) if product.discontinued?
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `Spree::ProductsHelper#available_status` method from spree/core is deprecated and will be removed.
+        Please use `Spree::Admin::ProductsHelper#available_status` from spree_backend instead.
+      DEPRECATION
+
+      return Spree.t(:archived) if product.discontinued?
       return Spree.t(:deleted) if product.deleted?
 
       if product.available?
-        Spree.t(:available)
-      elsif product.available_on&.future?
+        Spree.t(:active)
+      elsif product.make_active_at&.future?
         Spree.t(:pending_sale)
       else
-        Spree.t(:no_available_date_set)
+        Spree.t(:draft)
       end
     end
 

data/app/jobs/spree/variants/remove_from_incomplete_orders_job.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Variants
+    class RemoveFromIncompleteOrdersJob < Spree::BaseJob
+      def perform(variant)
+        Spree::Variants::RemoveLineItems.call(variant: variant)
+      end
+    end
+  end
+end

data/app/jobs/spree/variants/remove_line_item_job.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Variants
+    class RemoveLineItemJob < Spree::BaseJob
+      def perform(line_item:)
+        Spree::Dependencies.cart_remove_line_item_service.constantize.call(order: line_item.order, line_item: line_item)
+      end
+    end
+  end
+end

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

@@ -18,7 +18,7 @@ module Spree
 
       def calculator_type=(calculator_type)
         klass = calculator_type.constantize if calculator_type
-        self.calculator = klass.new if klass && !calculator.is_a?(klass)
+        self.calculator = klass.new if klass && !calculator.instance_of?(klass)
       end
 
       private

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

@@ -1,42 +1,30 @@
 module Spree
   module DisplayLink
-    def link
-      case linked_resource_type
-      when 'Spree::Taxon'
-        return if linked_resource&.permalink.blank?
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :linked_resource, polymorphic: true
+
+      def link
+        case linked_resource_type
+        when 'Spree::Taxon'
+          return if linked_resource&.permalink.blank?
 
-        if spree_routes.method_defined?(:nested_taxons_path)
-          spree_routes.nested_taxons_path(linked_resource.permalink)
-        else
           "/#{Spree::Config[:storefront_taxons_path]}/#{linked_resource.permalink}"
-        end
-      when 'Spree::Product'
-        return if linked_resource&.slug.blank?
+        when 'Spree::Product'
+          return if linked_resource&.slug.blank?
 
-        if spree_routes.method_defined?(:products_path)
-          spree_routes.product_path(linked_resource)
-        else
           "/#{Spree::Config[:storefront_products_path]}/#{linked_resource.slug}"
-        end
-      when 'Spree::CmsPage'
-        return if linked_resource&.slug.blank?
+        when 'Spree::CmsPage'
+          return if linked_resource&.slug.blank?
 
-        if spree_routes.method_defined?(:page_path)
-          spree_routes.page_path(linked_resource.slug)
-        else
           "/#{Spree::Config[:storefront_pages_path]}/#{linked_resource.slug}"
+        when 'Spree::Linkable::Homepage'
+          '/'
+        when 'Spree::Linkable::Uri'
+          destination
         end
-      when 'Home Page'
-        '/'
-      when 'URL'
-        destination
       end
     end
-
-    private
-
-    def spree_routes
-      Spree::Core::Engine.routes.url_helpers
-    end
   end
 end

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

@@ -2,23 +2,35 @@ module Spree
   module ImageMethods
     extend ActiveSupport::Concern
 
-    def generate_url(size:, gravity: 'center', quality: 80, background: 'show')
+    def generate_url(size:, gravity: 'centre', quality: 80, background: [0, 0, 0])
       return if size.blank?
+
       size = size.gsub(/\s+/, '')
 
       return unless size.match(/(\d+)x(\d+)/)
 
-      polymorphic_path(attachment.variant(
-        gravity: gravity,
-        resize: size,
-        extent: size,
-        background: background,
-        quality: quality.to_i
-      ), only_path: true)
+      width, height = size.split('x').map(&:to_i)
+      gravity = translate_gravity_for_mini_magick(gravity)
+
+      # FIXME: bring back support for background color
+
+      cdn_image_url(attachment.variant(resize_and_pad: [width, height, { gravity: gravity }], saver: { quality: quality }))
     end
 
     def original_url
-      polymorphic_path(attachment, only_path: true)
+      cdn_image_url(attachment)
+    end
+
+    private
+
+    def translate_gravity_for_mini_magick(gravity)
+      variant_processor = Rails.application.config.active_storage.variant_processor
+
+      if gravity.downcase == 'centre' && [:mini_magick, nil].include?(variant_processor)
+        'center'
+      else
+        gravity
+      end
     end
   end
 end

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

@@ -3,8 +3,8 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      attribute :public_metadata, default: {} if Rails.version.to_f >= 6.1
-      attribute :private_metadata, default: {} if Rails.version.to_f >= 6.1
+      attribute :public_metadata, default: {}
+      attribute :private_metadata, default: {}
       serialize :public_metadata, HashSerializer
       serialize :private_metadata, HashSerializer
     end

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

@@ -236,7 +236,7 @@ module Spree
 
       def self.not_discontinued(only_not_discontinued = true)
         if only_not_discontinued != '0' && only_not_discontinued
-          where("#{Product.quoted_table_name}.discontinue_on IS NULL or #{Product.quoted_table_name}.discontinue_on >= ?", Time.zone.now)
+          where.not(status: 'archived')
         else
           all
         end
@@ -253,9 +253,11 @@ module Spree
 
       # Can't use add_search_scope for this as it needs a default argument
       def self.available(available_on = nil, currency = nil)
-        available_on ||= Time.current
-
-        scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+        if available_on
+          scope = not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", available_on)
+        else
+          scope = where(status: 'active')
+        end
 
         unless Spree::Config.show_products_without_price
           currency ||= Spree::Store.default.default_currency
@@ -282,7 +284,7 @@ module Spree
         if user.try(:has_spree_role?, 'admin')
           with_deleted
         else
-          not_deleted.not_discontinued.where("#{Product.quoted_table_name}.available_on <= ?", Time.current)
+          not_deleted.where(status: 'active')
         end
       end
 
@@ -295,9 +297,9 @@ module Spree
         include PgSearch::Model
 
         if defined?(SpreeGlobalize)
-          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: :tsearch
+          pg_search_scope :search_by_name, associated_against: { translations: :name }, using: { tsearch: { any_word: true, prefix: true } }
         else
-          pg_search_scope :search_by_name, against: :name, using: :tsearch
+          pg_search_scope :search_by_name, against: :name, using: { tsearch: { any_word: true, prefix: true } }
         end
       else
         def self.search_by_name(query)
@@ -337,7 +339,7 @@ module Spree
           case t
           when ApplicationRecord then t
           else
-            Taxon.where(name: t).or(Taxon.where(id: t)).or(Taxon.where("permalink LIKE ? OR permalink = ?", "%/#{t}/", "#{t}/")).first
+            Taxon.where(Taxon.arel_table[:name].eq(t)).or(Taxon.where(Taxon.arel_table[:id].eq(t))).or(Taxon.where(Taxon.arel_table[:permalink].matches("%/#{t}/"))).or(Taxon.where(Taxon.arel_table[:permalink].matches("#{t}/"))).first
           end
         end.compact.flatten.uniq
       end

data/app/models/spree/address.rb

@@ -3,6 +3,12 @@ module Spree
     require 'validates_zipcode'
 
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::Addresses)
+      include Spree::Security::Addresses
+    end
 
     if Rails::VERSION::STRING >= '6.1'
       serialize :preferences, Hash, default: {}
@@ -31,7 +37,7 @@ module Spree
 
     belongs_to :country, class_name: 'Spree::Country'
     belongs_to :state, class_name: 'Spree::State', optional: true
-    belongs_to :user, class_name: Spree.user_class.name, optional: true
+    belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
 
     has_many :shipments, inverse_of: :address
 

data/app/models/spree/asset/support/active_storage.rb

@@ -8,7 +8,7 @@ module Spree
           def url(style)
             return placeholder(style) unless attachment.attached?
 
-            attachment.variant(resize: dimensions_for_style(style))
+            attachment.variant(resize_to_limit: dimensions_for_style(style))
           end
 
           def placeholder(style)
@@ -16,7 +16,8 @@ module Spree
           end
 
           def dimensions_for_style(style)
-            self.class.styles.with_indifferent_access[style] || self.class.styles.with_indifferent_access[default_style]
+            dimensions = self.class.styles.with_indifferent_access[style] || self.class.styles.with_indifferent_access[default_style]
+            dimensions.split('x').map(&:to_i)
           end
         end
       end

data/app/models/spree/asset.rb

@@ -2,6 +2,9 @@ module Spree
   class Asset < Spree::Base
     include Support::ActiveStorage
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]

data/app/models/spree/cms_page.rb

@@ -3,6 +3,10 @@ module Spree
     include SingleStoreResource
     include DisplayLink
 
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     acts_as_paranoid
 
     TYPES = ['Spree::Cms::Pages::StandardPage',

data/app/models/spree/cms_section.rb

@@ -7,30 +7,30 @@ module Spree
 
     validate :reset_link_attributes
 
-    IMAGE_COUNT = ['one', 'two', 'three']
-    IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
-    IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
+    has_one :image_one, class_name: 'Spree::CmsSectionImageOne', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_one, reject_if: :all_blank
 
-    IMAGE_COUNT.each do |count|
-      send(:has_one_attached, "image_#{count}".to_sym)
+    has_one :image_two, class_name: 'Spree::CmsSectionImageTwo', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_two, reject_if: :all_blank
 
-      IMAGE_SIZE.each do |size|
+    has_one :image_three, class_name: 'Spree::CmsSectionImageThree', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_three, reject_if: :all_blank
+
+    Spree::CmsSectionImage::IMAGE_COUNT.each do |count|
+      Spree::CmsSectionImage::IMAGE_SIZE.each do |size|
         define_method("img_#{count}_#{size}") do |dimensions = nil|
-          return if !send("image_#{count}").attached? || dimensions.nil?
+          image = send("image_#{count}")&.attachment
+          return if !image&.attached? || dimensions.nil?
 
-          send("image_#{count}").variant(resize: dimensions)
+          image.variant(resize_to_limit: dimensions.split('x').map(&:to_i))
         end
       end
     end
 
-    belongs_to :linked_resource, polymorphic: true
-
     default_scope { order(position: :asc) }
 
     validates :name, :cms_page, :type, presence: true
 
-    validates :image_one, :image_two, :image_three, content_type: IMAGE_TYPES
-
     LINKED_RESOURCE_TYPE = []
 
     TYPES = ['Spree::Cms::Sections::HeroImage',

data/app/models/spree/cms_section_image.rb

@@ -0,0 +1,15 @@
+module Spree
+  class CmsSectionImage < Asset
+    if Spree.public_storage_service_name
+      has_one_attached :attachment, service: Spree.public_storage_service_name
+    else
+      has_one_attached :attachment
+    end
+
+    IMAGE_COUNT = ['one', 'two', 'three']
+    IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
+    IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
+
+    validates :attachment, attached: true, content_type: IMAGE_TYPES
+  end
+end

data/app/models/spree/cms_section_image_one.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageOne < CmsSectionImage
+  end
+end

data/app/models/spree/cms_section_image_three.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageThree < CmsSectionImage
+  end
+end

data/app/models/spree/cms_section_image_two.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageTwo < CmsSectionImage
+  end
+end

data/app/models/spree/credit_card.rb

@@ -2,11 +2,17 @@ module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::CreditCards)
+      include Spree::Security::CreditCards
+    end
 
     acts_as_paranoid
 
     belongs_to :payment_method
-    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
+    belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id',
                       optional: true
     has_many :payments, as: :source
 
@@ -174,9 +180,9 @@ module Spree
 
     def self.json_api_permitted_attributes
       [
-        'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name', 
-        'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits', 
-        'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id', 
+        'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name',
+        'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits',
+        'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id',
         'payment_method_id', 'default', 'deleted_at'
       ]
     end

data/app/models/spree/customer_return.rb

@@ -3,6 +3,9 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
     include NumberIdentifier
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     belongs_to :stock_location
     belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returns

data/app/models/spree/digital.rb

@@ -3,6 +3,10 @@ module Spree
     belongs_to :variant
     has_many :digital_links, dependent: :destroy
 
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     if Spree.private_storage_service_name
       has_one_attached :attachment, service: Spree.private_storage_service_name
     else

data/app/models/spree/digital_link.rb

@@ -2,6 +2,13 @@ module Spree
   class DigitalLink < Spree::Base
     has_secure_token
 
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::DigitalLinks)
+      include Spree::Security::DigitalLinks
+    end
+
     belongs_to :digital
     belongs_to :line_item
 

data/app/models/spree/gateway/bogus.rb

@@ -58,7 +58,7 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 
-    def cancel(_response_code)
+    def cancel(_response_code, _payment = nil)
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 

data/app/models/spree/icon.rb

@@ -1,6 +1,10 @@
 module Spree
   class Icon < Spree::Asset
-    has_one_attached :attachment
+    if Spree.public_storage_service_name
+      has_one_attached :attachment, service: Spree.public_storage_service_name
+    else
+      has_one_attached :attachment
+    end
 
     ICON_TYPES = %i[png jpg jpeg gif svg]
 

data/app/models/spree/image/configuration/active_storage.rb

@@ -5,7 +5,11 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          has_one_attached :attachment
+          if Spree.public_storage_service_name
+            has_one_attached :attachment, service: Spree.public_storage_service_name
+          else
+            has_one_attached :attachment
+          end
 
           validates :attachment, attached: true, content_type: /\Aimage\/.*\z/
 

data/app/models/spree/image.rb

@@ -13,7 +13,7 @@ module Spree
 
     def styles
       self.class.styles.map do |_, size|
-        width, height = size.chop.split('x')
+        width, height = size.chop.split('x').map(&:to_i)
 
         {
           url: generate_url(size: size),
@@ -28,7 +28,7 @@ module Spree
       size = self.class.styles[name]
       return unless size
 
-      width, height = size.chop.split('x')
+      width, height = size.chop.split('x').map(&:to_i)
 
       {
         url: generate_url(size: size),
@@ -40,7 +40,7 @@ module Spree
 
     def style_dimensions(name)
       size = self.class.styles[name]
-      width, height = size.chop.split('x')
+      width, height = size.chop.split('x').map(&:to_i)
 
       {
         width: width,

data/app/models/spree/inventory_unit.rb

@@ -1,5 +1,9 @@
 module Spree
   class InventoryUnit < Spree::Base
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     with_options inverse_of: :inventory_units do
       belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
       belongs_to :order, class_name: 'Spree::Order'
@@ -59,8 +63,7 @@ module Spree
     end
 
     def find_stock_item
-      Spree::StockItem.where(stock_location_id: shipment.stock_location_id,
-                             variant_id: variant_id).first
+      shipment.stock_location.stock_item_or_create(variant)
     end
 
     def self.split(original_inventory_unit, extract_quantity)