spree_core 6.0.0.beta4 → 6.0.0.rc2

data/app/models/spree/exports/products.rb

@@ -9,13 +9,22 @@ module Spree
       end
 
       def variant_includes
-        [:images, :prices, :stock_levels, :stock_locations, { option_values: [:option_type] }]
+        [:images, :prices, { stock_levels: :stock_location, option_values: [:option_type] }]
       end
 
       def multi_line_csv?
         true
       end
 
+      # The seller scopes which locations the inventory columns cover; their
+      # default, worked out once per export, carries the full row's stock.
+      def to_csv_options
+        @to_csv_options ||= {
+          seller: seller,
+          default_stock_location: Spree::StockLocation.owned_by(store_id: store.id, seller_id: seller&.id).active.order_default.first || store.default_stock_location
+        }
+      end
+
       # when doing full product export, we want to exclude archived products
       def scope
         if search_params.nil?

data/app/models/spree/exports/report.rb

@@ -46,13 +46,13 @@ module Spree
           result.rows.each do |row|
             csv << Spree::CSV::FormulaSanitizer.row(
               row[:dimensions].map { |name, raw| hydration.label(name, raw) } +
-                query.metrics.map { |m| row[:metrics][m.name][:value] }
+                query.metrics.map { |m| m.format_value(row[:metrics][m.name][:value], result.meta[:currency]) }
             )
           end
-          totals = query.metrics.map { |m| result.totals[m.name][:value] }
+          totals = query.metrics.map { |m| m.format_value(result.totals[m.name][:value], result.meta[:currency]) }
           # With a breakdown the totals close the file under a "Total" label in
           # the first dimension column; without one the totals are the only row.
-          label = query.dimensions.empty? ? [] : [Spree.t('reporting.export.total')] + Array.new(query.dimensions.size - 1, '')
+          label = query.dimensions.empty? ? [] : [I18n.t('spree.reporting.export.total')] + Array.new(query.dimensions.size - 1, '')
           csv << Spree::CSV::FormulaSanitizer.row(label + totals)
         end
       end

data/app/models/spree/fee.rb

@@ -10,8 +10,10 @@ module Spree
     # Extensions may append their own kinds — the list is validated, not frozen.
     # `duty` rows are written by a duties provider's adjuster and snapshot the
     # classification they were calculated from in `metadata` — never re-derive
-    # a duty from the live catalog.
-    KINDS = %w[surcharge handling gift_wrap cod payment duty]
+    # a duty from the live catalog. `exchange` is what a customer owes when an
+    # exchange's replacement costs more, put on the order for the merchant to
+    # collect.
+    KINDS = %w[surcharge handling gift_wrap cod payment duty exchange]
 
     has_prefix_id :fee
 

data/app/models/spree/file_upload.rb

@@ -0,0 +1,155 @@
+module Spree
+  # A file sent to `POST /files` (docs/plans/6.0-uploads-and-file-ownership.md),
+  # before anything uses it.
+  #
+  # Two ways in, one result. A presigned upload carries only the file's
+  # metadata and gets back a storage target the client sends the bytes to; a
+  # multipart upload carries the bytes, which are stored here. Either way the
+  # result is a blob owned by +store+ and an expiring, opaque `signed_id` the
+  # client passes to whichever endpoint uses the file.
+  #
+  # Never persisted: the blob is the record.
+  class FileUpload
+    include ActiveModel::Model
+    include ActiveModel::Attributes
+
+    VISIBILITIES = %w[public private].freeze
+
+    attribute :filename, :string
+    attribute :content_type, :string
+    attribute :byte_size, :integer
+    attribute :checksum, :string
+    attribute :visibility, :string, default: 'public'
+    # The bytes of a multipart upload (an uploaded file or any IO).
+    attribute :file
+    attribute :store
+    # Narrower limits for a caller with its own rules (a buyer's purchase
+    # order document); the installation-wide ones apply otherwise.
+    attribute :max_byte_size, :integer
+    attribute :allowed_content_types
+
+    attr_reader :blob, :signed_id, :expires_at
+
+    validates :store, presence: true
+    validates :visibility, inclusion: { in: VISIBILITIES }
+    validates :filename, :content_type, presence: true
+    validates :checksum, presence: true, unless: :multipart?
+    validates :byte_size, numericality: { only_integer: true, greater_than: 0 }
+    validate :byte_size_within_limit
+    validate :content_type_allowed
+
+    # The content types a public upload may have. Private uploads accept any
+    # type: digital products are ebooks, archives and audio, and each
+    # attachment validates its own file.
+    #
+    # @return [Array<String>]
+    def self.public_content_types
+      Rails.application.config.active_storage.web_image_content_types +
+        Spree::Config.video_content_types +
+        %w[text/csv]
+    end
+
+    # @return [Boolean] whether the bytes travel in the request
+    def multipart?
+      file.respond_to?(:read)
+    end
+
+    # @return [Boolean] whether the file lands on private storage
+    def private?
+      visibility == 'private'
+    end
+
+    # Validates and creates the blob. A multipart upload is stored here; a
+    # presigned one waits for the client to send its bytes to {#upload_target}.
+    #
+    # @return [Boolean]
+    def save
+      read_file_facts if multipart?
+      return false unless valid?
+
+      @blob = multipart? ? store_bytes : reserve_blob
+      @expires_at = Spree::Uploads::SIGNED_ID_EXPIRY.from_now
+      @signed_id = Spree::Uploads.signed_id_for(@blob)
+      true
+    end
+
+    # Where a presigned upload's bytes go, or nil once the file is stored.
+    #
+    # @return [Spree::FileUpload::Target, nil]
+    def upload_target
+      return if multipart? || blob.nil?
+
+      Target.new(
+        http_method: 'PUT',
+        url: blob.service_url_for_direct_upload,
+        headers: blob.service_headers_for_direct_upload
+      )
+    end
+
+    # The storage target a presigned upload sends its bytes to.
+    class Target
+      include ActiveModel::Model
+      include ActiveModel::Attributes
+
+      # Not `method`, which every Ruby object already answers.
+      attribute :http_method, :string
+      attribute :url, :string
+      attribute :headers
+    end
+
+    private
+
+    # The size of a multipart upload comes from the bytes, and so does its type
+    # wherever the bytes carry a recognisable signature: Marcel reads the
+    # content first, so a renamed executable is not accepted as an image. Only
+    # bytes it cannot place fall back to the declared type and the file name.
+    def read_file_facts
+      self.filename = filename.presence || file.try(:original_filename)
+      self.byte_size = io.size
+      self.content_type = Marcel::MimeType.for(io, name: filename, declared_type: content_type.presence || file.try(:content_type))
+      io.rewind
+    end
+
+    def reserve_blob
+      ActiveStorage::Blob.create!(
+        filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type,
+        service_name: service_name, store_id: store.id
+      )
+    end
+
+    def store_bytes
+      ActiveStorage::Blob.build_after_unfurling(
+        io: io, filename: filename, content_type: content_type, service_name: service_name, identify: false
+      ).tap do |blob|
+        blob.store_id = store.id
+        blob.save!
+        blob.upload_without_unfurling(io)
+      end
+    end
+
+    def io
+      @io ||= file.respond_to?(:to_io) ? file.to_io : file
+    end
+
+    def service_name
+      private? ? Spree.private_storage_service_name : Spree.public_storage_service_name
+    end
+
+    def size_limit
+      max_byte_size || (multipart? ? Spree::Config.max_multipart_upload_size : Spree::Config.max_upload_size)
+    end
+
+    def byte_size_within_limit
+      return if byte_size.nil? || byte_size <= size_limit
+
+      errors.add(:byte_size, :less_than_or_equal_to, count: ActiveSupport::NumberHelper.number_to_human_size(size_limit))
+    end
+
+    def content_type_allowed
+      allowed = allowed_content_types || (self.class.public_content_types unless private?)
+      return if allowed.nil? || content_type.blank? || allowed.include?(content_type)
+
+      errors.add(:content_type, :inclusion, value: content_type)
+    end
+  end
+end

data/app/models/spree/fulfillment.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module Spree
   class Fulfillment < Spree.base_class
     has_prefix_id :ful
@@ -15,6 +13,9 @@ module Spree
     include Spree::Fulfillment::CustomEvents
 
     publishes_lifecycle_events
+    publishes_events :canceled, :delivered, :fulfilled
+    publishes_event 'shipment.shipped', deprecated_alias_of: 'fulfillment.fulfilled'
+    publishes_event 'shipment.canceled', deprecated_alias_of: 'fulfillment.canceled'
 
     with_options inverse_of: :fulfillments do
       belongs_to :address, class_name: 'Spree::Address', optional: true
@@ -92,6 +93,18 @@ module Spree
 
     delegate :store, :currency, to: :owner
 
+    # What a rebuild hands to {#carry_over_selection}, read before the old
+    # proposals and their rates are deleted. Grouped rather than keyed by
+    # location: one location can ship several proposals (a digital item beside
+    # a physical one, stock on hand beside a backorder), each with its own choice.
+    #
+    # @return [Hash{Integer => Array<Spree::DeliveryRate>}] the selected rates
+    #   of each stock location's proposals
+    def self.selected_rates_by_stock_location
+      includes(:selected_delivery_rate).group_by(&:stock_location_id).
+        transform_values { |proposals| proposals.filter_map(&:selected_delivery_rate) }
+    end
+
     # The exactly-one owner of this fulfillment — the cart during checkout,
     # the order after completion. New code must read +owner+, never assume
     # +order+.
@@ -221,7 +234,7 @@ module Spree
     #
     # @return [String, Spree::Money]
     def display_cost(**options)
-      return Spree.t('delivery_rates.quoted_after_review') if unpriced?
+      return I18n.t('spree.delivery_rates.quoted_after_review') if unpriced?
 
       Spree::Money.new(cost, { currency: currency }.merge(options))
     end
@@ -338,7 +351,7 @@ module Spree
     #
     # @return [String, Spree::Money]
     def display_final_price(**options)
-      return Spree.t('delivery_rates.quoted_after_review') if unpriced?
+      return I18n.t('spree.delivery_rates.quoted_after_review') if unpriced?
 
       Spree::Money.new(final_price, { currency: currency }.merge(options))
     end
@@ -361,9 +374,20 @@ module Spree
     #
     # @return [Boolean]
     def with_free_shipping_promotion?
+      return discounts.any?(&:promotion?) if read_association_in_memory?(:discounts)
+
       discounts.promotion.exists?
     end
 
+    # What promotions took off this shipment's cost, as a negative amount.
+    #
+    # @return [BigDecimal]
+    def promotion_discount_total
+      return discounts.select(&:promotion?).sum(BigDecimal('0'), &:amount) if read_association_in_memory?(:discounts)
+
+      discounts.promotion.sum(:amount)
+    end
+
     # Placement no longer moves physical stock — the units are promised in
     # Spree::Orders::Complete and only leave the shelf when the parcel does.
     def finalize!
@@ -543,34 +567,13 @@ module Spree
 
       # StockEstimator.new assignment below will replace the current delivery_method
       original_shipping_method_id = delivery_method.try(:id)
-      # A carrier method quotes several rates (one per service), so the
-      # method id alone no longer identifies the customer's choice — capture
-      # the selected rate's carrier service too.
       original_selection = selected_delivery_rate
-      original_carrier = original_selection&.carrier
-      original_service_level = original_selection&.service_level
 
       self.delivery_rates = Stock::Estimator.new(owner).
                             delivery_rates(to_package, audience)
 
       if delivery_method
-        # Keep the previously chosen carrier service when it is still quoted,
-        # then the previously chosen method, then the estimator's own pick
-        # (the cheapest rate, already flagged selected) rather than leaving
-        # the fulfillment unselected.
-        selected_rate =
-          if original_shipping_method_id && original_carrier
-            delivery_rates.detect do |rate|
-              rate.delivery_method_id == original_shipping_method_id &&
-                rate.carrier == original_carrier &&
-                rate.service_level == original_service_level
-            end
-          end
-        selected_rate ||=
-          if original_shipping_method_id
-            delivery_rates.detect { |rate| rate.delivery_method_id == original_shipping_method_id }
-          end
-        selected_rate ||= delivery_rates.detect(&:selected)
+        selected_rate = successor_rate(original_shipping_method_id, original_selection)
 
         save!
         self.selected_shipping_rate_id = selected_rate.id if selected_rate
@@ -709,7 +712,7 @@ module Spree
     #
     # @return [Spree::Delivery, nil]
     def primary_delivery
-      deliveries.first
+      read_association_in_memory?(:deliveries) ? deliveries.to_a.first : deliveries.first
     end
 
     # The primary delivery's tracking number. Read-only since 6.0: tracking is
@@ -755,6 +758,25 @@ module Spree
       end
     end
 
+    # Carries the customer's choice onto a freshly built, unsaved proposal:
+    # takes the first of +candidates+ whose method this proposal is quoted for,
+    # selects the rate standing for it and prices the proposal at it, so a
+    # rebuild neither resets the choice nor drops its cost. The rate taken is
+    # removed from +candidates+, leaving the rest to this proposal's siblings.
+    #
+    # @param candidates [Array<Spree::DeliveryRate>] the rates selected on the
+    #   proposals this stock location had before the rebuild
+    # @return [void]
+    def carry_over_selection(candidates)
+      quoted_method_ids = delivery_rates.map(&:delivery_method_id)
+      previous_rate = candidates.find { |rate| quoted_method_ids.include?(rate.delivery_method_id) }
+      candidates.delete(previous_rate)
+
+      choice = successor_rate(previous_rate&.delivery_method_id, previous_rate)
+      delivery_rates.each { |rate| rate.selected = rate == choice }
+      self.cost = choice&.cost || 0
+    end
+
     # @deprecated No-op since 6.0; removed in 6.1.
     #
     # This re-derived the status from the order's payment state on every order
@@ -792,6 +814,21 @@ module Spree
 
     private
 
+    # The previously chosen carrier service when it is still quoted, then the
+    # previously chosen method, then the estimator's own pick - a carrier
+    # method quotes one rate per service, so the method alone does not
+    # identify the choice.
+    def successor_rate(delivery_method_id, previous_rate)
+      same_method = delivery_method_id ? delivery_rates.select { |rate| rate.delivery_method_id == delivery_method_id } : []
+      same_service = if previous_rate&.carrier
+                       same_method.detect do |rate|
+                         rate.carrier == previous_rate.carrier && rate.service_level == previous_rate.service_level
+                       end
+                     end
+
+      same_service || same_method.first || delivery_rates.detect(&:selected)
+    end
+
     # @return [Boolean] whether this parcel's order shares its payment with
     #   others placed in the same checkout
     # Draws one parcel's worth from a payment and reports what it took.
@@ -869,8 +906,7 @@ module Spree
     def capture_at_gateway(payment, amount)
       return 0 if amount <= 0
 
-      units = Spree::Money::Rounding.to_minor_units(amount, payment.currency)
-      result = Spree.payment_capture_workflow.call(payment: payment, amount: units)
+      result = Spree.payment_capture_workflow.call(payment: payment, amount: amount)
       raise Spree::Core::GatewayError, result.error.value.to_s if result.failure?
 
       amount
@@ -957,7 +993,7 @@ module Spree
     end
 
     def exactly_one_owner
-      errors.add(:base, :exactly_one_of_cart_or_order, message: Spree.t('errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
+      errors.add(:base, :exactly_one_of_cart_or_order, message: I18n.t('spree.errors.messages.exactly_one_of_cart_or_order')) unless [order, cart].compact.one?
     end
 
     def update_adjustments

data/app/models/spree/fulfillment_changer.rb

@@ -106,8 +106,8 @@ module Spree
     end
 
     def get_desired_shipment_inventory_unit(state)
-      desired_shipment.fulfillment_items.find_or_create_by(status: state, variant: variant) do |unit|
-        current_shipment_unit = current_shipment_units.first
+      current_shipment_unit = current_shipment_units.first
+      desired_shipment.fulfillment_items.find_or_create_by(status: state, variant: variant, replacement: current_shipment_unit&.replacement || false) do |unit|
         unit.variant_id = current_shipment_unit.variant_id
         unit.order_id = current_shipment_unit.order_id
         unit.line_item_id = current_shipment_unit.line_item_id

data/app/models/spree/fulfillment_group.rb

@@ -72,12 +72,17 @@ module Spree
       fulfillments.sum { |fulfillment| fulfillment.discounted_cost.to_d }
     end
 
+    # @return [String] the currency the parcel was quoted in
+    def currency
+      primary.currency
+    end
+
     # @return [String, Spree::Money] the forwarder's placeholder while a
     #   freight rate is unpriced, money otherwise
     def display_cost(**options)
       return primary.display_cost(**options) if unpriced?
 
-      Spree::Money.new(cost, { currency: primary.currency }.merge(options))
+      Spree::Money.new(cost, { currency: currency }.merge(options))
     end
 
     # @return [Boolean]

data/app/models/spree/fulfillment_item.rb

@@ -15,11 +15,7 @@ module Spree
       belongs_to :line_item, class_name: 'Spree::LineItem'
     end
 
-    scope :backordered, -> { where status: 'backordered' }
-    scope :on_hand, -> { where status: 'on_hand' }
     scope :on_hand_or_backordered, -> { where status: ['backordered', 'on_hand'] }
-    scope :shipped, -> { where status: 'shipped' }
-    scope :returned, -> { where status: 'returned' }
     scope :backordered_per_variant, ->(stock_level) do
       includes(:fulfillment, :order).
         where.not(Spree::Fulfillment.table_name => { status: 'canceled' }).

data/app/models/spree/fulfillment_provider/base.rb

@@ -6,6 +6,7 @@ module Spree
     # ShipmentHandler name-constantize mechanism.
     class Base
       include Spree::IntegrationBackedProvider
+      extend Spree::ApiTyped
 
       class << self
         # Behavior predicates — the class hierarchy IS the vocabulary.

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

@@ -1,5 +1,7 @@
 module Spree
   class Gateway::Bogus < Gateway
+    self.accepts_money_amounts = true
+
     TEST_VISA = ['4111111111111111', '4012888888881881', '4222222222222']
     TEST_MC   = ['5500000000000004', '5555555555554444', '5105105105105100', '2223000010309703']
     TEST_AMEX = ['378282246310005', '371449635398431', '378734493671000', '340000000000009']
@@ -117,6 +119,10 @@ module Spree
       payment_session.complete
     end
 
+    def cancel_payment_session(payment_session:)
+      payment_session.cancel
+    end
+
     def setup_session_supported?
       true
     end

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

@@ -1,5 +1,10 @@
 module Spree
   class Gateway::CustomPaymentSourceMethod < Gateway
+    # Sources recorded by the merchant, not charged through a provider.
+    def self.third_party?
+      false
+    end
+
     def provider_class
       self.class
     end

data/app/models/spree/gateway.rb

@@ -1,6 +1,6 @@
 module Spree
   class Gateway < PaymentMethod
-    FROM_DOLLAR_TO_CENT_RATE = 100.0
+    FROM_DOLLAR_TO_CENT_RATE = 100
 
     delegate :authorize, :purchase, :capture, :void, :credit, to: :provider
 
@@ -31,6 +31,10 @@ module Spree
       outer ? outer.underscore : leaf
     end
 
+    def self.third_party?
+      true
+    end
+
     def payment_source_class
       CreditCard
     end
@@ -49,7 +53,7 @@ module Spree
     end
 
     def options
-      preferences.each_with_object({}) { |(key, value), memo| memo[key.to_sym] = value; }
+      preference_values.symbolize_keys
     end
 
     def method_missing(method, *args)

data/app/models/spree/gift_card.rb

@@ -5,9 +5,13 @@ module Spree
     extend DisplayMoney
     include Spree::SingleStoreResource
     include Spree::HasCustomFields
+    include Spree::CanonicalDecimals
+
+    canonical_decimals :amount
     include Spree::Security::GiftCards if defined?(Spree::Security::GiftCards)
 
     publishes_lifecycle_events
+    publishes_events :canceled, :partially_redeemed, :redeemed
 
     #
     # Status
@@ -35,7 +39,6 @@ module Spree
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :customer, class_name: Spree.customer_class.to_s, optional: true
     include Spree::DeprecatedCustomerAlias
     belongs_to :created_by, class_name: Spree.admin_user_class.to_s, optional: true
@@ -62,10 +65,12 @@ module Spree
     # Ransack
     #
     ransack_alias :state, :status # @deprecated filter alias — removed in 6.1
-    self.whitelisted_ransackable_attributes = %w[code customer_id status state gift_card_batch_id created_by_id]
+    self.whitelisted_ransackable_attributes = %w[code customer_id status state gift_card_batch_id created_by_id currency expires_at]
+    search_by :code
     # `users` is the pre-6.0 name for `customers` — removed in 6.1.
     self.whitelisted_ransackable_associations = %w[customers users orders batch]
     self.whitelisted_ransackable_scopes = %w[active expired redeemed partially_redeemed]
+    self.ransackable_scope_types = %w[active expired redeemed partially_redeemed].index_with('boolean')
 
     normalizes :code, with: ->(value) { value&.to_s&.squish&.presence }
 
@@ -82,18 +87,23 @@ module Spree
     #
     money_methods :amount, :amount_used, :amount_authorized, :amount_remaining
 
-    # Sets the amount
-    # @param amount [String]
-    def amount=(amount)
-      self[:amount] = Spree::LocalizedNumber.parse(amount)
-    end
-
     # Calculates the remaining amount
     # @return [Decimal]
     def amount_remaining
       amount - amount_used - amount_authorized
     end
 
+    # What the card can still give towards an order: nothing once it has
+    # expired, been redeemed or been cancelled, and never less than zero,
+    # since an admin can lower the amount below what is already in use.
+    #
+    # @return [BigDecimal]
+    def spendable_amount
+      return BigDecimal('0') if expired? || redeemed? || canceled?
+
+      [amount_remaining, 0].max
+    end
+
     delegate :email, to: :customer, prefix: true, allow_nil: true
 
     def self.json_api_columns

data/app/models/spree/gift_card_batch.rb

@@ -4,13 +4,15 @@ module Spree
 
     extend DisplayMoney
     include Spree::SingleStoreResource
+    include Spree::CanonicalDecimals
+
+    canonical_decimals :amount
 
     publishes_lifecycle_events
 
     #
     # Associations
     #
-    belongs_to :store, class_name: 'Spree::Store'
     belongs_to :created_by, class_name: Spree.admin_user_class.to_s, optional: true
     has_many :gift_cards, class_name: 'Spree::GiftCard', inverse_of: :batch, dependent: :destroy
 
@@ -35,10 +37,6 @@ module Spree
 
     money_methods :amount
 
-    def amount=(amount)
-      self[:amount] = Spree::LocalizedNumber.parse(amount)
-    end
-
     self.whitelisted_ransackable_attributes = %w[prefix]
 
     def generate_gift_cards

data/app/models/spree/import.rb

@@ -17,6 +17,7 @@ module Spree
       'https://raw.githubusercontent.com/spree/spree/refs/tags/v%<version>s/spree/core/db/sample_data'.freeze
 
     publishes_lifecycle_events
+    publishes_events :completed, :progress
 
     # Set event prefix for all Import subclasses
     # This ensures Spree::Imports::Products publishes 'import.create' not 'products.create'
@@ -54,6 +55,7 @@ module Spree
     # Ransack configuration
     #
     self.whitelisted_ransackable_attributes = %w[number type status seller_id]
+    search_by :number
     # Lets an operator filter their list by who ran the job — the seller's
     # name, not an id they would have to look up first.
     self.whitelisted_ransackable_associations = %w[seller]
@@ -71,6 +73,7 @@ module Spree
     # Attachments
     #
     has_one_attached :attachment, service: Spree.private_storage_service_name
+    signed_id_attachments :attachment
 
     #
     # Status
@@ -86,6 +89,7 @@ module Spree
     # Preferences
     #
     preference :delimiter, :string, default: ','
+    exposes_preferences :delimiter
     # Run the pipeline in-process instead of enqueuing it. For rake tasks, seeds
     # and the console, where the caller needs the data to exist when the call
     # returns and there may be no worker attached. Never set it from a request:
@@ -191,12 +195,6 @@ module Spree
       Spree.import_retry_failed_rows_workflow.call(import: self).success?
     end
 
-    # Returns true if the import is in mapping state
-    # @return [Boolean]
-    def mapping?
-      status == 'mapping'
-    end
-
     # Returns true if the import is processing or completed mapping
     # @return [Boolean]
     def processing?
@@ -331,7 +329,7 @@ module Spree
     # Returns the display name for the import
     # @return [String]
     def display_name
-      "#{Spree.t(type.demodulize.pluralize.downcase)} #{number}"
+      "#{self.class.model_name.human(count: 2)} #{number}"
     end
 
     # Returns the headers of the csv file

data/app/models/spree/import_mapping.rb

@@ -5,7 +5,7 @@ module Spree
     #
     # Associations
     #
-    belongs_to :import, class_name: 'Spree::Import', inverse_of: :mappings, required: true
+    belongs_to :import, class_name: 'Spree::Import', inverse_of: :mappings
 
     #
     # Validations
@@ -17,7 +17,6 @@ module Spree
     #
     # Scopes
     #
-    scope :required, -> { where(schema_field: import.required_fields) }
     scope :mapped, -> { where.not(file_column: [nil, '']) }
 
     # Returns true if the mapping is required