Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Admin: Fixed setting calculator for promotion actions
Damian Legawiec9adaa637a714
diff --git a/admin/app/controllers/spree/admin/promotion_actions_controller.rb b/admin/app/controllers/spree/admin/promotion_actions_controller.rbindex 8e0c85631a..852c4e8a38 100644--- a/admin/app/controllers/spree/admin/promotion_actions_controller.rb+++ b/admin/app/controllers/spree/admin/promotion_actions_controller.rb@@ -5,6 +5,8 @@ module Spreehelper_method :allowed_action_types+ before_action :set_calculator_type, only: [:new]+privatedef model_class@@ -34,6 +36,12 @@ module Spreedef collection_urlspree.admin_promotion_path(parent)end++ def set_calculator_type+ if @promotion_action.respond_to?(:calculator_type)+ @promotion_action.calculator_type = @promotion_action.class.calculators.first.name+ end+ endendendenddiff --git a/core/app/models/spree/promotion/actions/create_adjustment.rb b/core/app/models/spree/promotion/actions/create_adjustment.rbindex f36e9b8a33..132ec3f005 100644--- a/core/app/models/spree/promotion/actions/create_adjustment.rb+++ b/core/app/models/spree/promotion/actions/create_adjustment.rb@@ -5,8 +5,6 @@ module Spreeinclude Spree::CalculatedAdjustmentsinclude Spree::AdjustmentSource- after_initialize -> { self.calculator ||= Calculator::FlatPercentItemTotal.new }-def perform(options = {})order = options[:order]diff --git a/core/app/models/spree/promotion/actions/create_item_adjustments.rb b/core/app/models/spree/promotion/actions/create_item_adjustments.rbindex 0aaa9650ad..480ed09746 100644--- a/core/app/models/spree/promotion/actions/create_item_adjustments.rb+++ b/core/app/models/spree/promotion/actions/create_item_adjustments.rb@@ -5,8 +5,6 @@ module Spreeinclude Spree::CalculatedAdjustmentsinclude Spree::AdjustmentSource- after_initialize -> { self.calculator ||= Calculator::PercentOnLineItem.new }-def perform(options = {})order = options[:order]promotion = options[:promotion]