solidus_core 4.2.3 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7938f34b4bcad40238d6e3b65de04d09adf33f858d356a4018e9786ca4ed6ab
-  data.tar.gz: 195dee172feed70780658e7bc036ee937968f49890d4d2ef7c0b0e8ad2444d8e
+  metadata.gz: 3154fd1401eef3187a12d7942c30e883bcc8e229e289f097c30d8fe50f0bfd04
+  data.tar.gz: e2ac175d41b1ee220217de2b5ffa3b7a27dfd0931ad0ef362edaa1317b90c922
 SHA512:
-  metadata.gz: dac210f0e4f20d0d0d5ffb9b4544855ecb4577674283340a27c21943df9949d9a56bfeb514efa5ad70892ec3ecdc65d7134adb01b1861fd2567d9b289dd663b6
-  data.tar.gz: c7ee0dd8abcc63ac7efc17b6736da623e0ed9ff57c9954c3ef90666aea214d348dca3893b21b97aa883bfb8a493a7a6fca69b2e0507a9d3be2e7b60da855cbab
+  metadata.gz: baf556b1e3a617526ff3963637f98fb643f3ccca0d3b1504cc65740b9fb7213a6f26692ad085ecfba9a10d1dcaecd9a8ed3e6946b52b46169f6ce9001d8a793b
+  data.tar.gz: 1ec1d893433de9e85e181a1c1caa2257310b9bebdaa23c74a0bbb1115f1506745701bd3c31b1cdad433c93cdb2eea20d467d39b5b0d85f1b290703f85d00b475

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

@@ -5,6 +5,8 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
+      Spree.deprecator.warn "Spree::NamedType is deprecated. Please set scopes and validations locally instead.", caller
+
       scope :active, -> { where(active: true) }
       default_scope -> { order(arel_table[:name].lower) }
 

data/app/models/spree/address.rb

@@ -28,8 +28,10 @@ module Spree
 
     self.allowed_ransackable_attributes = %w[name]
 
-    scope :with_values, ->(attributes) do
-      where(value_attributes(attributes))
+    unless ActiveRecord::Relation.method_defined? :with_values # Rails 7.1+
+      scope :with_values, ->(attributes) do
+        where(value_attributes(attributes))
+      end
     end
 
     # @return [Address] an address with default attributes

data/app/models/spree/adjustment.rb

@@ -132,6 +132,7 @@ module Spree
         eligible?
       end
     end
+    deprecate :calculate_eligibility, deprecator: Spree.deprecator
 
     private
 

data/app/models/spree/adjustment_reason.rb

@@ -8,5 +8,7 @@ module Spree
     validates :code, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     scope :active, -> { where(active: true) }
+
+    self.allowed_ransackable_attributes = %w[name code]
   end
 end

data/app/models/spree/credit_card.rb

@@ -21,9 +21,6 @@ module Spree
 
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
 
-    # needed for some of the ActiveMerchant gateways (eg. SagePay)
-    alias_attribute :brand, :cc_type
-
     # Taken from ActiveMerchant
     # https://github.com/activemerchant/active_merchant/blob/2f2acd4696e8de76057b5ed670b9aa022abc1187/lib/active_merchant/billing/credit_card_methods.rb#L5
     CARD_TYPES = {
@@ -95,6 +92,12 @@ module Spree
       end
     end
 
+    # needed for some of the ActiveMerchant gateways (eg. SagePay)
+    alias_attribute :brand, :cc_type
+
+    # Rails 7.1+ won't use the custom setter with alias_attribute
+    alias_method :brand=, :cc_type=
+
     # Sets the last digits field based on the assigned credit card number.
     def set_last_digits
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..)

data/app/models/spree/order.rb

@@ -72,11 +72,15 @@ module Spree
 
     # Customer info
     belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
+
     belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address', optional: true
-    alias_attribute :billing_address, :bill_address
+    alias_method :billing_address, :bill_address
+    alias_method :billing_address=, :bill_address=
 
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address', optional: true
-    alias_attribute :shipping_address, :ship_address
+    alias_method :shipping_address, :ship_address
+    alias_method :shipping_address=, :ship_address=
+
     alias_attribute :ship_total, :shipment_total
 
     belongs_to :store, class_name: 'Spree::Store', optional: true
@@ -104,7 +108,7 @@ module Spree
              foreign_key: :order_id,
              dependent: :destroy,
              inverse_of: :order
-    has_many :order_promotions, class_name: 'Spree::OrderPromotion'
+    has_many :order_promotions, class_name: 'Spree::OrderPromotion', dependent: :destroy
     has_many :promotions, through: :order_promotions
 
     # Payments
@@ -135,7 +139,9 @@ module Spree
     before_validation :set_currency
     before_validation :generate_order_number, on: :create
     before_validation :assign_billing_to_shipping_address, if: :use_billing?
+    before_validation :assign_shipping_to_billing_address, if: :use_shipping?
     attr_accessor :use_billing
+    attr_accessor :use_shipping
 
     before_create :create_token
     before_create :link_by_email
@@ -271,6 +277,11 @@ module Spree
       true
     end
 
+    def assign_shipping_to_billing_address
+      self.bill_address = ship_address if ship_address
+      true
+    end
+
     def allow_cancel?
       return false unless completed? && state != 'canceled'
       shipment_state.nil? || %w{ready backorder pending}.include?(shipment_state)
@@ -498,7 +509,7 @@ module Spree
     end
 
     def apply_shipping_promotions
-      Spree::PromotionHandler::Shipping.new(self).activate
+      Spree::Config.shipping_promotion_handler_class.new(self).activate
       recalculate
     end
 
@@ -630,7 +641,7 @@ module Spree
       if can_complete? || complete?
         valid_store_credit_payments.to_a.sum(&:amount)
       else
-        [total, (user.try(:available_store_credit_total, currency: currency) || 0.0)].min
+        [total, user.try(:available_store_credit_total, currency: currency) || 0.0].min
       end
     end
 
@@ -788,10 +799,9 @@ module Spree
     end
 
     def ensure_promotions_eligible
-      adjustment_changed = all_adjustments.eligible.promotion.any? do |adjustment|
-        !adjustment.calculate_eligibility
-      end
-      if adjustment_changed
+      Spree::Config.promotion_adjuster_class.new(self).call
+
+      if promo_total_changed?
         restart_checkout_flow
         recalculate
         errors.add(:base, I18n.t('spree.promotion_total_changed_before_complete'))
@@ -860,6 +870,10 @@ module Spree
       use_billing.in?([true, 'true', '1'])
     end
 
+    def use_shipping?
+      use_shipping.in?([true, 'true', '1'])
+    end
+
     def set_currency
       self.currency = Spree::Config[:currency] if self[:currency].nil?
     end

data/app/models/spree/payment_method/bogus_credit_card.rb

@@ -29,39 +29,44 @@ module Spree
 
     def authorize(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
+      message_detail = " - #{__method__}"
       if VALID_CCS.include?(credit_card.number) || (profile_id && profile_id.starts_with?('BGS-'))
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'D' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'D' })
       else
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, { message: FAILURE_MESSAGE }, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, { message: FAILURE_MESSAGE + message_detail }, test: true)
       end
     end
 
     def purchase(_money, credit_card, _options = {})
       profile_id = credit_card.gateway_customer_profile_id
+      message_detail = " - #{__method__}"
       if VALID_CCS.include?(credit_card.number) || (profile_id && profile_id.starts_with?('BGS-'))
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'M' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'M' })
       else
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, message: FAILURE_MESSAGE, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, message: FAILURE_MESSAGE + message_detail, test: true)
       end
     end
 
     def credit(_money, _credit_card, _response_code, _options = {})
-      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+      message_detail = " - #{__method__}"
+      ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE)
     end
 
     def capture(_money, authorization, _gateway_options)
+      message_detail = " - #{__method__}"
       if authorization == '12345'
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true)
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true)
       else
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, error: FAILURE_MESSAGE, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, error: FAILURE_MESSAGE + message_detail, test: true)
       end
     end
 
     def void(_response_code, _credit_card, options = {})
+      message_detail = " - #{__method__}"
       if options[:originator].completed?
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE)
       else
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE)
       end
     end
 

data/app/models/spree/payment_method/simple_bogus_credit_card.rb

@@ -8,26 +8,32 @@ module Spree
     end
 
     def authorize(_money, credit_card, _options = {})
+      message_detail = " - #{__method__}"
+
       if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'A' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, { message: FAILURE_MESSAGE }, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, { message: FAILURE_MESSAGE }, test: true)
       end
     end
 
     def purchase(_money, credit_card, _options = {})
+      message_detail = " - #{__method__}"
+
       if VALID_CCS.include? credit_card.number
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'A' })
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE, avs_result: { code: 'A' })
       else
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, message: FAILURE_MESSAGE, test: true)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, message: FAILURE_MESSAGE, test: true)
       end
     end
 
     def void(_response_code, options = {})
+      message_detail = " - #{__method__}"
+
       if options[:originator].completed?
-        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+        ActiveMerchant::Billing::Response.new(false, FAILURE_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE)
       else
-        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE, {}, test: true, authorization: AUTHORIZATION_CODE)
+        ActiveMerchant::Billing::Response.new(true, SUCCESS_MESSAGE + message_detail, {}, test: true, authorization: AUTHORIZATION_CODE)
       end
     end
   end

data/app/models/spree/payment_method.rb

@@ -42,6 +42,8 @@ module Spree
 
     include Spree::Preferences::StaticallyConfigurable
 
+    self.allowed_ransackable_attributes = %w[name description]
+
     # Custom ModelName#human implementation to ensure we don't refer to
     # subclasses as just "PaymentMethod"
     class ModelName < ActiveModel::Name
@@ -68,7 +70,7 @@ module Spree
         raise UnsupportedPaymentMethod, "Found invalid payment type '#{type_name}'.\n"\
           "This may happen after switching payment service provider, when payment methods "\
           "reference old types that are not supported any more.\n"\
-          "If that is the case, consider running 'rake payment_method:deprecate_unsupported_payment_methods' "\
+          "If that is the case, consider running 'rake payment_method:deactivate_unsupported_payment_methods' "\
           "to fix the issue."
       end
     end

data/app/models/spree/preference.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Spree::Preference < Spree::Base
-  serialize :value
+  serialize :value, coder: YAML
 
   validates :key, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
 end

data/app/models/spree/promotion/rules/minimum_quantity.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Spree
+  class Promotion
+    module Rules
+      # Promotion rule for ensuring an order contains a minimum quantity of
+      # actionable items.
+      #
+      # This promotion rule is only compatible with the "all" match policy. It
+      # doesn't make a lot of sense to use it without that policy as it reduces
+      # it to a simple quantity check across the entire order which would be
+      # better served by an item total rule.
+      class MinimumQuantity < PromotionRule
+        validates :preferred_minimum_quantity, numericality: { only_integer: true, greater_than: 0 }
+
+        preference :minimum_quantity, :integer, default: 1
+
+        # What type of objects we should run our eligiblity checks against. In
+        # this case, our rule only applies to an entire order.
+        #
+        # @param promotable [Spree::Order,Spree::LineItem]
+        # @return [Boolean] true if promotable is a Spree::Order, false
+        #   otherwise
+        def applicable?(promotable)
+          promotable.is_a?(Spree::Order)
+        end
+
+        # Will look at all of the "actionable" line items in the order and
+        # determine if the sum of their quantity is greater than the minimum.
+        #
+        # "Actionable" items are ones where they pass the "actionable?" check of
+        # all rules on the promotion. (e.g.: Match product/taxon when one of
+        # those rules is present.)
+        #
+        # When false is returned, the reason will be included in the
+        # `eligibility_errors` object.
+        #
+        # @param order [Spree::Order] the order we want to check eligibility on
+        # @param _options [Hash] ignored
+        # @return [Boolean] true if promotion is eligible, false otherwise
+        def eligible?(order, _options = {})
+          actionable_line_items = order.line_items.select do |line_item|
+            promotion.rules.all? { _1.actionable?(line_item) }
+          end
+
+          if actionable_line_items.sum(&:quantity) < preferred_minimum_quantity
+            eligibility_errors.add(
+              :base,
+              eligibility_error_message(:quantity_less_than_minimum, count: preferred_minimum_quantity),
+              error_code: :quantity_less_than_minimum
+            )
+          end
+
+          eligibility_errors.empty?
+        end
+      end
+    end
+  end
+end

data/app/models/spree/promotion.rb

@@ -14,7 +14,7 @@ module Spree
     has_many :promotion_actions, autosave: true, dependent: :destroy, inverse_of: :promotion
     alias_method :actions, :promotion_actions
 
-    has_many :order_promotions, class_name: "Spree::OrderPromotion"
+    has_many :order_promotions, class_name: "Spree::OrderPromotion", inverse_of: :promotion, dependent: :destroy
     has_many :orders, through: :order_promotions
 
     has_many :codes, class_name: "Spree::PromotionCode", inverse_of: :promotion, dependent: :destroy

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

@@ -73,7 +73,7 @@ module Spree
 
         unless promotion.eligible?(order, promotion_code: promotion_code)
           set_promotion_eligibility_error_code(promotion)
-          return (error || ineligible_for_this_order)
+          return error || ineligible_for_this_order
         end
 
         # If any of the actions for the promotion return `true`,

data/app/models/spree/refund_reason.rb

@@ -2,12 +2,17 @@
 
 module Spree
   class RefundReason < Spree::Base
-    include Spree::NamedType
+    scope :active, -> { where(active: true) }
+    default_scope -> { order(arel_table[:name].lower) }
+
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     RETURN_PROCESSING_REASON = 'Return processing'
 
     has_many :refunds
 
+    self.allowed_ransackable_attributes = %w[name code]
+
     def self.return_processing_reason
       find_by!(name: RETURN_PROCESSING_REASON, mutable: false)
     end

data/app/models/spree/reimbursement_type.rb

@@ -2,12 +2,17 @@
 
 module Spree
   class ReimbursementType < Spree::Base
-    include Spree::NamedType
+    scope :active, -> { where(active: true) }
+    default_scope -> { order(arel_table[:name].lower) }
+
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     ORIGINAL = 'original'
 
     has_many :return_items
 
+    self.allowed_ransackable_attributes = %w[name]
+
     # This method will reimburse the return items based on however it child implements it
     # By default it takes a reimbursement, the return items it needs to reimburse, and if
     # it is a simulation or a real reimbursement. This should return an array

data/app/models/spree/return_item.rb

@@ -67,7 +67,7 @@ module Spree
     scope :exchange_processed, -> { where.not(exchange_inventory_unit: nil) }
     scope :exchange_required, -> { exchange_requested.where(exchange_inventory_unit: nil) }
 
-    serialize :acceptance_status_errors
+    serialize :acceptance_status_errors, coder: YAML
 
     delegate :eligible_for_return?, :requires_manual_intervention?, to: :validator
     delegate :variant, to: :inventory_unit

data/app/models/spree/return_reason.rb

@@ -2,10 +2,15 @@
 
 module Spree
   class ReturnReason < Spree::Base
-    include Spree::NamedType
+    scope :active, -> { where(active: true) }
+    default_scope -> { order(arel_table[:name].lower) }
+
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
     has_many :return_authorizations
 
+    self.allowed_ransackable_attributes = %w[name]
+
     def self.reasons_for_return_items(return_items)
       # Only allow an inactive reason if it's already associated to a return item
       active | return_items.map(&:return_reason).compact

data/app/models/spree/shipping_rate.rb

@@ -18,8 +18,7 @@ module Spree
     delegate :name, :tax_category, :tax_category_id, to: :shipping_method
     delegate :code, to: :shipping_method, prefix: true
     alias_attribute :amount, :cost
-
-    alias_method :total_before_tax, :amount
+    alias_attribute :total_before_tax, :cost
 
     extend DisplayMoney
     money_methods :amount

data/app/models/spree/stock/splitter/shipping_category.rb

@@ -24,7 +24,7 @@ module Spree
 
         def hash_to_packages(categories)
           packages = []
-          categories.each do |_id, contents|
+          categories.each_value do |contents|
             packages << build_package(contents)
           end
           packages

data/app/models/spree/stock_item.rb

@@ -21,6 +21,7 @@ module Spree
     after_touch { variant.touch }
 
     self.allowed_ransackable_attributes = ['count_on_hand', 'stock_location_id']
+    self.allowed_ransackable_associations = %w[variant]
 
     # @return [Array<Spree::InventoryUnit>] the backordered inventory units
     #   associated with this stock item

data/app/models/spree/store.rb

@@ -22,6 +22,8 @@ module Spree
     validates :url, presence: true
     validates :mail_from_address, presence: true
 
+    self.allowed_ransackable_attributes = %w[name url code]
+
     before_save :ensure_default_exists_and_is_unique
     before_destroy :validate_not_default
 

data/app/models/spree/store_credit_reason.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 class Spree::StoreCreditReason < Spree::Base
-  include Spree::NamedType
+  scope :active, -> { where(active: true) }
+  default_scope -> { order(arel_table[:name].lower) }
+
+  validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
 
   has_many :store_credit_events, inverse_of: :store_credit_reason
+
+  self.allowed_ransackable_attributes = %w[name]
 end

data/app/models/spree/tax_rate.rb

@@ -113,6 +113,10 @@ module Spree
       )
     end
 
+    def display_amount
+      amount_for_adjustment_label
+    end
+
     private
 
     def amount_for_adjustment_label

data/app/models/spree/variant.rb

@@ -73,7 +73,6 @@ module Spree
     validates_uniqueness_of :sku, allow_blank: true, case_sensitive: true, conditions: -> { where(deleted_at: nil) }, if: :enforce_unique_sku?
 
     after_create :create_stock_items
-    after_create :set_position
     after_create :set_master_out_of_stock, unless: :is_master?
 
     after_save :clear_in_stock_cache
@@ -406,10 +405,6 @@ module Spree
       Spree::Config.variant_vat_prices_generator_class.new(self).run
     end
 
-    def set_position
-      update_column(:position, product.variants.maximum(:position).to_i + 1)
-    end
-
     def in_stock_cache_key
       "variant-#{id}-in_stock"
     end

data/app/views/spree/order_mailer/inventory_cancellation_email.html.erb

@@ -19,7 +19,6 @@
           </tr>
         <% end %>
       </table>
-      <p>
     </td>
     <td class="expander"></td>
   </tr>

data/config/locales/en.yml

@@ -104,6 +104,7 @@ en:
         additional_tax_total: Tax
         approved_at: Approved at
         approver_id: Approver
+        bill_address: Billing Address
         canceled_at: Canceled at
         canceler_id: Canceler
         checkout_complete: Checkout Complete
@@ -117,6 +118,7 @@ en:
         item_total: Item Total
         number: Number
         payment_state: Payment State
+        ship_address: Shipping Address
         shipment_state: Shipment State
         shipment_total: Ship Total
         special_instructions: Special Instructions
@@ -217,6 +219,8 @@ en:
         description: Order total meets these criteria
       spree/promotion/rules/landing_page:
         description: Customer must have visited the specified page
+      spree/promotion/rules/minimum_quantity:
+        description: Order contains minimum quantity of applicable items
       spree/promotion/rules/nth_order:
         description: Apply a promotion to every nth order a user has completed.
         form_text: 'Apply this promotion on the users Nth order: '
@@ -652,6 +656,7 @@ en:
       spree/promotion/rules/first_repeat_purchase_since: First Repeat Purchase Since
       spree/promotion/rules/item_total: Item Total
       spree/promotion/rules/landing_page: Landing Page
+      spree/promotion/rules/minimum_quantity: Minimum Quantity
       spree/promotion/rules/nth_order: Nth Order
       spree/promotion/rules/one_use_per_user: One Use Per User
       spree/promotion/rules/option_value: Option Value(s)
@@ -1136,6 +1141,7 @@ en:
     choose_a_taxon_to_sort_products_for: Choose a taxon to sort products for
     choose_currency: Choose Currency
     choose_dashboard_locale: Choose Dashboard Locale
+    choose_dashboard_theme: Choose Dashboard Theme
     choose_location: Choose Location
     choose_promotion_action: Choose Action
     choose_promotion_rule: Choose Rule
@@ -1533,6 +1539,9 @@ en:
         no_user_or_email_specified: You need to login or provide your email before applying this coupon code.
         no_user_specified: You need to login before applying this coupon code.
         not_first_order: This coupon code can only be applied to your first order.
+        quantity_less_than_minimum:
+          one: You need to add a least 1 applicable item to your order.
+          other: You need to add a least %{count} applicable items to your order.
     email: Email
     empty: Empty
     empty_cart: Empty Cart
@@ -1791,8 +1800,8 @@ en:
     name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 4 characters of product name)
     navigation:
-      switch_to_legacy: Switch to legacy admin
-      switch_to_solidus_admin: Switch to new admin
+      switch_to_legacy: Show Legacy UI
+      switch_to_solidus_admin: Show Legacy UI
     negative_movement_absent_item: Cannot create negative movement for absent stock item.
     new: New
     new_adjustment: New Adjustment
@@ -2339,6 +2348,7 @@ en:
         subject: Test Mail
     test_mode: Test Mode
     thank_you_for_your_order: Thank you for your business. Please print out a copy of this confirmation page for your records.
+    theme_changed: Theme Changed
     there_are_no_items_for_this_order: There are no items for this order. Please add an item to the order to continue.
     there_were_problems_with_the_following_fields: There were problems with the following fields
     this_order_has_already_received_a_refund: This order has already received a refund

data/db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb

@@ -5,7 +5,7 @@ class DropDeprecatedAddressIdFromShipments < ActiveRecord::Migration[5.2]
   end
 
   def down
-    add_column :spree_shipments, :deprecated_address_id
+    add_column :spree_shipments, :deprecated_address_id, :integer
     add_index :spree_shipments, :deprecated_address_id, name: :index_spree_shipments_on_deprecated_address_id
   end
 end

data/db/migrate/20231027084517_add_order_promotions_foreign_key.rb

@@ -0,0 +1,10 @@
+class AddOrderPromotionsForeignKey < ActiveRecord::Migration[7.0]
+  def up
+    Spree::OrderPromotion.left_joins(:order).where(spree_orders: { id: nil }).delete_all
+    add_foreign_key :spree_orders_promotions, :spree_orders, column: :order_id, validate: false, on_delete: :cascade
+  end
+
+  def down
+    remove_foreign_key :spree_orders_promotions, :spree_orders
+  end
+end

data/db/migrate/20231031175215_add_promotion_order_promotion_foreign_key.rb

@@ -0,0 +1,10 @@
+class AddPromotionOrderPromotionForeignKey < ActiveRecord::Migration[7.0]
+  def up
+    Spree::OrderPromotion.left_joins(:promotion).where(spree_promotions: { id: nil }).delete_all
+    add_foreign_key :spree_orders_promotions, :spree_promotions, column: :promotion_id, on_delete: :cascade
+  end
+
+  def down
+    remove_foreign_key :spree_orders_promotions, :spree_orders
+  end
+end

data/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -1 +1 @@
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.2/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v4.3/template.rb'