solidus_core 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e2fc705b84728b7954a7eb0f2375bcce15feed81189d4ef02f8b7012057718d
-  data.tar.gz: 8617f568577f259486cb72ab6615475510350745d7f275c03dd0ebee85d434f2
+  metadata.gz: 3bf3e87cc1694926e3abe00013c3c2c92fb94ecfefb63405f22d92f92e91704a
+  data.tar.gz: f7b75754a75a0cae886af0b182e761defc86c8671c5e10b239bd73d8ce2ea7b3
 SHA512:
-  metadata.gz: 862c53da4d2bf1f82b575a857dad8018ba6d8748b29dce7d089a508a921f7b4c64d59a79766b9077933918aea7141c62888a0f48292300bae7bec2937ca1f3ad
-  data.tar.gz: 836f0cad8115199e78593bbc34f3521fbc64c1f8bd89128baf84412ebbbc8370c0272d9403842e35ed9154dfa3f72e398b7ce8538eec98adbfa5742ece72e11f
+  metadata.gz: 5668e0bc41a319c232392cbd42f688330563df655fef9c355d058d19e9f9396e4377313215eba1d009d267b3c60f60da024c17dc7edd9023f5f626412e8cfa2e
+  data.tar.gz: 1cb2086226a351291ad80e19179416432b1054bd7b4ba4316e62058d01dbdb2d2bc9315476bb46ceefce32c53e2e63d0694fc1079b8fbc6b74978e96465aa93c

data/README.md

@@ -40,7 +40,6 @@ source (e.g. `Spree::CreditCard`) using a specific payment method (e.g
 `Solidus::Gateway::Braintree`).
 * `Spree::PaymentMethod` - A base class which is used for implementing payment methods.
 * `Spree::PaymentMethod::CreditCard` - An implementation of a `Spree::PaymentMethod` for credit card payments.
-See https://github.com/solidusio/solidus_gateway/ for officially supported payment method implementations.
 * `Spree::CreditCard` - The `source` of a `Spree::Payment` using `Spree::PaymentMethod::CreditCard` as payment method.
 
 ## Inventory sub-system

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

@@ -5,6 +5,7 @@ module Spree::RansackableAttributes
   included do
     class_attribute :allowed_ransackable_associations, default: []
     class_attribute :allowed_ransackable_attributes, default: []
+    class_attribute :allowed_ransackable_scopes, default: []
 
     def self.whitelisted_ransackable_associations
       Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_associations, 'use allowed_ransackable_associations instead')
@@ -38,5 +39,9 @@ module Spree::RansackableAttributes
     def ransackable_attributes(*_args)
       default_ransackable_attributes | allowed_ransackable_attributes
     end
+
+    def ransackable_scopes(*_args)
+      allowed_ransackable_scopes
+    end
   end
 end

data/app/models/spree/fulfilment_changer.rb

@@ -17,18 +17,31 @@ module Spree
   # @attr [Integer] quantity How many units we want to move
   #
   class FulfilmentChanger
+    # @note This private constant is only used to deprecate not passing the `track_inventory` argument
+    #   on initialization. It will be removed in Solidus 4.0, please do not use it.
+    TRACK_INVENTORY_NOT_PROVIDED = Object.new.freeze
+    private_constant :TRACK_INVENTORY_NOT_PROVIDED
+
     include ActiveModel::Validations
 
     attr_accessor :current_shipment, :desired_shipment
-    attr_reader :variant, :quantity, :current_stock_location, :desired_stock_location
+    attr_reader :variant, :quantity, :current_stock_location, :desired_stock_location, :track_inventory
 
-    def initialize(current_shipment:, desired_shipment:, variant:, quantity:)
+    def initialize(current_shipment:, desired_shipment:, variant:, quantity:, track_inventory: TRACK_INVENTORY_NOT_PROVIDED)
       @current_shipment = current_shipment
       @desired_shipment = desired_shipment
       @current_stock_location = current_shipment.stock_location
       @desired_stock_location = desired_shipment.stock_location
       @variant = variant
       @quantity = quantity
+      @track_inventory = if track_inventory == TRACK_INVENTORY_NOT_PROVIDED
+        Spree::Deprecation.warn(
+          "Not passing `track_inventory` to `Spree::FulfilmentChanger` is deprecated." \
+        )
+        true
+      else
+        track_inventory
+      end
     end
 
     validates :quantity, numericality: { greater_than: 0 }
@@ -45,6 +58,45 @@ module Spree
       return false if invalid?
       desired_shipment.save! if desired_shipment.new_record?
 
+      if track_inventory
+        run_tracking_inventory
+      else
+        run_without_tracking_inventory
+      end
+
+      # We modified the inventory units at the database level for speed reasons.
+      # The downside of that is that we need to reload the associations.
+      current_shipment.inventory_units.reload
+      desired_shipment.inventory_units.reload
+
+      # If the current shipment now has no inventory units left, we won't need it any longer.
+      if current_shipment.inventory_units.length.zero?
+        current_shipment.destroy!
+      else
+        # The current shipment has changed, so we need to make sure that shipping rates
+        # have the correct amount.
+        current_shipment.refresh_rates
+      end
+
+      # The desired shipment has also change, so we need to make sure shipping rates
+      # are up-to-date, too.
+      desired_shipment.refresh_rates
+
+      # In order to reflect the changes in the order totals
+      desired_shipment.order.reload
+      desired_shipment.order.recalculate
+
+      true
+    end
+
+    private
+
+    # When moving things from one stock location to another, we need to restock items
+    # from the current location and unstock them at the desired location.
+    # Also, when we want to track inventory changes, we need to make sure that we have
+    # enough stock at the desired location to fulfil the order. Based on how many items
+    # we can take from the desired location, we could end up with some items being backordered.
+    def run_tracking_inventory
       # Retrieve how many on hand items we can take from desired stock location
       available_quantity = [desired_shipment.stock_location.count_on_hand(variant), default_on_hand_quantity].max
 
@@ -79,34 +131,21 @@ module Spree
           limit(quantity - new_on_hand_quantity).
           update_all(shipment_id: desired_shipment.id, state: :backordered)
       end
+    end
 
-      # We modified the inventory units at the database level for speed reasons.
-      # The downside of that is that we need to reload the associations.
-      current_shipment.inventory_units.reload
-      desired_shipment.inventory_units.reload
-
-      # If the current shipment now has no inventory units left, we won't need it any longer.
-      if current_shipment.inventory_units.length.zero?
-        current_shipment.destroy!
-      else
-        # The current shipment has changed, so we need to make sure that shipping rates
-        # have the correct amount.
-        current_shipment.refresh_rates
+    # When we don't track inventory, we can just move the inventory units from one shipment
+    # to the other.
+    def run_without_tracking_inventory
+      ActiveRecord::Base.transaction do
+        current_shipment.
+          inventory_units.
+          where(variant: variant).
+          order(state: :asc).
+          limit(quantity).
+          update_all(shipment_id: desired_shipment.id)
       end
-
-      # The desired shipment has also change, so we need to make sure shipping rates
-      # are up-to-date, too.
-      desired_shipment.refresh_rates
-
-      # In order to reflect the changes in the order totals
-      desired_shipment.order.reload
-      desired_shipment.order.recalculate
-
-      true
     end
 
-    private
-
     # We don't need to handle stock counts for incomplete orders. Also, if
     # the new shipment and the desired shipment will ship from the same stock location,
     # unstocking and restocking will not be necessary.

data/app/models/spree/log_entry.rb

@@ -15,15 +15,17 @@ module Spree
       ActiveSupport::TimeZone
     ].freeze
 
-    # Raised when a disallowed class is tried to be loaded
-    class DisallowedClass < RuntimeError
+    class SerializationError < RuntimeError
       attr_reader :psych_exception
 
       def initialize(psych_exception:)
         @psych_exception = psych_exception
         super(default_message)
       end
+    end
 
+    # Raised when a disallowed class is tried to be loaded
+    class DisallowedClass < SerializationError
       private
 
       def default_message
@@ -40,14 +42,7 @@ module Spree
     end
 
     # Raised when YAML contains aliases and they're not enabled
-    class BadAlias < RuntimeError
-      attr_reader :psych_exception
-
-      def initialize(psych_exception:)
-        @psych_exception = psych_exception
-        super(default_message)
-      end
-
+    class BadAlias < SerializationError
       private
 
       def default_message
@@ -70,11 +65,40 @@ module Spree
     belongs_to :source, polymorphic: true, optional: true
 
     def parsed_details
-      @details ||= YAML.safe_load(
-        details,
-        permitted_classes: self.class.permitted_classes,
-        aliases: Spree::Config.log_entry_allow_aliases
+      handle_psych_serialization_errors do
+        @details ||= YAML.safe_load(
+          details,
+          permitted_classes: self.class.permitted_classes,
+          aliases: Spree::Config.log_entry_allow_aliases,
+        )
+      end
+    end
+
+    def parsed_details=(value)
+      handle_psych_serialization_errors do
+        self.details = YAML.safe_dump(
+          value,
+          permitted_classes: self.class.permitted_classes,
+          aliases: Spree::Config.log_entry_allow_aliases,
+        )
+      end
+    end
+
+    def parsed_payment_response_details_with_fallback=(response)
+      self.parsed_details = response
+    rescue SerializationError, YAML::Exception => e
+      # Fall back on wrapping the response and signaling the error to the end user.
+      self.parsed_details = ActiveMerchant::Billing::Response.new(
+        response.success?,
+        "[WARNING: An error occurred while trying to serialize the payment response] #{response.message}",
+        { 'data' => response.inspect, 'error' => e.message.to_s },
       )
+    end
+
+    private
+
+    def handle_psych_serialization_errors
+      yield
     rescue Psych::DisallowedClass => e
       raise DisallowedClass.new(psych_exception: e)
     rescue Psych::BadAlias => e

data/app/models/spree/order.rb

@@ -534,7 +534,7 @@ module Spree
         state: 'cart',
         updated_at: Time.current
       )
-      self.next if line_items.any?
+      self.next
     end
 
     def refresh_shipment_rates
@@ -572,7 +572,7 @@ module Spree
 
     def has_non_reimbursement_related_refunds?
       refunds.non_reimbursement.exists? ||
-        payments.offset_payment.exists? # how old versions of spree stored refunds
+        payments.where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'").exists? # how old versions of spree stored refunds
     end
 
     def tax_total

data/app/models/spree/order_inventory.rb

@@ -57,7 +57,7 @@ module Spree
     # first unshipped that's leaving from a stock_location that stocks this variant, with availability check
     # first unshipped that's leaving from a stock_location that stocks this variant, without availability check
     def determine_target_shipment(quantity)
-      potential_shipments = order.shipments.select(&:ready_or_pending?)
+      potential_shipments = order.shipments.order(:created_at, :id).select(&:ready_or_pending?)
 
       potential_shipments.detect do |shipment|
         shipment.include?(variant)

data/app/models/spree/order_update_attributes.rb

@@ -15,7 +15,7 @@ module Spree
 
     # Assign the attributes to the order and save the order
     # @return true if saved, otherwise false and errors will be set on the order
-    def apply
+    def call
       order.validate_payments_attributes(@payments_attributes)
 
       assign_order_attributes
@@ -24,6 +24,8 @@ module Spree
       order.save
     end
 
+    alias_method :apply, :call
+
     private
 
     attr_reader :attributes, :payments_attributes, :order

data/app/models/spree/payment/processing.rb

@@ -206,7 +206,7 @@ module Spree
       end
 
       def record_response(response)
-        log_entries.create!(details: response.to_yaml)
+        log_entries.create!(parsed_payment_response_details_with_fallback: response)
       end
 
       def protect_from_connection_error

data/app/models/spree/payment.rb

@@ -46,7 +46,18 @@ module Spree
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
     scope :with_state, ->(state) { where(state: state.to_s) }
     # "offset" is reserved by activerecord
-    scope :offset_payment, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") }
+    # TODO: When removing the method we can also:
+    #   - Remove the `.offsets` association
+    #   - Remove the `#offsets_total` method
+    #   - Remove offsets count from the `#credit_allowed` method
+    #   - Remove offsets check from `Spree::Order#has_non_reimbursement_related_refunds?
+    def self.offset_payment
+      Spree::Deprecation.warn <<~MSG
+        `Spree::Payment offsets` are deprecated. Use the refund system (`Spree::Refund`) instead.
+      MSG
+
+      where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'")
+    end
 
     scope :checkout, -> { with_state('checkout') }
     scope :completed, -> { with_state('completed') }
@@ -54,7 +65,7 @@ module Spree
     scope :processing, -> { with_state('processing') }
     scope :failed, -> { with_state('failed') }
 
-    scope :risky, -> { where("avs_response IN (?) OR (cvv_response_code IS NOT NULL and cvv_response_code != 'M') OR state = 'failed'", RISKY_AVS_CODES) }
+    scope :risky, -> { failed.or(where(avs_response: RISKY_AVS_CODES)).or(where.not(cvv_response_code: [nil, '', 'M'])) }
     scope :valid, -> { where.not(state: %w(failed invalid void)) }
 
     scope :store_credits, -> { where(source_type: Spree::StoreCredit.to_s) }
@@ -101,7 +112,10 @@ module Spree
     # @return [BigDecimal] the amount of this payment minus the offsets
     #   (old-style refunds) and refunds
     def credit_allowed
-      amount - (offsets_total.abs + refunds.sum(:amount))
+      amount - (
+        (self.class.where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed' AND source_id = ?", id).sum(:amount)).abs +
+        refunds.sum(:amount)
+      )
     end
 
     # @return [Boolean] true when this payment can be credited
@@ -127,6 +141,11 @@ module Spree
       res || payment_method
     end
 
+    # @return [Boolean] true when this payment is risky
+    def risky?
+      is_avs_risky? || is_cvv_risky? || state == 'failed'
+    end
+
     # @return [Boolean] true when this payment is risky based on address
     def is_avs_risky?
       return false if avs_response.blank? || NON_RISKY_AVS_CODES.include?(avs_response)
@@ -137,7 +156,6 @@ module Spree
     def is_cvv_risky?
       return false if cvv_response_code == "M"
       return false if cvv_response_code.nil?
-      return false if cvv_response_message.present?
       true
     end
 

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

@@ -4,10 +4,6 @@ module Spree
   # An implementation of a `Spree::PaymentMethod` for credit card payments.
   #
   # It's a good candidate as base class for other credit card based payment methods.
-  #
-  # See https://github.com/solidusio/solidus_gateway/ for
-  # officially supported payment method implementations.
-  #
   class PaymentMethod::CreditCard < PaymentMethod
     def payment_source_class
       Spree::CreditCard

data/app/models/spree/product/scopes.rb

@@ -158,7 +158,7 @@ module Spree
           # order: 'COALESCE(cnt, 0) DESC'
           add_search_scope :descend_by_popularity do
             joins(:master).
-              order(%{
+              order(Arel.sql(%{
            COALESCE((
              SELECT
                COUNT(#{Spree::LineItem.quoted_table_name}.id)
@@ -171,7 +171,7 @@ module Spree
              WHERE
                popular_variants.product_id = #{Spree::Product.quoted_table_name}.id
            ), 0) DESC
-        })
+        }))
           end
 
           add_search_scope :not_deleted do

data/app/models/spree/product.rb

@@ -83,7 +83,6 @@ module Spree
       :height,
       :price,
       :sku,
-      :track_inventory,
       :weight,
       :width,
     ]
@@ -134,10 +133,7 @@ module Spree
 
     self.allowed_ransackable_associations = %w[stores variants_including_master master variants]
     self.allowed_ransackable_attributes = %w[name slug]
-
-    def self.ransackable_scopes(_auth_object = nil)
-      %i(available with_discarded with_variant_sku_cont with_all_variant_sku_cont with_kept_variant_sku_cont)
-    end
+    self.allowed_ransackable_scopes = %i[available with_discarded with_variant_sku_cont with_all_variant_sku_cont with_kept_variant_sku_cont]
 
     # @return [Boolean] true if there are any variants
     def has_variants?

data/app/models/spree/promotion.rb

@@ -2,7 +2,8 @@
 
 module Spree
   class Promotion < Spree::Base
-    MATCH_POLICIES = %w(all any)
+
+    autoload(:MATCH_POLICIES, "spree/promotion/match_policies")
 
     UNACTIVATABLE_ORDER_STATES = ["complete", "awaiting_return", "returned"]
 
@@ -54,9 +55,7 @@ module Spree
 
     self.allowed_ransackable_associations = ['codes']
     self.allowed_ransackable_attributes = %w[name path promotion_category_id]
-    def self.ransackable_scopes(*)
-      %i(active)
-    end
+    self.allowed_ransackable_scopes = %i[active]
 
     def self.order_activatable?(order)
       order && !UNACTIVATABLE_ORDER_STATES.include?(order.state)

data/app/models/spree/refund.rb

@@ -53,7 +53,7 @@ module Spree
       credit_cents = money.cents
 
       @perform_response = process!(credit_cents)
-      log_entries.build(details: perform_response.to_yaml)
+      log_entries.build(parsed_payment_response_details_with_fallback: perform_response)
 
       self.transaction_id = perform_response.authorization
       save!

data/app/models/spree/shipment.rb

@@ -286,7 +286,7 @@ module Spree
 
     # Updates the state of the Shipment bypassing any callbacks.
     #
-    # If this moves the shipmnent to the 'shipped' state, after_ship will be
+    # If this moves the shipment to the 'shipped' state, after_ship will be
     # called.
     def update_state
       old_state = state

data/app/models/spree/taxon.rb

@@ -18,9 +18,11 @@ module Spree
     after_update :update_child_permalinks, if: :saved_change_to_permalink?
 
     validates :name, presence: true
+    validates :name, uniqueness: { scope: :parent_id, message: :must_be_unique_under_same_parent }, if: -> { Spree::Config.extra_taxon_validations}
     validates :meta_keywords, length: { maximum: 255 }
     validates :meta_description, length: { maximum: 255 }
     validates :meta_title, length: { maximum: 255 }
+    validates :taxonomy_id, uniqueness: { message: :can_have_only_one_root }, if: -> { Spree::Config.extra_taxon_validations && root? }
 
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy

data/app/models/spree/taxonomy.rb

@@ -5,6 +5,7 @@ module Spree
     acts_as_list
 
     validates :name, presence: true
+    validates :name, uniqueness: true, if: -> { Spree::Config.extra_taxonomy_validations }
 
     has_many :taxons, inverse_of: :taxonomy
     has_one :root, -> { where parent_id: nil }, class_name: "Spree::Taxon", dependent: :destroy

data/app/models/spree/wallet/add_payment_sources_to_wallet.rb

@@ -24,19 +24,19 @@ class Spree::Wallet::AddPaymentSourcesToWallet
       # add valid sources to wallet and optionally set a default
       if sources.any?
         # arbitrarily sort by id for picking a default
-        sources.sort_by(&:id).each do |source|
+        order_wallet_payment_sources = sources.sort_by(&:id).map do |source|
           order.user.wallet.add(source)
         end
 
-        make_default
+        make_default(order_wallet_payment_sources)
       end
     end
   end
 
   protected
 
-  def make_default
-    order.user.wallet.default_wallet_payment_source = order.user.wallet_payment_sources.last
+  def make_default(sources)
+    order.user.wallet.default_wallet_payment_source = sources.last
   end
 
   private

data/app/views/layouts/spree/base_mailer.html.erb

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta name="viewport" content="width=device-width">
 	<style>
 /**********************************************
 * Ink v1.0.5 - Copyright 2013 ZURB Inc        *

data/config/locales/en.yml

@@ -498,6 +498,12 @@ en:
           attributes:
             base:
               cannot_destroy_default_store: Cannot destroy the default Store.
+        spree/taxon:
+          attributes:
+            name:
+              must_be_unique_under_same_parent: must be unique under the same parent Taxon
+            taxonomy_id:
+              can_have_only_one_root: can only have one root Taxon
         spree/user_address:
           attributes:
             user_id:
@@ -1105,7 +1111,7 @@ en:
     cannot_rebuild_shipments_order_completed: Cannot rebuild shipments for a completed order.
     cannot_rebuild_shipments_shipments_not_pending: Cannot rebuild shipments for an order with non-pending shipments.
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
-    cannot_update_email: You do not have access to update this user's email address. <br />Please contact a superuser if you need to perform this action.
+    cannot_update_email: You do not have access to update this user's email address. <br>Please contact a superuser if you need to perform this action.
     capture: Capture
     capture_events: Capture events
     card_code: Card Code
@@ -1467,7 +1473,7 @@ en:
     date_picker:
       first_day: 0
       format: "%Y/%m/%d"
-      js_format: yy/mm/dd
+      js_format: Y/m/d
     date_range: Date Range
     default: Default
     default_refund_amount: Default Refund Amount
@@ -1612,43 +1618,44 @@ en:
         shipping_methods: This is used to calculate the shipping rates on a per order or per package rate.
         tax_rates: The "Default Tax" calculator is used for both sales tax (United States-style taxes) and value-added tax (VAT). Typically this calculator should be the only tax calculator required by your store. "Flat Fee" can be used for any taxes that require a flat fee be charged to the customer.
       spree/price:
-        country: 'This determines in what country the price is valid.<br/>Default: Any Country'
+        country: 'This determines in what country the price is valid.<br>Default: Any Country'
         master_variant: Changing master variant prices will not change variant prices below, but will be used to populate all new variants
         options: These options are used to create variants in the variants table. They can be changed in the variants tab
       spree/product:
         available_on: This sets the availability date for the product. If this value is not set, or it is set to a date in the future, then the product is not available on the storefront.
         discontinue_on: This sets the discontinue date for the product. If this value is set to a date, then the product is not available on the storefront from that day on anymore.
-        promotionable: 'This determines whether or not promotions can apply to this product.<br/>Default: Checked'
-        shipping_category: 'This determines what kind of shipping this product requires.<br/> Default: Default'
-        tax_category: 'This determines what kind of taxation is applied to this product.<br/> Default: %{default_tax_category}'
+        promotionable: 'This determines whether or not promotions can apply to this product.<br>Default: Checked'
+        shipping_category: 'This determines what kind of shipping this product requires.<br> Default: Default'
+        tax_category: 'This determines what kind of taxation is applied to this product.<br> Default: %{default_tax_category}'
       spree/promotion:
-        expires_at: This determines when the promotion expires. <br/> If no value is specified, the promotion will never expire.
+        expires_at: This determines when the promotion expires. <br> If no value is specified, the promotion will never expire.
         promo_code_will_be_disabled: Selecting this option, promo codes will be disabled for this promotion because all its rules / actions will be applied automatically to all orders.
-        starts_at: This determines when the promotion can be applied to orders. <br/> If no value is specified, the promotion will be immediately available.
+        starts_at: This determines when the promotion can be applied to orders. <br> If no value is specified, the promotion will be immediately available.
       spree/shipping_method:
         available_to_all: Uncheck to select specific stock locations this shipping method will be available in.
       spree/stock_location:
-        active: 'This determines whether stock from this location can be used when building packages.<br/> Default: Checked'
-        backorderable_default: 'When checked, stock items in this location will default to allowing backorders.<br/> Default: Unchecked'
-        check_stock_on_transfer: 'When checked, inventory levels will be checked when performing stock transfers.<br/> Default: Checked'
-        fulfillable: 'When unchecked, this indicates that items in this location don''t require actual fulfilment. Stock will not be checked when shipping and emails will not be sent.<br/> Default: Checked'
-        propagate_all_variants: 'When checked, this will create a stock item for each variant in this stock location.<br/> Default: Checked'
-        restock_inventory: 'When checked, returned inventory can be added back to this location''s stock levels.<br/> Default: checked'
+        active: 'This determines whether stock from this location can be used when building packages.<br> Default: Checked'
+        backorderable_default: 'When checked, stock items in this location will default to allowing backorders.<br> Default: Unchecked'
+        check_stock_on_transfer: 'When checked, inventory levels will be checked when performing stock transfers.<br> Default: Checked'
+        fulfillable: 'When unchecked, this indicates that items in this location don''t require actual fulfilment. Stock will not be checked when shipping and emails will not be sent.<br> Default: Checked'
+        propagate_all_variants: 'When checked, this will create a stock item for each variant in this stock location.<br> Default: Checked'
+        restock_inventory: 'When checked, returned inventory can be added back to this location''s stock levels.<br> Default: checked'
       spree/store:
         available_locales: This determines which locales are available for your customers to choose from in the storefront.
-        cart_tax_country_iso: 'This determines which country is used for taxes on carts (orders which don''t yet have an address).<br/> Default: None.'
+        cart_tax_country_iso: 'This determines which country is used for taxes on carts (orders which don''t yet have an address).<br> Default: None.'
         code: An identifier for your store. Developers may need this value if you operate multiple storefronts.
+        default_currency: This determines which currency will be used for the storefront's product prices. Please, be aware that changing this configuration, only products that have prices in the selected currency will be listed on your storefront. <br><br>This setting won't change the default currency used when you create a product. For that, only the global `Spree::Config.currency` is taken into account.
       spree/tax_category:
         is_default: When checked, this tax category will be selected by default when creating new products or variants.
       spree/tax_rate:
         tax_rate_level: Item-level taxes will be applied as adjustments on line items and shipments. Order-level taxes will create an adjustment on the order. Care should be taken when chosing order-level adjustments as they aren't considered in refunds or in discounts. The default is item-level.
-        validity_period: This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br /> If no start date value is specified, the tax rate will be immediately available. <br /> If no expiration date value is specified, the tax rate will never expire
+        validity_period: This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br> If no start date value is specified, the tax rate will be immediately available. <br> If no expiration date value is specified, the tax rate will never expire
       spree/variant:
         deleted: Deleted Variant
         deleted_explanation: This variant was deleted on %{date}.
         deleted_explanation_with_replacement: This variant was deleted on %{date}. It has since been replaced by another with the same SKU.
-        shipping_category: 'This determines what kind of shipping this variant requires.<br/> Default: Use shipping category of the product associated with this variant'
-        tax_category: 'This determines what kind of taxation is applied to this variant.<br/> Default: Use tax category of the product associated with this variant'
+        shipping_category: 'This determines what kind of shipping this variant requires.<br> Default: Use shipping category of the product associated with this variant'
+        tax_category: 'This determines what kind of taxation is applied to this variant.<br> Default: Use tax category of the product associated with this variant'
     home: Home
     i18n:
       available_locales: Available Locales

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

@@ -1,3 +1,3 @@
 apply "#{__dir__}/break_down_solidus_gem.rb"
 run_bundle
-apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v3.3/template.rb'
+apply 'https://github.com/solidusio/solidus_starter_frontend/raw/v3.4/template.rb'

data/lib/generators/solidus/install/app_templates/payment_method/bolt.rb

@@ -10,4 +10,4 @@ unless Bundler.locked_gems.dependencies['solidus_bolt']
   bundle_command 'add solidus_bolt'
 end
 
-generate 'solidus_bolt:install'
+generate "solidus_bolt:install --auto-run-migrations=#{options[:migrate]}"

data/lib/generators/solidus/install/app_templates/payment_method/braintree.rb

@@ -0,0 +1,5 @@
+unless Bundler.locked_gems.dependencies['solidus_braintree']
+  bundle_command 'add solidus_braintree --version "~> 3.0"'
+end
+
+generate "solidus_braintree:install --migrate=#{options[:migrate]}"

data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb

@@ -2,9 +2,16 @@ unless Bundler.locked_gems.dependencies['solidus_frontend']
   say_status :warning, "Support for frontends other than `solidus_frontend` by `solidus_paypal_commerce_platform` is still in progress.", :yellow
 end
 
+if @selected_frontend == 'classic'
+  version = '< 1'
+  migrations_flag = options[:migrate] ? '--auto-run-migrations' : '--skip-migrations'
+else
+  version = '~> 1.0'
+  migrations_flag = "--migrate=#{options[:migrate]}"
+end
+
 unless Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
-  version = @selected_frontend == 'classic' ? '< 1' : '~> 1.0'
   bundle_command "add solidus_paypal_commerce_platform --version='#{version}'"
 end
 
-generate 'solidus_paypal_commerce_platform:install'
+generate "solidus_paypal_commerce_platform:install #{migrations_flag}"

data/lib/generators/solidus/install/install_generator.rb

@@ -29,10 +29,31 @@ module Solidus
       none
     ]
 
-    PAYMENT_METHODS = %w[
-      paypal
-      bolt
-      none
+    PAYMENT_METHODS = [
+      {
+        name: 'paypal',
+        frontends: %w[none classic starter],
+        description: 'Install `solidus_paypal_commerce_platform`',
+        default: true,
+      },
+      {
+        name: 'bolt',
+        frontends: %w[classic],
+        description: 'Install `solidus_bolt`',
+        default: false,
+      },
+      {
+        name: 'braintree',
+        frontends: %w[none starter],
+        description: 'Install `solidus_braintree`',
+        default: false,
+      },
+      {
+        name: 'none',
+        frontends: %w[none classic starter],
+        description: 'Skip installing a payment method',
+        default: false,
+      },
     ]
 
     class_option :migrate, type: :boolean, default: true, banner: 'Run Solidus migrations'
@@ -48,7 +69,7 @@ module Solidus
 
     class_option :frontend, type: :string, enum: FRONTENDS + LEGACY_FRONTENDS, default: nil, desc: "Indicates which frontend to install."
     class_option :authentication, type: :string, enum: AUTHENTICATIONS, default: nil, desc: "Indicates which authentication system to install."
-    class_option :payment_method, type: :string, enum: PAYMENT_METHODS, default: nil, desc: "Indicates which payment method to install."
+    class_option :payment_method, type: :string, enum: PAYMENT_METHODS.map { |payment_method| payment_method[:name] }, default: nil, desc: "Indicates which payment method to install."
 
     # DEPRECATED
     class_option :with_authentication, type: :boolean, hide: true, default: nil
@@ -98,7 +119,7 @@ module Solidus
         rake 'active_storage:install'
       else
         say_status :assets, "Paperclip", :green
-        gsub_file 'config/initializers/spree.rb', "::ActiveStorageAttachment", "::PaperclipAttachment"
+        gsub_file 'config/initializers/spree.rb', "ActiveStorageAttachment", "PaperclipAttachment"
       end
     end
 
@@ -201,12 +222,6 @@ module Solidus
 
     private
 
-    def generate(what, *args, abort_on_failure: true)
-      args << '--auto-accept' if options[:auto_accept]
-      args << '--auto-run-migrations' if options[:migrate]
-      super(what, *args, abort_on_failure: abort_on_failure)
-    end
-
     def bundle_command(command, env = {})
       # Make `bundle install` less verbose by skipping the "Using ..." messages
       super(command, env.reverse_merge('BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES' => 'true'))
@@ -323,29 +338,26 @@ module Solidus
       return 'paypal' if Bundler.locked_gems.dependencies['solidus_paypal_commerce_platform']
       return 'bolt' if Bundler.locked_gems.dependencies['solidus_bolt']
 
-      descriptions = {
-        paypal: "- [#{set_color 'paypal', :bold}] Install `solidus_paypal_commerce_platform` (#{set_color :default, :bold}).",
-        bolt: "- [#{set_color 'bolt', :bold}] Install `solidus_bolt`.",
-        none: "- [#{set_color 'none', :bold}] Skip installing a payment method.",
-      }
-
-      payment_methods = PAYMENT_METHODS
-
-      if @selected_frontend != 'classic'
-        payment_methods -= ['bolt']
-        descriptions.delete(:bolt)
+      selected_frontend_payment_methods = PAYMENT_METHODS.select do |payment_method|
+        payment_method[:frontends].include?(@selected_frontend)
       end
 
       selected = options[:payment_method] || (options[:auto_accept] && 'paypal') ||
         ask_with_description(
           default: 'paypal',
-          limited_to: payment_methods,
+          limited_to: selected_frontend_payment_methods.map { |payment_method| payment_method[:name] },
           desc: <<~TEXT
             Which payment method would you like to use?
 
-            #{descriptions.values.join("\n")}
+            #{selected_frontend_payment_methods.map { |payment_method| formatted_payment_method_description(payment_method) }.join("\n")}
           TEXT
         )
     end
+
+    def formatted_payment_method_description(payment_method)
+      default_label = " (#{set_color :default, :bold})" if payment_method[:default]
+
+      "- [#{set_color payment_method[:name], :bold}] #{payment_method[:description]}#{default_label}."
+    end
   end
 end

data/lib/spree/app_configuration.rb

@@ -65,6 +65,22 @@ module Spree
     #   @return [Boolean] When false, admins cannot create promotions with an "any" match policy (default: +false+)
     #                     Create individual, separate promotions for each of your rules instead.
     preference :allow_promotions_any_match_policy, :boolean, default: false
+    def allow_promotions_any_match_policy=(value)
+      if value == true
+        Spree::Deprecation.warn <<~MSG
+          Solidus 4.0 will remove support for combining promotion rules with the "any" match policy.
+
+          Instead, it's suggested to create individual, separate promotions for each of your current
+          rules combined with the "any" policy. To automate this task, you can use the provided
+          task:
+
+                  bin/rake solidus:split_promotions_with_any_match_policy
+        MSG
+      end
+
+      preferences[:allow_promotions_any_match_policy] = value
+    end
+
 
     # @!attribute [rw] guest_token_cookie_options
     #   @return [Hash] Add additional guest_token cookie options here (ie. domain or path)
@@ -155,6 +171,38 @@ module Spree
     #   @return [Regexp] Regex to be used in email validations, for example in Spree::EmailValidator
     preference :default_email_regexp, :regexp, default: URI::MailTo::EMAIL_REGEXP
 
+    # @!attribute [rw] extra_taxon_validations
+    #   Use extra validations on Taxons in 3.4.0, but default to false so stores can
+    #   upgrade and then fix any now invalid Taxons before enabling.
+    #   @return [Boolean]
+    versioned_preference :extra_taxon_validations, :boolean, initial_value: false, boundaries: { "3.4.0.dev" => true }
+    def extra_taxon_validations=(value)
+      Spree::Deprecation.warn <<~MSG
+        Solidus will remove `Spree::Config.extra_taxon_validations` preference
+        in the next major release and will always use the extra Taxon validations.
+        Before upgrading to the next major, please fix any now invalid Taxons
+        and then remove the preference definition in `config/initializers/spree.rb`.
+      MSG
+
+      preferences[:extra_taxon_validations] = value
+    end
+
+    # @!attribute [rw] extra_taxonomy_validations
+    #   Use extra validations on Taxonomies in 3.4.0, but default to false so stores can
+    #   upgrade and then fix any now invalid Taxonomies before enabling.
+    #   @return [Boolean]
+    versioned_preference :extra_taxonomy_validations, :boolean, initial_value: false, boundaries: { "3.4.0.dev" => true }
+    def extra_taxonomy_validations=(value)
+      Spree::Deprecation.warn <<~MSG
+        Solidus will remove `Spree::Config.extra_taxonomy_validations` preference
+        in the next major release and will always use the extra Taxonomy validations.
+        Before upgrading to the next major, please fix any now invalid Taxons
+        and then remove the preference definition in `config/initializers/spree.rb`.
+      MSG
+
+      preferences[:extra_taxonomy_validations] = value
+    end
+
     # @!attribute [rw] generate_api_key_for_all_roles
     #   @return [Boolean] Allow generating api key automatically for user
     #   at role_user creation for all roles. (default: +false+)
@@ -378,6 +426,13 @@ module Spree
     #   signature as Spree::OrderMailer.confirm_email.
     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'
+
     # Allows providing your own Mailer for promotion code batch mailer.
     #
     # @!attribute [rw] promotion_code_batch_mailer_class

data/lib/spree/core/controller_helpers/payment_parameters.rb

@@ -120,9 +120,7 @@ module Spree
 
     # This is a strange thing to do since an order can have multiple payments
     # but we always assume that it only has a single payment and that its
-    # amount should be the current order total.  Also, this is pretty much
-    # overridden when the order transitions to confirm by the logic inside of
-    # Order#add_store_credit_payments.
+    # amount should be the current order total after store credit is applied.
     # We should reconsider this method and its usage at some point.
     #
     # This method expects a params hash in the format of:
@@ -147,7 +145,7 @@ module Spree
     #      payments_attributes: [
     #        {
     #          ...params...
-    #          amount: <the order total>,
+    #          amount: <the order total after store credit>,
     #        },
     #      ],
     #      ...other params...
@@ -159,7 +157,7 @@ module Spree
       return params if params[:order].blank?
       return params if params[:order][:payments_attributes].blank?
 
-      params[:order][:payments_attributes].first[:amount] = order.total
+      params[:order][:payments_attributes].first[:amount] = order.order_total_after_store_credit
 
       params
     end

data/lib/spree/core/version.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "3.3.4"
+  VERSION = "3.4.0"
 
   def self.solidus_version
     VERSION
   end
 
   def self.previous_solidus_minor_version
-    '3.2'
+    '3.3'
   end
 
   def self.solidus_gem_version

data/lib/spree/migration_helpers.rb

@@ -6,9 +6,9 @@ module Spree
       remove_index(table, column) if index_exists?(table, column)
     end
 
-    def safe_add_index(table, column, **options)
-      if columns_exist?(table, column) && !index_exists?(table, column, **options)
-        add_index(table, column, **options)
+    def safe_add_index(table, column, options = {})
+      if columns_exist?(table, column) && !index_exists?(table, column, options)
+        add_index(table, column, options)
       end
     end
 

data/lib/spree/promotion/match_policies.rb

@@ -0,0 +1,2 @@
+Spree::Promotion::MATCH_POLICIES = %w(all any)
+Spree::Deprecation.warn('Spree::Promotion::MATCH_POLICIES is deprecated')

data/lib/spree/testing_support/factories/taxon_factory.rb

@@ -10,11 +10,13 @@ end
 FactoryBot.define do
   factory :taxon, class: 'Spree::Taxon' do
     name { 'Ruby on Rails' }
-    taxonomy
-    parent_id { nil }
+    taxonomy_id { (parent&.taxonomy || create(:taxonomy)).id }
+    parent_id { parent&.id || taxonomy.root.id }
 
     trait :with_icon do
-      icon { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }
+      after(:create) do |taxon|
+        taxon.update(icon: Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open)
+      end
     end
   end
 end

data/lib/spree/testing_support/factories/taxonomy_factory.rb

@@ -7,6 +7,8 @@ end
 
 FactoryBot.define do
   factory :taxonomy, class: 'Spree::Taxonomy' do
-    name { 'Brand' }
+    sequence :name do |seq|
+      "Brand #{seq}"
+    end
   end
 end

data/lib/spree/testing_support/flaky.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'rspec/retry'
+
+# Usage:
+#
+# it 'fails intermittently', :flaky do
+#   ...
+# end
+#
+# Docs: https://github.com/NoRedInk/rspec-retry
+RSpec.configure do |config|
+  config.verbose_retry = true
+  config.display_try_failure_messages = true
+
+  config.around(:each, :flaky) do |example|
+    if ENV['CI']
+      example.run_with_retry retry: 2
+    else
+      example.run
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -778,6 +778,7 @@ files:
 - lib/generators/solidus/install/app_templates/frontend/none.rb
 - lib/generators/solidus/install/app_templates/frontend/starter.rb
 - lib/generators/solidus/install/app_templates/payment_method/bolt.rb
+- lib/generators/solidus/install/app_templates/payment_method/braintree.rb
 - lib/generators/solidus/install/app_templates/payment_method/none.rb
 - lib/generators/solidus/install/app_templates/payment_method/paypal.rb
 - lib/generators/solidus/install/install_generator.rb
@@ -885,6 +886,7 @@ files:
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
+- lib/spree/promotion/match_policies.rb
 - lib/spree/rails_compatibility.rb
 - lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
@@ -969,6 +971,7 @@ files:
 - lib/spree/testing_support/factory_bot.rb
 - lib/spree/testing_support/fixtures/blank.jpg
 - lib/spree/testing_support/fixtures/file.txt
+- lib/spree/testing_support/flaky.rb
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/job_helpers.rb
 - lib/spree/testing_support/order_walkthrough.rb
@@ -1034,7 +1037,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.