solidus_promotions 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29599ba7fd8a620fcfa9355d74acafe458da6953a96b613ab06dbaf0fb9b60f
-  data.tar.gz: 9ee74c996b06ea7091b3208ebefb1787beeb7bf8ecabbeac12451ce4287cab13
+  metadata.gz: b9f99870cc08ee90fd5ed318b5ac28e0c600bfbf2e51409d2a9633f45da6e5db
+  data.tar.gz: '01182178d5ec81589d8079c88db347de3dd4e94c53ccfcaf76683de82f0ed8d7'
 SHA512:
-  metadata.gz: 76bb17aa1e739cb65059244e1c145b18f06200cbd0462793b66f9fcf39f0e85ce33c8f2a0416c4cfd05227d7c8ab23841ff5a382cfa72aa2cb1d8ed42b2370c5
-  data.tar.gz: aae8b4bc12d464a52be035683d6d32af234708e63bc3cf6449f08dadbe90e3369cbc2454b950bf2e5c4996a0ada7819f4f2a4c060d47f05beb8c23da0f0d5b5f
+  metadata.gz: 9ed22fba9578d4f479c23187be996c848bf893a2832abf702fa21e9e72d1d0f7a141aaf8a6dba9ecb2d1b1fd72d1ddbbcb7b2f92346e122ddc9326f7433b2d40
+  data.tar.gz: 240167352cd02bd3b82ce6e24608b1d252cf223d08f92827c0ca7942e622fca392a50bc78afc8f54e8269a39d14f56d350d347ce50d7816096ee14b407ce8e4a

data/README.md

@@ -32,7 +32,7 @@ end
 
 ### Types of Benefits
 
-The new Solidus Promotions Systems ships with three benefit types: `AdjustLineItem`, `AdjustShipment` and `CreateDiscountedItem`. To allow more efficient processing of returns and reduce the complexity for bookkeping and support departmentes fixed discount to all line items in an order can now be given through the `AdjustLineItem` benefit through the `DistributedAmount` calculator significantly reducing amministration issues with refunds. 
+The new Solidus Promotions Systems ships with three benefit types: `AdjustLineItem`, `AdjustShipment` and `CreateDiscountedItem`. To allow more efficient processing of returns and reduce the complexity for bookkeping and support departments fixed discount to all line items in an order can now be given through the `AdjustLineItem` benefit through the `DistributedAmount` calculator significantly reducing administration issues with refunds. 
 
 #### `AdjustLineItem`
 

data/app/models/solidus_promotions/benefit.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "spree/preferences/persistable"
-
 module SolidusPromotions
   # Base class for all types of benefit.
   #
@@ -16,8 +14,8 @@ module SolidusPromotions
 
     belongs_to :promotion, inverse_of: :benefits
     belongs_to :original_promotion_action, class_name: "Spree::PromotionAction", optional: true
-    has_many :adjustments, class_name: "Spree::Adjustment", as: :source
-    has_many :shipping_rate_discounts, class_name: "SolidusPromotions::ShippingRateDiscount", inverse_of: :benefit
+    has_many :adjustments, class_name: "Spree::Adjustment", as: :source, dependent: :restrict_with_error
+    has_many :shipping_rate_discounts, class_name: "SolidusPromotions::ShippingRateDiscount", inverse_of: :benefit, dependent: :restrict_with_error
     has_many :conditions, class_name: "SolidusPromotions::Condition", inverse_of: :benefit, dependent: :destroy
 
     scope :of_type, ->(type) { where(type: Array.wrap(type).map(&:to_s)) }
@@ -44,7 +42,7 @@ module SolidusPromotions
 
     # Ensure a negative amount which does not exceed the object's amount
     def compute_amount(adjustable)
-      promotion_amount = calculator.compute(adjustable) || BigDecimal("0")
+      promotion_amount = calculator.compute(adjustable) || Spree::ZERO
       [adjustable.discountable_amount, promotion_amount.abs].min * -1
     end
 

data/app/models/solidus_promotions/benefits/adjust_line_item_quantity_groups.rb

@@ -53,7 +53,7 @@ module SolidusPromotions
       #
       def compute_amount(line_item)
         adjustment_amount = calculator.compute(Item.new(line_item))
-        return BigDecimal("0") if adjustment_amount.nil? || adjustment_amount.zero?
+        return Spree::ZERO if adjustment_amount.nil? || adjustment_amount.zero?
 
         adjustment_amount = adjustment_amount.abs
 

data/app/models/solidus_promotions/calculators/flexi_rate.rb

@@ -16,7 +16,7 @@ module SolidusPromotions
         items_count = object.quantity
         items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?
 
-        return BigDecimal("0") if items_count == 0
+        return Spree::ZERO if items_count == 0
 
         additional_items_count = items_count - 1
         preferred_first_item + preferred_additional_item * additional_items_count

data/app/models/solidus_promotions/calculators/percent_with_cap.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  module Calculators
+    class PercentWithCap < Percent
+      preference :max_amount, :integer, default: 100
+
+      def compute(line_item)
+        percent_discount = super
+        max_discount = DistributedAmount.new(
+          calculable:,
+          preferred_amount: preferred_max_amount
+        ).compute_line_item(line_item)
+
+        [percent_discount, max_discount].min
+      end
+    end
+  end
+end

data/app/models/solidus_promotions/calculators/tiered_flat_rate.rb

@@ -40,8 +40,6 @@ module SolidusPromotions
 
       def cast_to_d(value)
         value.to_s.to_d
-      rescue ArgumentError
-        BigDecimal("0")
       end
 
       def preferred_tiers_content

data/app/models/solidus_promotions/calculators/tiered_percent.rb

@@ -47,8 +47,6 @@ module SolidusPromotions
 
       def cast_to_d(value)
         value.to_s.to_d
-      rescue ArgumentError
-        BigDecimal("0")
       end
 
       def preferred_tiers_content

data/app/models/solidus_promotions/condition.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require "spree/preferences/persistable"
-
 module SolidusPromotions
   class Condition < Spree::Base
     include Spree::Preferences::Persistable
 
-    belongs_to :benefit, class_name: "SolidusPromotions::Benefit", inverse_of: :conditions, optional: true
+    belongs_to :benefit, class_name: "SolidusPromotions::Benefit", inverse_of: :conditions
     has_one :promotion, through: :benefit
 
     scope :of_type, ->(type) { where(type: type) }

data/app/models/solidus_promotions/condition_product.rb

@@ -2,7 +2,7 @@
 
 module SolidusPromotions
   class ConditionProduct < Spree::Base
-    belongs_to :condition, class_name: "SolidusPromotions::Condition", optional: true
-    belongs_to :product, class_name: "Spree::Product", optional: true
+    belongs_to :condition, class_name: "SolidusPromotions::Condition"
+    belongs_to :product, class_name: "Spree::Product"
   end
 end

data/app/models/solidus_promotions/condition_store.rb

@@ -2,7 +2,7 @@
 
 module SolidusPromotions
   class ConditionStore < Spree::Base
-    belongs_to :condition, class_name: "SolidusPromotions::Condition", optional: true
-    belongs_to :store, class_name: "Spree::Store", optional: true
+    belongs_to :condition, class_name: "SolidusPromotions::Condition"
+    belongs_to :store, class_name: "Spree::Store"
   end
 end

data/app/models/solidus_promotions/condition_taxon.rb

@@ -2,7 +2,7 @@
 
 module SolidusPromotions
   class ConditionTaxon < Spree::Base
-    belongs_to :condition, class_name: "SolidusPromotions::Condition", optional: true
-    belongs_to :taxon, class_name: "Spree::Taxon", optional: true
+    belongs_to :condition, class_name: "SolidusPromotions::Condition"
+    belongs_to :taxon, class_name: "Spree::Taxon"
   end
 end

data/app/models/solidus_promotions/condition_user.rb

@@ -2,7 +2,7 @@
 
 module SolidusPromotions
   class ConditionUser < Spree::Base
-    belongs_to :condition, class_name: "SolidusPromotions::Condition", optional: true
-    belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
+    belongs_to :condition, class_name: "SolidusPromotions::Condition"
+    belongs_to :user, class_name: Spree::UserClassHandle.new
   end
 end

data/app/models/solidus_promotions/conditions/first_order.rb

@@ -10,7 +10,7 @@ module SolidusPromotions
         @user = order.try(:user) || options[:user]
         @email = order.email
 
-        if (user || email) && (completed_orders.present? && completed_orders.first != order)
+        if (user || email) && completed_orders.present? && completed_orders.first != order
           eligibility_errors.add(:base, eligibility_error_message(:not_first_order), error_code: :not_first_order)
         end
 

data/app/models/solidus_promotions/conditions/line_item_product.rb

@@ -11,7 +11,8 @@ module SolidusPromotions
       has_many :condition_products,
         dependent: :destroy,
         foreign_key: :condition_id,
-        class_name: "SolidusPromotions::ConditionProduct"
+        class_name: "SolidusPromotions::ConditionProduct",
+        inverse_of: :condition
       has_many :products,
         class_name: "Spree::Product",
         through: :condition_products

data/app/models/solidus_promotions/conditions/line_item_taxon.rb

@@ -5,8 +5,11 @@ module SolidusPromotions
     class LineItemTaxon < Condition
       include LineItemLevelCondition
 
-      has_many :condition_taxons, class_name: "SolidusPromotions::ConditionTaxon", foreign_key: :condition_id,
-        dependent: :destroy
+      has_many :condition_taxons,
+        class_name: "SolidusPromotions::ConditionTaxon",
+        foreign_key: :condition_id,
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :taxons, through: :condition_taxons, class_name: "Spree::Taxon"
 
       MATCH_POLICIES = %w[include exclude].freeze

data/app/models/solidus_promotions/conditions/product.rb

@@ -12,7 +12,8 @@ module SolidusPromotions
       has_many :condition_products,
         dependent: :destroy,
         foreign_key: :condition_id,
-        class_name: "SolidusPromotions::ConditionProduct"
+        class_name: "SolidusPromotions::ConditionProduct",
+        inverse_of: :condition
       has_many :products, class_name: "Spree::Product", through: :condition_products
 
       def preload_relations

data/app/models/solidus_promotions/conditions/store.rb

@@ -5,9 +5,11 @@ module SolidusPromotions
     class Store < Condition
       include OrderLevelCondition
 
-      has_many :condition_stores, class_name: "SolidusPromotions::ConditionStore",
+      has_many :condition_stores,
+        class_name: "SolidusPromotions::ConditionStore",
         foreign_key: :condition_id,
-        dependent: :destroy
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :stores, through: :condition_stores, class_name: "Spree::Store"
 
       def preload_relations

data/app/models/solidus_promotions/conditions/taxon.rb

@@ -5,8 +5,11 @@ module SolidusPromotions
     class Taxon < Condition
       include LineItemApplicableOrderLevelCondition
 
-      has_many :condition_taxons, class_name: "SolidusPromotions::ConditionTaxon", foreign_key: :condition_id,
-        dependent: :destroy
+      has_many :condition_taxons,
+        class_name: "SolidusPromotions::ConditionTaxon",
+        foreign_key: :condition_id,
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :taxons, through: :condition_taxons, class_name: "Spree::Taxon"
 
       def preload_relations

data/app/models/solidus_promotions/conditions/user.rb

@@ -8,7 +8,8 @@ module SolidusPromotions
       has_many :condition_users,
         class_name: "SolidusPromotions::ConditionUser",
         foreign_key: :condition_id,
-        dependent: :destroy
+        dependent: :destroy,
+        inverse_of: :condition
       has_many :users, through: :condition_users, class_name: Spree::UserClassHandle.new
 
       def preload_relations

data/app/models/solidus_promotions/load_promotions.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  class LoadPromotions
+    def initialize(order:, dry_run_promotion: nil)
+      @order = order
+      @dry_run_promotion = dry_run_promotion
+    end
+
+    def call
+      promos = connected_order_promotions | sale_promotions
+      promos << dry_run_promotion if dry_run_promotion
+      promos.flat_map(&:benefits).group_by(&:preload_relations).each do |benefit_preload_relations, benefits|
+        preload(records: benefits, associations: benefit_preload_relations)
+        benefits.flat_map(&:conditions).group_by(&:preload_relations).each do |condition_preload_relations, conditions|
+          preload(records: conditions, associations: condition_preload_relations)
+        end
+      end
+      promos.reject { |promotion| promotion.usage_limit_exceeded?(excluded_orders: [order]) }
+    end
+
+    private
+
+    attr_reader :order, :dry_run_promotion
+
+    def preload(records:, associations:)
+      ActiveRecord::Associations::Preloader.new(records: records, associations: associations).call
+    end
+
+    def connected_order_promotions
+      eligible_connected_promotion_ids = order.solidus_order_promotions.select do |order_promotion|
+        order_promotion.promotion.kept? && (order_promotion.promotion_code.nil? || !order_promotion.promotion_code.usage_limit_exceeded?(excluded_orders: [order]))
+      end.map(&:promotion_id)
+      order.solidus_promotions.active(reference_time).where(id: eligible_connected_promotion_ids).includes(promotion_includes)
+    end
+
+    def sale_promotions
+      SolidusPromotions::Promotion.kept.where(apply_automatically: true).active(reference_time).includes(promotion_includes)
+    end
+
+    def reference_time
+      order.completed_at || Time.current
+    end
+
+    def promotion_includes
+      {
+        benefits: :conditions
+      }
+    end
+  end
+end

data/app/models/solidus_promotions/order_adjuster/load_promotions.rb

@@ -2,51 +2,10 @@
 
 module SolidusPromotions
   class OrderAdjuster
-    class LoadPromotions
-      def initialize(order:, dry_run_promotion: nil)
-        @order = order
-        @dry_run_promotion = dry_run_promotion
-      end
-
-      def call
-        promos = connected_order_promotions | sale_promotions
-        promos << dry_run_promotion if dry_run_promotion
-        promos.flat_map(&:benefits).group_by(&:preload_relations).each do |benefit_preload_relations, benefits|
-          preload(records: benefits, associations: benefit_preload_relations)
-          benefits.flat_map(&:conditions).group_by(&:preload_relations).each do |condition_preload_relations, conditions|
-            preload(records: conditions, associations: condition_preload_relations)
-          end
-        end
-        promos.reject { |promotion| promotion.usage_limit_exceeded?(excluded_orders: [order]) }
-      end
-
-      private
-
-      attr_reader :order, :dry_run_promotion
-
-      def preload(records:, associations:)
-        ActiveRecord::Associations::Preloader.new(records: records, associations: associations).call
-      end
-
-      def connected_order_promotions
-        eligible_connected_promotion_ids = order.solidus_order_promotions.select do |order_promotion|
-          order_promotion.promotion.kept? && (order_promotion.promotion_code.nil? || !order_promotion.promotion_code.usage_limit_exceeded?(excluded_orders: [order]))
-        end.map(&:promotion_id)
-        order.solidus_promotions.active(reference_time).where(id: eligible_connected_promotion_ids).includes(promotion_includes)
-      end
-
-      def sale_promotions
-        SolidusPromotions::Promotion.kept.where(apply_automatically: true).active(reference_time).includes(promotion_includes)
-      end
-
-      def reference_time
-        order.completed_at || Time.current
-      end
-
-      def promotion_includes
-        {
-          benefits: :conditions
-        }
+    class LoadPromotions < SolidusPromotions::LoadPromotions
+      def initialize(...)
+        Spree.deprecator.warn("Please use SolidusPromotions::LoadPromotions instead")
+        super
       end
     end
   end

data/app/models/solidus_promotions/order_adjuster.rb

@@ -7,7 +7,10 @@ module SolidusPromotions
     def initialize(order, dry_run_promotion: nil)
       @order = order
       @dry_run = !!dry_run_promotion
-      @promotions = LoadPromotions.new(order: order, dry_run_promotion: dry_run_promotion).call
+      @promotions = SolidusPromotions::LoadPromotions.new(
+        order: order,
+        dry_run_promotion: dry_run_promotion
+      ).call
     end
 
     def call

data/app/models/solidus_promotions/order_promotion.rb

@@ -7,7 +7,7 @@ module SolidusPromotions
   # 2. The specific code that they used
   class OrderPromotion < Spree::Base
     belongs_to :order, class_name: "Spree::Order"
-    belongs_to :promotion, -> { with_discarded }, class_name: "SolidusPromotions::Promotion"
+    belongs_to :promotion, -> { with_discarded }, class_name: "SolidusPromotions::Promotion", inverse_of: :order_promotions
     belongs_to :promotion_code, class_name: "SolidusPromotions::PromotionCode", optional: true
 
     validates :promotion_code, presence: true, if: :require_promotion_code?

data/app/models/solidus_promotions/promotion.rb

@@ -6,8 +6,11 @@ module SolidusPromotions
 
     include Spree::SoftDeletable
 
-    belongs_to :category, class_name: "SolidusPromotions::PromotionCategory",
-      foreign_key: :promotion_category_id, optional: true
+    belongs_to :category,
+      class_name: "SolidusPromotions::PromotionCategory",
+      foreign_key: :promotion_category_id,
+      optional: true,
+      inverse_of: :promotions
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
     has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy
     has_many :conditions, through: :benefits

data/config/locales/en.yml

@@ -217,6 +217,9 @@ en:
       solidus_promotions/conditions/user: User
       solidus_promotions/conditions/user_logged_in: User Logged In
       solidus_promotions/conditions/user_role: User Role(s)
+      solidus_promotions/promotion_category:
+        one: Promotion Category
+        other: Promotion Categories
       solidus_promotions/promotion_code_batch:
         one: Code batch
         other: Code batches
@@ -311,6 +314,10 @@ en:
         preferred_currency: Currency
       solidus_promotions/calculators/percent:
         description: Provides a discount calculated by percent of the discountable amount of the item being discounted
+        preferred_percent: Percent
+      solidus_promotions/calculators/percent_with_cap:
+        description: Calculates a discount by percent of the discountable amount of the item being discounted, with a cap on the maximum discount.
+        preferred_max_amount: Maximum Amount
       solidus_promotions/calculators/distributed_amount:
         description: Distributes the configured amount among all eligible line items of the order.
         explanation: |
@@ -350,6 +357,7 @@ en:
             </tbody>
           </table>
         preferred_amount: Amount
+        preferred_currency: Currency
 
     errors:
       models:

data/lib/components/admin/solidus_promotions/promotion_categories/edit/component.html.erb

@@ -1,15 +1,15 @@
-<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
-        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+        <%= f.text_field(:name, class: "required") %>
+        <%= f.text_field(:code, class: "required") %>
       </div>
       <% modal.with_actions do %>
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/lib/components/admin/solidus_promotions/promotion_categories/edit/component.yml

@@ -1,4 +1,3 @@
 en:
   title: "Edit Promotion Category"
   cancel: "Cancel"
-  submit: "Update Promotion Category"

data/lib/components/admin/solidus_promotions/promotion_categories/index/component.rb

@@ -14,7 +14,7 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
   end
 
   def turbo_frames
-    %w[resource_modal]
+    %w[resource_form]
   end
 
   def page_actions
@@ -22,7 +22,7 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
       tag: :a,
       text: t(".add"),
       href: solidus_promotions.new_promotion_category_path(**search_filter_params),
-      data: { turbo_frame: :resource_modal },
+      data: { turbo_frame: :resource_form },
       icon: "add-line"
     )
   end
@@ -50,7 +50,7 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
       header: :name,
       data: ->(record) do
         link_to record.name, edit_path(record),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }
@@ -61,7 +61,7 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
       header: :code,
       data: ->(record) do
         link_to record.code, edit_path(record),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }

data/lib/components/admin/solidus_promotions/promotion_categories/new/component.html.erb

@@ -1,15 +1,15 @@
-<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
-        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+        <%= f.text_field(:name, class: "required") %>
+        <%= f.text_field(:code, class: "required") %>
       </div>
       <% modal.with_actions do %>
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/lib/components/admin/solidus_promotions/promotion_categories/new/component.yml

@@ -1,4 +1,3 @@
 en:
   title: "New Promotion Category"
   cancel: "Cancel"
-  submit: "Add Promotion Category"

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

@@ -41,7 +41,7 @@ module SolidusPromotions
         if run_migrations
           run "bin/rails db:migrate"
         else
-          puts "Skipping bin/rails db:migrate, don't forget to run it!"
+          say "Skipping bin/rails db:migrate, don't forget to run it!"
         end
       end
 

data/lib/solidus_promotions/promotion_migrator.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require "logger"
+
 module SolidusPromotions
   class PromotionMigrator
     PROMOTION_IGNORED_ATTRIBUTES = ["id", "type", "promotion_category_id", "promotion_id"]
 
-    attr_reader :promotion_map
+    attr_reader :promotion_map, :logger
 
-    def initialize(promotion_map)
+    def initialize(promotion_map, logger: nil)
+      @logger = logger || Logger.new($stdout)
       @promotion_map = promotion_map
     end
 
@@ -78,7 +81,7 @@ module SolidusPromotions
     def generate_new_benefits(old_promotion_action)
       promo_action_config = promotion_map[:actions][old_promotion_action.class]
       if promo_action_config.nil?
-        puts("#{old_promotion_action.class} is not supported")
+        logger.info("#{old_promotion_action.class} is not supported")
         return nil
       end
       promo_action_config.call(old_promotion_action)
@@ -87,7 +90,7 @@ module SolidusPromotions
     def generate_new_promotion_conditions(old_promotion_rule)
       new_promo_condition_class = promotion_map[:conditions][old_promotion_rule.class]
       if new_promo_condition_class.nil?
-        puts("#{old_promotion_rule.class} is not supported")
+        logger.info("#{old_promotion_rule.class} is not supported")
         []
       elsif new_promo_condition_class.respond_to?(:call)
         new_promo_condition_class.call(old_promotion_rule)

data/lib/tasks/solidus_promotions/migrate_existing_promotions.rake

@@ -7,6 +7,6 @@ namespace :solidus_promotions do
   task migrate_existing_promotions: :environment do
     require "solidus_promotions/promotion_map"
 
-    SolidusPromotions::PromotionMigrator.new(SolidusPromotions::PROMOTION_MAP).call
+    SolidusPromotions::PromotionMigrator.new(SolidusPromotions::PROMOTION_MAP, logger: Rails.logger).call
   end
 end

data/lib/views/backend/solidus_promotions/admin/calculator_fields/_default_fields.html.erb

@@ -2,5 +2,5 @@
   <%= render "solidus_promotions/admin/shared/preference_fields/#{calculator.preference_type(name)}",
     name: "#{prefix}[calculator_attributes][preferred_#{name}]",
     value: calculator.get_preference(name),
-    label: t(name.to_s, scope: 'spree', default: name.to_s.humanize) %>
+    label: calculator.class.human_attribute_name("preferred_#{name}", default: I18n.t(name, scope: :spree, default: name.humanize)) %>
 <% end %>

data/solidus_promotions.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.files = files.grep_v(%r{^(spec|bin)/})
 
   spec.add_dependency "csv", "~> 3.0"
-  spec.add_dependency "importmap-rails", "~> 1.2"
+  spec.add_dependency "importmap-rails", [">= 2.0", "< 3"]
   spec.add_dependency "ransack-enum", "~> 1.0"
   spec.add_dependency "solidus_core", [">= 4.0.0", "< 5"]
   spec.add_dependency "solidus_support", ">= 0.12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 - Solidus Team
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -28,16 +28,22 @@ dependencies:
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ransack-enum
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +168,7 @@ files:
 - app/models/solidus_promotions/calculators/flat_rate.rb
 - app/models/solidus_promotions/calculators/flexi_rate.rb
 - app/models/solidus_promotions/calculators/percent.rb
+- app/models/solidus_promotions/calculators/percent_with_cap.rb
 - app/models/solidus_promotions/calculators/tiered_flat_rate.rb
 - app/models/solidus_promotions/calculators/tiered_percent.rb
 - app/models/solidus_promotions/calculators/tiered_percent_on_eligible_item_quantity.rb
@@ -192,6 +199,7 @@ files:
 - app/models/solidus_promotions/eligibility_result.rb
 - app/models/solidus_promotions/eligibility_results.rb
 - app/models/solidus_promotions/item_discount.rb
+- app/models/solidus_promotions/load_promotions.rb
 - app/models/solidus_promotions/migration_support/order_promotion_syncer.rb
 - app/models/solidus_promotions/order_adjuster.rb
 - app/models/solidus_promotions/order_adjuster/choose_discounts.rb
@@ -376,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: New promotion system for Solidus
 test_files: []