[pull] main from solidusio:main

api/app/controllers/spree/api/coupon_codes_controller.rb

@@ -10,7 +10,7 @@ def create
         authorize! :update, @order, order_token
 
         @order.coupon_code = params[:coupon_code]
-        @handler = Spree::Config.coupon_code_handler_class.new(@order).apply
+        @handler = Spree::Config.promotions.coupon_code_handler_class.new(@order).apply
 
         if @handler.successful?
           render 'spree/api/promotions/handler', status: 200
@@ -24,7 +24,7 @@ def destroy
         authorize! :update, @order, order_token
 
         @order.coupon_code = params[:id]
-        @handler = Spree::Config.coupon_code_handler_class.new(@order).remove
+        @handler = Spree::Config.promotions.coupon_code_handler_class.new(@order).remove
 
         if @handler.successful?
           render 'spree/api/promotions/handler', status: 200

backend/app/controllers/spree/admin/promotion_actions_controller.rb

@@ -36,7 +36,7 @@ def load_promotion
 
   def validate_promotion_action_type
     requested_type = params[:action_type]
-    promotion_action_types = Rails.application.config.spree.promotions.actions
+    promotion_action_types = Spree::Config.promotions.actions
     @promotion_action_type = promotion_action_types.detect do |klass|
       klass.name == requested_type
     end

backend/app/controllers/spree/admin/promotion_rules_controller.rb

@@ -41,7 +41,7 @@ def model_class
 
   def validate_promotion_rule_type
     requested_type = params[:promotion_rule].delete(:type)
-    promotion_rule_types = Rails.application.config.spree.promotions.rules
+    promotion_rule_types = Spree::Config.promotions.rules
     @promotion_rule_type = promotion_rule_types.detect do |klass|
       klass.name == requested_type
     end

backend/app/controllers/spree/admin/promotions_controller.rb

@@ -49,7 +49,7 @@ def collection
         @collection = @search.result(distinct: true).
           includes(promotion_includes).
           page(params[:page]).
-          per(params[:per_page] || Spree::Config[:promotions_per_page])
+          per(params[:per_page] || Spree::Config.promotions.promotions_per_page)
 
         @collection
       end

backend/app/helpers/spree/promotion_rules_helper.rb

@@ -4,7 +4,7 @@ module Spree
   module PromotionRulesHelper
     def options_for_promotion_rule_types(promotion)
       existing = promotion.rules.map { |rule| rule.class.name }
-      rules = Rails.application.config.spree.promotions.rules.reject { |rule| existing.include? rule.name }
+      rules = Spree::Config.promotions.rules.reject { |rule| existing.include? rule.name }
       options = rules.map { |rule| [rule.model_name.human, rule.name] }
       options_for_select(options)
     end

backend/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="action_fields" class="no-border-top">
 
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form' do %>
-    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map {|action| [ action.model_name.human, action.name] } ) %>
+    <% options = options_for_select(Spree::Config.promotions.actions.map {|action| [ action.model_name.human, action.name] } ) %>
     <fieldset>
       <legend align="center"><%= t('spree.promotion_actions') %></legend>
       <% if can?(:update, @promotion) %>

backend/app/views/spree/admin/shared/_locale_selection.html.erb

@@ -3,7 +3,7 @@
 }.sort %>
 
 <% if available_locale_options_for_select.size > 1 %>
-  <%= form_tag(admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
+  <%= form_tag(spree.admin_set_locale_path(format: :html), method: :put, style: "width: 100%;") do %>
     <label class="admin-navbar-selection admin-locale-selection">
       <i class="fa fa-globe fa-fw" title="<%= I18n.t('spree.choose_dashboard_locale') %>"></i>
       <select class="custom-select fullwidth" onchange="this.form.requestSubmit()">

backend/spec/features/admin/promotion_adjustments_spec.rb

@@ -275,12 +275,12 @@ def self.description
             "Complex Calculator"
           end
         end
-        @calculators = Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments
-        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = [ComplexCalculator]
+        @calculators = Spree::Config.promotions.calculators['Spree::Promotion::Actions::CreateItemAdjustments']
+        Spree::Config.promotions.calculators['Spree::Promotion::Actions::CreateItemAdjustments'] = [ComplexCalculator]
       end
 
       after do
-        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = @calculators
+        Spree::Config.promotions.calculators['Spree::Promotion::Actions::CreateItemAdjustments'] = @calculators
       end
 
       it "does not show array and hash form fields" do

core/app/jobs/spree/promotion_code_batch_job.rb

@@ -10,13 +10,13 @@ def perform(promotion_code_batch)
       ).build_promotion_codes
 
       if promotion_code_batch.email?
-        Spree::Config.promotion_code_batch_mailer_class
+        Spree::Config.promotions.promotion_code_batch_mailer_class
           .promotion_code_batch_finished(promotion_code_batch)
           .deliver_now
       end
     rescue StandardError => error
       if promotion_code_batch.email?
-        Spree::Config.promotion_code_batch_mailer_class
+        Spree::Config.promotions.promotion_code_batch_mailer_class
           .promotion_code_batch_errored(promotion_code_batch)
           .deliver_now
       end

core/app/models/spree/adjustment.rb

@@ -42,8 +42,8 @@ class Adjustment < Spree::Base
     scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
     scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :nonzero, -> { where("#{quoted_table_name}.amount != 0") }
-    scope :promotion, -> { where(source_type: 'Spree::PromotionAction') }
-    scope :non_promotion, -> { where.not(source_type: 'Spree::PromotionAction') }
+    scope :promotion, -> { where(source_type: Spree::Config.adjustment_promotion_source_types.map(&:to_s)) }
+    scope :non_promotion, -> { where.not(source_type: Spree::Config.adjustment_promotion_source_types.map(&:to_s)) }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }
     scope :is_included, -> { where(included: true) }
     scope :additional, -> { where(included: false) }
@@ -77,7 +77,7 @@ def currency
 
     # @return [Boolean] true when this is a promotion adjustment (Promotion adjustments have a {PromotionAction} source)
     def promotion?
-      source_type == 'Spree::PromotionAction'
+      source_type.to_s.in?(Spree::Config.adjustment_promotion_source_types.map(&:to_s))
     end
 
     # @return [Boolean] true when this is a tax adjustment (Tax adjustments have a {TaxRate} source)
@@ -122,6 +122,7 @@ def recalculate
       end
       amount
     end
+    deprecate :recalculate, deprecator: Spree.deprecator
 
     # Calculates based on attached promotion (if this is a promotion
     # adjustment) whether this promotion is still eligible.

core/app/models/spree/null_promotion_adjuster.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionAdjuster
+    def initialize(order)
+      @order = order
+    end
+
+    def call
+      @order
+    end
+  end
+end

core/app/models/spree/null_promotion_handler.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Spree
+  class NullPromotionHandler
+    attr_reader :order, :coupon_code
+
+    def initialize(order)
+      @order = order
+      @coupon_code = order.coupon_code&.downcase
+    end
+
+    def activate
+      @order
+    end
+
+    def error
+      nil
+    end
+
+    def success
+      true
+    end
+
+    def successful?
+      true
+    end
+
+    def status_code
+      :coupon_code_applied
+    end
+
+    def status
+      I18n.t(:coupon_code_applied, scope: [:spree, :null_promotion_handler])
+    end
+  end
+end

core/app/models/spree/order.rb

@@ -509,7 +509,7 @@ def create_shipments_for_line_item(line_item)
     end
 
     def apply_shipping_promotions
-      Spree::Config.shipping_promotion_handler_class.new(self).activate
+      Spree::Config.promotions.shipping_promotion_handler_class.new(self).activate
       recalculate
     end
 
@@ -799,7 +799,7 @@ def ensure_inventory_units
     end
 
     def ensure_promotions_eligible
-      Spree::Config.promotion_adjuster_class.new(self).call
+      Spree::Config.promotions.promotion_adjuster_class.new(self).call
 
       if promo_total_changed?
         restart_checkout_flow

core/app/models/spree/order_updater.rb

@@ -195,7 +195,7 @@ def log_state_change(name)
     end
 
     def update_promotions
-      Spree::Config.promotion_adjuster_class.new(order).call
+      Spree::Config.promotions.promotion_adjuster_class.new(order).call
     end
 
     def update_taxes

core/app/models/spree/promotion/order_adjustments_recalculator.rb

@@ -20,7 +20,7 @@ def call
           promotion_adjustments = item.adjustments.select(&:promotion?)
 
           promotion_adjustments.each { |adjustment| recalculate(adjustment) }
-          Spree::Config.promotion_chooser_class.new(promotion_adjustments).update
+          Spree::Config.promotions.promotion_chooser_class.new(promotion_adjustments).update
 
           item.promo_total = promotion_adjustments.select(&:eligible?).sum(&:amount)
         end
@@ -30,7 +30,7 @@ def call
         # line items and/or shipments.
         order_promotion_adjustments = order.adjustments.select(&:promotion?)
         order_promotion_adjustments.each { |adjustment| recalculate(adjustment) }
-        Spree::Config.promotion_chooser_class.new(order_promotion_adjustments).update
+        Spree::Config.promotions.promotion_chooser_class.new(order_promotion_adjustments).update
 
         order.promo_total = all_items.sum(&:promo_total) +
                             order_promotion_adjustments.

core/app/models/spree/promotion_action.rb

@@ -14,7 +14,7 @@ class PromotionAction < Spree::Base
     belongs_to :promotion, class_name: 'Spree::Promotion', inverse_of: :promotion_actions, optional: true
 
     scope :of_type, ->(type) { where(type: Array.wrap(type).map(&:to_s)) }
-    scope :shipping, -> { of_type(Spree::Config.environment.promotions.shipping_actions.to_a) }
+    scope :shipping, -> { of_type(Spree::Config.promotions.shipping_actions.to_a) }
 
     def preload_relations
       []

core/config/locales/en.yml

@@ -1881,6 +1881,8 @@ en:
       product_not_deleted: Product could not be deleted
       variant_deleted: Variant has been deleted
       variant_not_deleted: Variant could not be deleted
+    null_promotion_handler:
+      coupon_code_applied: Coupon code has been applied.
     num_orders: "# Orders"
     number: Number
     number_of_codes: "%{count} codes"