solidus_core 4.6.2 → 4.7.0

data/lib/spree/app_configuration.rb

@@ -19,14 +19,15 @@
 #
 require "spree/core/search/base"
 require "spree/core/search/variant"
-require 'spree/preferences/configuration'
-require 'spree/core/environment'
+require "spree/preferences/configuration"
+require "spree/core/environment"
 
-require 'uri'
+require "uri"
 
 module Spree
   class AppConfiguration < Preferences::Configuration
     include Spree::Core::EnvironmentExtension
+
     # Preferences (alphabetized to more easily lookup particular preferences)
 
     # @!attribute [rw] address_requires_phone
@@ -39,7 +40,7 @@ module Spree
 
     # @!attribute [rw] admin_interface_logo
     #   @return [String] URL of logo used in admin (default: +'logo/solidus.svg'+)
-    preference :admin_interface_logo, :string, default: 'logo/solidus.svg'
+    preference :admin_interface_logo, :string, default: "logo/solidus.svg"
 
     # @!attribute [rw] admin_products_per_page
     #   @return [Integer] Number of products to display in admin (default: +10+)
@@ -146,7 +147,7 @@ module Spree
     # @!attribute [rw] default_country_iso
     #   Default customer country ISO code
     #   @return [String] Two-letter ISO code of a {Spree::Country} to assumed as the country of an unidentified customer (default: "US")
-    preference :default_country_iso, :string, default: 'US'
+    preference :default_country_iso, :string, default: "US"
 
     # @!attribute [rw] default_email_regexp
     #   @return [Regexp] Regex to be used in email validations, for example in Spree::EmailValidator
@@ -166,7 +167,7 @@ module Spree
 
     # @!attribute [rw] layout
     #   @return [String] template to use for layout on the frontend (default: +"spree/layouts/spree_application"+)
-    preference :layout, :string, default: 'spree/layouts/spree_application'
+    preference :layout, :string, default: "spree/layouts/spree_application"
 
     # !@attribute [rw] line_item_comparison_hooks
     #   @return [Array<Symbol>] An array of methods to call on {Spree::Order} to determine if a line item is equal to another
@@ -177,7 +178,7 @@ module Spree
 
     # @!attribute [rw] logo
     #   @return [String] URL of logo used on frontend (default: +'logo/solidus.svg'+)
-    preference :logo, :string, default: 'logo/solidus.svg'
+    preference :logo, :string, default: "logo/solidus.svg"
 
     # @!attribute [rw] log_entry_permitted_classes
     #   @return [Array<String>] An array of extra classes that are allowed to be
@@ -245,6 +246,10 @@ module Spree
     #   @return [Integer] Products to show per-page in the frontend (default: +12+)
     preference :products_per_page, :integer, default: 12
 
+    # @!attribute [rw] recalculate_cart_prices
+    #   @return [Boolean] Whether to recalculate cart prices when recalculating (default: +false+)
+    versioned_preference :recalculate_cart_prices, :boolean, initial_value: false, boundaries: {"5.0.0.alpha" => true}
+
     # @!attribute [rw] require_master_price
     #   @return [Boolean] Require a price on the master variant of a product (default: +true+)
     preference :require_master_price, :boolean, default: true
@@ -261,7 +266,7 @@ module Spree
     #   @return [Array] An array of roles where generating an api key for a user
     #   at role_user creation is desired when user has one of these roles.
     #   (default: +['admin']+)
-    preference :roles_for_auto_api_key, :array, default: ['admin']
+    preference :roles_for_auto_api_key, :array, default: ["admin"]
 
     # @!attribute [rw] countries_that_use_nested_subregions
     #   @return [Array] An array of countries that use nested subregions, instead
@@ -269,7 +274,7 @@ module Spree
     #   to ensure the correct states are generated, and when running the states
     #   regenerate rake task.
     #   (default: +['IT']+)
-    preference :countries_that_use_nested_subregions, :array, default: ['IT']
+    preference :countries_that_use_nested_subregions, :array, default: ["IT"]
 
     # @!attribute [rw] send_core_emails
     #   @return [Boolean] Whether to send transactional emails (default: true)
@@ -318,14 +323,14 @@ module Spree
     end
 
     # searcher_class allows spree extension writers to provide their own Search class
-    class_name_attribute :searcher_class, default: 'Spree::Core::Search::Base'
+    class_name_attribute :searcher_class, default: "Spree::Core::Search::Base"
 
     # Allows implementing custom pricing for variants
     # @!attribute [rw] variant_price_selector_class
     # @see Spree::Variant::PriceSelector
     # @return [Class] an object that conforms to the API of
     #   the standard variant price selector class Spree::Variant::PriceSelector.
-    class_name_attribute :variant_price_selector_class, default: 'Spree::Variant::PriceSelector'
+    class_name_attribute :variant_price_selector_class, default: "Spree::Variant::PriceSelector"
 
     # Shortcut for getting the variant price selector's pricing options class
     #
@@ -339,7 +344,7 @@ module Spree
       pricing_options_class.new
     end
 
-    class_name_attribute :variant_search_class, default: 'Spree::Core::Search::Variant'
+    class_name_attribute :variant_search_class, default: "Spree::Core::Search::Variant"
 
     # Allows implementing custom vat prices generation
     # @!attribute [rw] variant_vat_prices_generator_class
@@ -347,20 +352,20 @@ module Spree
     # @return [Class] an object that conforms to the API of
     #   the standard variant vat prices generator class
     #   Spree::Variant::VatPriceGenerator.
-    class_name_attribute :variant_vat_prices_generator_class, default: 'Spree::Variant::VatPriceGenerator'
+    class_name_attribute :variant_vat_prices_generator_class, default: "Spree::Variant::VatPriceGenerator"
 
-    class_name_attribute :allocator_class, default: 'Spree::Stock::Allocator::OnHandFirst'
+    class_name_attribute :allocator_class, default: "Spree::Stock::Allocator::OnHandFirst"
 
-    class_name_attribute :shipping_rate_sorter_class, default: 'Spree::Stock::ShippingRateSorter'
+    class_name_attribute :shipping_rate_sorter_class, default: "Spree::Stock::ShippingRateSorter"
 
-    class_name_attribute :shipping_rate_selector_class, default: 'Spree::Stock::ShippingRateSelector'
+    class_name_attribute :shipping_rate_selector_class, default: "Spree::Stock::ShippingRateSelector"
 
     # Allows providing your own class for calculating taxes on a shipping rate.
     #
     # @!attribute [rw] shipping_rate_tax_calculator_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::TaxCalculator::ShippingRate
-    class_name_attribute :shipping_rate_tax_calculator_class, default: 'Spree::TaxCalculator::ShippingRate'
+    class_name_attribute :shipping_rate_tax_calculator_class, default: "Spree::TaxCalculator::ShippingRate"
 
     # Allows providing your own Mailer for order mailer.
     #
@@ -369,14 +374,14 @@ module Spree
     #   "cancel_email" and "inventory_cancellation_email"
     #   (e.g. an ActionMailer with a "confirm_email" method) with the same
     #   signature as Spree::OrderMailer.confirm_email.
-    class_name_attribute :order_mailer_class, default: 'Spree::OrderMailer'
+    class_name_attribute :order_mailer_class, default: "Spree::OrderMailer"
 
     # Allows providing your own order update attributes class for checkout.
     #
     # @!attribute [rw] order_update_attributes_class
     # @return [Class] a class that responds to "call"
     #   with the same signature as Spree::OrderUpdateAttributes.
-    class_name_attribute :order_update_attributes_class, default: 'Spree::OrderUpdateAttributes'
+    class_name_attribute :order_update_attributes_class, default: "Spree::OrderUpdateAttributes"
 
     # Allows providing a different order recalculator.
     # @!attribute [rw] order_recalculator_class
@@ -384,7 +389,7 @@ module Spree
     # @return [Class] an object that conforms to the API of
     #   the standard order recalculator class
     #   Spree::OrderUpdater.
-    class_name_attribute :order_recalculator_class, default: 'Spree::OrderUpdater'
+    class_name_attribute :order_recalculator_class, default: "Spree::OrderUpdater"
 
     # Allows providing your own Mailer for reimbursement mailer.
     #
@@ -392,7 +397,7 @@ module Spree
     # @return [ActionMailer::Base] an object that responds to "reimbursement_email"
     #   (e.g. an ActionMailer with a "reimbursement_email" method) with the same
     #   signature as Spree::ReimbursementMailer.reimbursement_email.
-    class_name_attribute :reimbursement_mailer_class, default: 'Spree::ReimbursementMailer'
+    class_name_attribute :reimbursement_mailer_class, default: "Spree::ReimbursementMailer"
 
     # Allows providing your own Mailer for shipped cartons.
     #
@@ -400,14 +405,21 @@ module Spree
     # @return [ActionMailer::Base] an object that responds to "shipped_email"
     #   (e.g. an ActionMailer with a "shipped_email" method) with the same
     #   signature as Spree::CartonMailer.shipped_email.
-    class_name_attribute :carton_shipped_email_class, default: 'Spree::CartonMailer'
+    class_name_attribute :carton_shipped_email_class, default: "Spree::CartonMailer"
 
     # Allows providing your own class for merging two orders.
     #
     # @!attribute [rw] order_merger_class
     # @return [Class] a class with the same public interfaces
     #   as Spree::OrderMerger.
-    class_name_attribute :order_merger_class, default: 'Spree::OrderMerger'
+    class_name_attribute :order_merger_class, default: "Spree::OrderMerger"
+
+    # Allows providing your own class for selecting which orders to merge.
+    #
+    # @!attribute [rw] mergeable_orders_finder_class
+    # @return [Class] a class with the same public interfaces as
+    #   Spree::MergeableOrdersFinder.
+    class_name_attribute :mergeable_orders_finder_class, default: "Spree::MergeableOrdersFinder"
 
     # Allows providing your own class for adding default payments to a user's
     # order from their "wallet".
@@ -415,21 +427,21 @@ module Spree
     # @!attribute [rw] default_payment_builder_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::Wallet::DefaultPaymentBuilder.
-    class_name_attribute :default_payment_builder_class, default: 'Spree::Wallet::DefaultPaymentBuilder'
+    class_name_attribute :default_payment_builder_class, default: "Spree::Wallet::DefaultPaymentBuilder"
 
     # Allows providing your own class for managing the contents of an order.
     #
     # @!attribute [rw] order_contents_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::OrderContents.
-    class_name_attribute :order_contents_class, default: 'Spree::SimpleOrderContents'
+    class_name_attribute :order_contents_class, default: "Spree::SimpleOrderContents"
 
     # Allows providing your own class for shipping an order.
     #
     # @!attribute [rw] order_shipping_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::OrderShipping.
-    class_name_attribute :order_shipping_class, default: 'Spree::OrderShipping'
+    class_name_attribute :order_shipping_class, default: "Spree::OrderShipping"
 
     # Allows providing your own class for managing the inventory units of a
     # completed order.
@@ -437,7 +449,7 @@ module Spree
     # @!attribute [rw] order_cancellations_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::OrderCancellations.
-    class_name_attribute :order_cancellations_class, default: 'Spree::OrderCancellations'
+    class_name_attribute :order_cancellations_class, default: "Spree::OrderCancellations"
 
     # Allows providing your own class for canceling payments.
     #
@@ -456,14 +468,14 @@ module Spree
     # @!attribute [rw] add_payment_sources_to_wallet_class
     # @return [Class] a class with the same public interfaces
     #   as Spree::Wallet::AddPaymentSourcesToWallet.
-    class_name_attribute :add_payment_sources_to_wallet_class, default: 'Spree::Wallet::AddPaymentSourcesToWallet'
+    class_name_attribute :add_payment_sources_to_wallet_class, default: "Spree::Wallet::AddPaymentSourcesToWallet"
 
     # Allows providing your own class for recalculating totals on an item.
     #
     # @!attribute [rw] item_total_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::ItemTotal
-    class_name_attribute :item_total_class, default: 'Spree::ItemTotal'
+    class_name_attribute :item_total_class, default: "Spree::ItemTotal"
 
     # Allows providing your own class for calculating taxes on an order.
     #
@@ -472,42 +484,42 @@ module Spree
     # @!attribute [rw] tax_adjuster_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::Tax::OrderAdjuster
-    class_name_attribute :tax_adjuster_class, default: 'Spree::Tax::OrderAdjuster'
+    class_name_attribute :tax_adjuster_class, default: "Spree::Tax::OrderAdjuster"
 
     # Allows providing your own class for calculating taxes on an order.
     #
     # @!attribute [rw] tax_calculator_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::TaxCalculator::Default
-    class_name_attribute :tax_calculator_class, default: 'Spree::TaxCalculator::Default'
+    class_name_attribute :tax_calculator_class, default: "Spree::TaxCalculator::Default"
 
     # Allows providing your own class for choosing which store to use.
     #
     # @!attribute [rw] current_store_selector_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::CurrentStoreSelector
-    class_name_attribute :current_store_selector_class, default: 'Spree::StoreSelector::ByServerName'
+    class_name_attribute :current_store_selector_class, default: "Spree::StoreSelector::ByServerName"
 
     # Allows providing your own class for creating urls on taxons
     #
     # @!attribute [rw] taxon_url_parametizer_class
     # @return [Class] a class that provides a `#parameterize` method that
     # returns a String
-    class_name_attribute :taxon_url_parametizer_class, default: 'ActiveSupport::Inflector'
+    class_name_attribute :taxon_url_parametizer_class, default: "ActiveSupport::Inflector"
 
     # Allows providing your own class for image galleries on Variants
     #
     # @!attribute [rw] variant_gallery_class
     # @return [Class] a class that implements an `images` method and returns an
     # Enumerable of images adhering to the present_image_class interface
-    class_name_attribute :variant_gallery_class, default: 'Spree::Gallery::VariantGallery'
+    class_name_attribute :variant_gallery_class, default: "Spree::Gallery::VariantGallery"
 
     # Allows providing your own class for image galleries on Products
     #
     # @!attribute [rw] product_gallery_class
     # @return [Class] a class that implements an `images` method and returns an
     # Enumerable of images adhering to the present_image_class interface
-    class_name_attribute :product_gallery_class, default: 'Spree::Gallery::ProductGallery'
+    class_name_attribute :product_gallery_class, default: "Spree::Gallery::ProductGallery"
 
     # Allows switching attachment library for Image
     #
@@ -525,7 +537,7 @@ module Spree
     # `%w(image/jpeg image/jpg image/png image/gif).freeze` is the default.
     #
     # @return [Array]
-    class_name_attribute :allowed_image_mime_types, default: %w(image/jpeg image/jpg image/png image/gif).freeze
+    class_name_attribute :allowed_image_mime_types, default: %w[image/jpeg image/jpg image/png image/gif].freeze
 
     # @!attribute [rw] product_image_style_default
     #
@@ -544,10 +556,10 @@ module Spree
     #    large: '1200x1200>' } is the default.
     #
     # @return [Hash]
-    class_name_attribute :product_image_styles, default: { mini: '48x48>',
-                                                          small: '400x400>',
-                                                          product: '680x680>',
-                                                          large: '1200x1200>' }
+    class_name_attribute :product_image_styles, default: {mini: "48x48>",
+                                                          small: "400x400>",
+                                                          product: "680x680>",
+                                                          large: "1200x1200>"}
 
     # Allows to provide your own class for tracking state changes of stateful models
     #
@@ -562,14 +574,14 @@ module Spree
     # @!attribute [rw] store_credit_prioritizer_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::StoreCreditPrioritizer.
-    class_name_attribute :store_credit_prioritizer_class, default: 'Spree::StoreCreditPrioritizer'
+    class_name_attribute :store_credit_prioritizer_class, default: "Spree::StoreCreditPrioritizer"
 
     # Allows finding brand for product.
     #
     # @!attribute [rw] brand_selector_class
     # @return [Class] a class with the same public interfaces as
     #   Spree::TaxonBrandSelector.
-    class_name_attribute :brand_selector_class, default: 'Spree::TaxonBrandSelector'
+    class_name_attribute :brand_selector_class, default: "Spree::TaxonBrandSelector"
 
     # @!attribute [rw] taxon_image_style_default
     #
@@ -588,7 +600,7 @@ module Spree
     #    large: '1200x1200>' } is the default.
     #
     # @return [Hash]
-    class_name_attribute :taxon_image_styles, default: { mini: '32x32>', normal: '128x128>' }
+    class_name_attribute :taxon_image_styles, default: {mini: "32x32>", normal: "128x128>"}
 
     # Allows switching attachment library for Taxon
     #
@@ -618,7 +630,7 @@ module Spree
     # @return [Pathname] the configured path. (default: `Rails.root.join('db', 'migrate')`)
     attr_writer :migration_path
     def migration_path
-      @migration_path ||= ::Rails.root.join('db', 'migrate')
+      @migration_path ||= ::Rails.root.join("db", "migrate")
     end
 
     # Allows providing your own class instance for generating order numbers.
@@ -694,14 +706,14 @@ module Spree
 
     def roles
       @roles ||= Spree::RoleConfiguration.new.tap do |roles|
-        roles.assign_permissions :default, ['Spree::PermissionSets::DefaultCustomer']
-        roles.assign_permissions :admin, ['Spree::PermissionSets::SuperUser']
+        roles.assign_permissions :default, ["Spree::PermissionSets::DefaultCustomer"]
+        roles.assign_permissions :admin, ["Spree::PermissionSets::SuperUser"]
       end
     end
 
     def user_last_url_storer_rules
       @user_last_url_storer_rules ||= ::Spree::Core::ClassConstantizer::Set.new.tap do |set|
-        set << 'Spree::UserLastUrlStorer::Rules::AuthenticationRule'
+        set << "Spree::UserLastUrlStorer::Rules::AuthenticationRule"
       end
     end
 

data/lib/spree/bus.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'omnes'
+require "omnes"
 
 module Spree
   # Global [Omnes](https://github.com/nebulab/omnes) bus.

data/lib/spree/config.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/app_configuration'
+require "spree/app_configuration"
 
 Spree::Config = Spree::AppConfiguration.new

data/lib/spree/core/active_merchant_dependencies.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'active_merchant/errors'
+require "active_merchant/errors"
 
-require 'active_merchant/billing/base'
+require "active_merchant/billing/base"
 
-require 'active_merchant/billing/avs_result'
-require 'active_merchant/billing/cvv_result'
-require 'active_merchant/billing/response'
+require "active_merchant/billing/avs_result"
+require "active_merchant/billing/cvv_result"
+require "active_merchant/billing/response"
 
-require 'active_merchant/billing/credit_card_methods'
-require 'active_merchant/billing/credit_card_formatting'
-require 'active_merchant/billing/credit_card'
+require "active_merchant/billing/credit_card_methods"
+require "active_merchant/billing/credit_card_formatting"
+require "active_merchant/billing/credit_card"

data/lib/spree/core/class_constantizer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/module'
+require "active_support/core_ext/module"
 
 module Spree
   module Core

data/lib/spree/core/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spree/core'
+require "spree/core"
 
 module Spree
   module Core
@@ -9,7 +9,7 @@ module Spree
       CREDIT_CARD_VERIFICATION_VALUE_PARAM = /payment.*source.*\.verification_value$/
 
       isolate_namespace Spree
-      engine_name 'spree'
+      engine_name "spree"
 
       config.generators do |generator|
         generator.test_framework :rspec
@@ -31,15 +31,15 @@ module Spree
       end
 
       # leave empty initializers for backwards-compatability. Other apps might still rely on these events
-      initializer "spree.default_permissions", before: :load_config_initializers do; end
-      initializer "spree.register.calculators", before: :load_config_initializers do; end
-      initializer "spree.register.stock_splitters", before: :load_config_initializers do; end
-      initializer "spree.register.payment_methods", before: :load_config_initializers do; end
-      initializer 'spree.promo.environment', before: :load_config_initializers do; end
-      initializer 'spree.promo.register.promotion.calculators', before: :load_config_initializers do; end
-      initializer 'spree.promo.register.promotion.rules', before: :load_config_initializers do; end
-      initializer 'spree.promo.register.promotions.actions', before: :load_config_initializers do; end
-      initializer 'spree.promo.register.promotions.shipping_actions', before: :load_config_initializers do; end
+      initializer("spree.default_permissions", before: :load_config_initializers) {}
+      initializer("spree.register.calculators", before: :load_config_initializers) {}
+      initializer("spree.register.stock_splitters", before: :load_config_initializers) {}
+      initializer("spree.register.payment_methods", before: :load_config_initializers) {}
+      initializer("spree.promo.environment", before: :load_config_initializers) {}
+      initializer("spree.promo.register.promotion.calculators", before: :load_config_initializers) {}
+      initializer("spree.promo.register.promotion.rules", before: :load_config_initializers) {}
+      initializer("spree.promo.register.promotions.actions", before: :load_config_initializers) {}
+      initializer("spree.promo.register.promotions.shipping_actions", before: :load_config_initializers) {}
 
       # Filter sensitive information during logging
       initializer "spree.params.filter", before: :load_config_initializers do |app|
@@ -47,7 +47,7 @@ module Spree
           %r{^password$},
           %r{^password_confirmation$},
           CREDIT_CARD_NUMBER_PARAM,
-          CREDIT_CARD_VERIFICATION_VALUE_PARAM,
+          CREDIT_CARD_VERIFICATION_VALUE_PARAM
         ]
       end
 
@@ -56,7 +56,7 @@ module Spree
       end
 
       # Setup pub/sub
-      initializer 'spree.core.pub_sub' do |app|
+      initializer "spree.core.pub_sub" do |app|
         app.reloader.to_prepare do
           Spree::Bus.clear
 
@@ -95,13 +95,13 @@ module Spree
       end
 
       config.after_initialize do
-        Spree::Config.check_load_defaults_called('Spree::Config')
+        Spree::Config.check_load_defaults_called("Spree::Config")
         Spree::Config.static_model_preferences.validate!
       end
 
       config.after_initialize do
         if defined?(Spree::Auth::Engine) &&
-            Gem::Version.new(Spree::Auth::VERSION) < Gem::Version.new('2.5.4') &&
+            Gem::Version.new(Spree::Auth::VERSION) < Gem::Version.new("2.5.4") &&
             defined?(Spree::UsersController)
           Spree::UsersController.protect_from_forgery with: :exception
         end

data/lib/spree/core/environment.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'spree/core/environment_extension'
+require "spree/core/environment_extension"
 
 module Spree
   module Core

data/lib/spree/core/environment_extension.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spree/core/class_constantizer'
-require 'spree/core/nested_class_set'
+require "spree/core/class_constantizer"
+require "spree/core/nested_class_set"
 
 module Spree
   module Core

data/lib/spree/core/importer/order.rb

@@ -35,7 +35,7 @@ module Spree
 
             if completed_at
               order.completed_at = completed_at
-              order.state = 'complete'
+              order.state = "complete"
               order.save!
             end
 
@@ -55,7 +55,7 @@ module Spree
 
           shipments_hash.each do |target|
             shipment = Shipment.new
-            shipment.tracking       = target[:tracking]
+            shipment.tracking = target[:tracking]
             shipment.stock_location = Spree::StockLocation.find_by(id: target[:stock_location_id]) ||
               Spree::StockLocation.find_by(admin_name: target[:stock_location]) ||
               Spree::StockLocation.find_by!(name: target[:stock_location])
@@ -64,7 +64,7 @@ module Spree
             inventory_units.each do |inventory_unit|
               ensure_variant_id_from_params(inventory_unit)
 
-              unless line_item = order.line_items.find_by(variant_id: inventory_unit[:variant_id])
+              unless (line_item = order.line_items.find_by(variant_id: inventory_unit[:variant_id]))
                 line_item = order.contents.add(Spree::Variant.find(inventory_unit[:variant_id]), 1)
               end
 
@@ -81,9 +81,9 @@ module Spree
             # Mark shipped if it should be.
             if target[:shipped_at].present?
               shipment.shipped_at = target[:shipped_at]
-              shipment.state      = 'shipped'
+              shipment.state = "shipped"
               shipment.inventory_units.each do |unit|
-                unit.state = 'shipped'
+                unit.state = "shipped"
               end
             end
 
@@ -92,7 +92,7 @@ module Spree
 
             shipping_method = Spree::ShippingMethod.find_by(name: target[:shipping_method]) || Spree::ShippingMethod.find_by!(admin_name: target[:shipping_method])
             rate = shipment.shipping_rates.create!(shipping_method:,
-                                                   cost: target[:cost])
+              cost: target[:cost])
             shipment.selected_shipping_rate_id = rate.id
             shipment.update_amounts
           end
@@ -131,7 +131,7 @@ module Spree
             adjustment = order.adjustments.build(
               order:,
               amount: target[:amount].to_d,
-              label:  target[:label]
+              label: target[:label]
             )
             adjustment.save!
             adjustment.finalize!
@@ -145,7 +145,7 @@ module Spree
             payment.amount = target[:amount].to_f
             # Order API should be using state as that's the normal payment field.
             # spree_wombat serializes payment state as status so imported orders should fall back to status field.
-            payment.state = target[:state] || target[:status] || 'completed'
+            payment.state = target[:state] || target[:status] || "completed"
             payment.payment_method = Spree::PaymentMethod.find_by!(name: target[:payment_method])
             source_attributes = target[:source] || target[:source_attributes]
             payment.source = create_source_payment_from_params(source_attributes, payment) if source_attributes
@@ -179,13 +179,13 @@ module Spree
           return if address.nil? || address[:country_id].present? || address[:country].nil?
 
           search = {}
-          if name = address[:country]['name']
+          if (name = address[:country]["name"])
             search[:name] = name
-          elsif iso_name = address[:country]['iso_name']
+          elsif (iso_name = address[:country]["iso_name"])
             search[:iso_name] = iso_name.upcase
-          elsif iso = address[:country]['iso']
+          elsif (iso = address[:country]["iso"])
             search[:iso] = iso.upcase
-          elsif iso_three = address[:country]['iso3']
+          elsif (iso_three = address[:country]["iso3"])
             search[:iso3] = iso_three.upcase
           end
 
@@ -197,16 +197,16 @@ module Spree
           return if address.nil? || address[:state_id].present? || address[:state].nil?
 
           search = {}
-          if name = address[:state]['name']
+          if (name = address[:state]["name"])
             search[:name] = name
-          elsif abbr = address[:state]['abbr']
+          elsif (abbr = address[:state]["abbr"])
             search[:abbr] = abbr.upcase
           end
 
           address.delete(:state)
           search[:country_id] = address[:country_id]
 
-          if state = Spree::State.where(search).first
+          if (state = Spree::State.where(search).first)
             address[:state_id] = state.id
           else
             address[:state_name] = search[:name] || search[:abbr]

data/lib/spree/core/importer/product.rb

@@ -18,7 +18,7 @@ module Spree
           if product.save
             variants_attrs.each do |variant_attribute|
               # make sure the product is assigned before the options=
-              product.variants.create({ product: }.merge(variant_attribute))
+              product.variants.create({product:}.merge(variant_attribute))
             end
 
             set_up_options
@@ -31,11 +31,11 @@ module Spree
           if product.update(product_attrs)
             variants_attrs.each do |variant_attribute|
               # update the variant if the id is present in the payload
-              if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
+              if variant_attribute["id"].present?
+                product.variants.find(variant_attribute["id"].to_i).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
-                product.variants.create({ product: }.merge(variant_attribute))
+                product.variants.create({product:}.merge(variant_attribute))
               end
             end
 

data/lib/spree/core/importer.rb

@@ -7,5 +7,5 @@ module Spree
   end
 end
 
-require 'spree/core/importer/order'
-require 'spree/core/importer/product'
+require "spree/core/importer/order"
+require "spree/core/importer/product"