solidus_promotions 4.6.2 → 4.7.0

data/config/locales/en.yml

@@ -27,6 +27,7 @@ en:
       line_item: "%{promotion} (%{promotion_customer_label})"
       shipment: "%{promotion} (%{promotion_customer_label})"
       shipping_rate: "%{promotion} (%{promotion_customer_label})"
+      price: "%{promotion} (%{promotion_customer_label})"
     adjustment_type: Adjustment type
     add_benefit: Add Benefit
     add_condition: Add Condition
@@ -59,6 +60,18 @@ en:
         match_policies:
           include: Line item's product is one of the chosen products
           exclude: Line item's product is not one of the chosen products
+      price_product:
+        match_policies:
+          include: Product is one of the chosen products
+          exclude: Product is not one of the chosen products
+      price_taxon:
+        match_policies:
+          include: Product has one of the chosen taxons
+          exclude: Product does not have one of the chosen taxons
+      price_option_value:
+        match_policies:
+          include: Variant has one of the chosen option value(s)
+          exclude: Variant does not have one of the chosen option value(s)
       line_item_taxon:
         match_policies:
           include: Line item's product has one of the chosen taxons
@@ -104,7 +117,7 @@ en:
         limit_once_per_user: This coupon code can only be used once per user.
       solidus_promotions/conditions/option_value:
       solidus_promotions/conditions/line_item_option_value:
-      solidus_promotions/conditions/product:
+      solidus_promotions/conditions/order_product:
         has_excluded_product: Your cart contains a product that prevents this coupon code from being applied.
         missing_product: This coupon code can't be applied because you don't have all of the necessary products in your cart.
         no_applicable_products: You need to add an applicable product before applying this coupon code.
@@ -112,7 +125,16 @@ en:
         has_excluded_product: Your cart contains a product that prevents this coupon code from being applied.
         missing_product: This coupon code can't be applied because you don't have all of the necessary products in your cart.
         no_applicable_products: You need to add an applicable product before applying this coupon code.
-      solidus_promotions/conditions/taxon:
+      solidus_promotions/conditions/price_product:
+        has_excluded_product: Price belongs to an excluded product.
+        no_applicable_products: Promotion is not applicable to this product.
+      solidus_promotions/conditions/price_taxon:
+        has_excluded_product: Price's product is excluded.
+        no_applicable_products: Promotion is not applicable to this product.
+      solidus_promotions/conditions/price_option_value:
+        has_excluded_product: Price matches option value(s).
+        no_applicable_products: Promotion is not applicable to this product.
+      solidus_promotions/conditions/order_taxon:
         has_excluded_taxon: Your cart contains a product from an excluded category that prevents this coupon code from being applied.
         missing_taxon: You need to add a product from all applicable categories before applying this coupon code.
         no_matching_taxons: You need to add a product from an applicable category before applying this coupon code.
@@ -191,10 +213,12 @@ en:
     models:
       solidus_promotions/benefits/adjust_shipment: Discount matching shipments
       solidus_promotions/benefits/adjust_line_item: Discount matching line items
+      solidus_promotions/benefits/advertise_price: Advertise discounted prices
       solidus_promotions/benefits/create_discounted_item: Create discounted line item
       solidus_promotions/benefits/adjust_line_item_quantity_groups: Discount matching line items based on quantity groups
       solidus_promotions/calculators/distributed_amount: Distributed Amount
       solidus_promotions/calculators/percent: Percent
+      solidus_promotions/calculators/percent_with_cap: Distributed Percent with cap
       solidus_promotions/calculators/flat_rate: Flat Rate
       solidus_promotions/calculators/flexi_rate: Flexible Rate
       solidus_promotions/calculators/tiered_flat_rate: Tiered Flat Rate
@@ -208,15 +232,21 @@ en:
       solidus_promotions/conditions/minimum_quantity: Minimum Quantity
       solidus_promotions/conditions/nth_order: Nth Order
       solidus_promotions/conditions/one_use_per_user: One Use Per User
-      solidus_promotions/conditions/option_value: Option Value(s)
-      solidus_promotions/conditions/line_item_option_value: Line Item Option Value(s)
-      solidus_promotions/conditions/product: Order Product(s)
-      solidus_promotions/conditions/line_item_product: Line Item Product(s)
-      solidus_promotions/conditions/taxon: Order Taxon(s)
-      solidus_promotions/conditions/line_item_taxon: Line Item Taxon(s)
+      solidus_promotions/conditions/order_option_value: Order matches selected option values
+      solidus_promotions/conditions/option_value: Order matches selected option values, restricts line items
+      solidus_promotions/conditions/line_item_option_value: Line Item variant matches option values
+      solidus_promotions/conditions/order_product: Order contains selected products
+      solidus_promotions/conditions/product: Order contains selected products, restricts line items
+      solidus_promotions/conditions/line_item_product: Line item has selected product
+      solidus_promotions/conditions/order_taxon: Order contains product with taxons
+      solidus_promotions/conditions/taxon: Order contains products with taxons, restricts matching line items
+      solidus_promotions/conditions/line_item_taxon: Line item has product with taxons
       solidus_promotions/conditions/user: User
       solidus_promotions/conditions/user_logged_in: User Logged In
       solidus_promotions/conditions/user_role: User Role(s)
+      solidus_promotions/conditions/price_product: Price matches specified product(s)
+      solidus_promotions/conditions/price_taxon: Price matches specified taxon(s)
+      solidus_promotions/conditions/price_option_value: Price matches specified option value(s)
       solidus_promotions/promotion_category:
         one: Promotion Category
         other: Promotion Categories
@@ -262,7 +292,6 @@ en:
         description: Only one use per user
       solidus_promotions/conditions/option_value:
         description: Order includes specified product(s) with matching option value(s)
-        preferred_line_item_applicable: Should also apply to line items
       solidus_promotions/conditions/line_item_option_value:
         description: Line Item has specified product with matching option value
       solidus_promotions/conditions/minimum_quantity:
@@ -270,15 +299,22 @@ en:
       solidus_promotions/conditions/product:
         description: Order includes specified product(s)
         line_item_level_description: 'Line item matches the specified products:'
-        preferred_line_item_applicable: Should also apply to line items
       solidus_promotions/conditions/line_item_product:
         description: Line item matches specified product(s)
         preferred_match_policy: Match Policy
+      solidus_promotions/conditions/price_product:
+        description: Price matches specified product(s)
+        preferred_match_policy: Match Policy
+      solidus_promotions/conditions/price_taxon:
+        description: Price matches specified taxon(s)
+        preferred_match_policy: Match Policy
+      solidus_promotions/conditions/price_option_value:
+        description: Price matches specified option value(s)
+        preferred_match_policy: Match Policy
       solidus_promotions/conditions/store:
         description: Available only to the specified stores
       solidus_promotions/conditions/taxon:
         description: Order includes products with specified taxon(s)
-        preferred_line_item_applicable: Should also apply to line items
       solidus_promotions/conditions/line_item_taxon:
         description: Line Item has product with specified taxon(s)
         preferred_match_policy: Match Policy

data/config/routes.rb

@@ -29,7 +29,7 @@ SolidusPromotions::Engine.routes.draw do
           end
           resources :promotion_codes, only: [:index, :new, :create]
           resources :promotion_code_batches, only: [:index, :new, :create] do
-            get "/download", to: "promotion_code_batches#download", defaults: { format: "csv" }
+            get "/download", to: "promotion_code_batches#download", defaults: {format: "csv"}
           end
         end
       end

data/db/migrate/20230703101637_create_promotions.rb

@@ -1,6 +1,6 @@
 class CreatePromotions < ActiveRecord::Migration[7.0]
   def change
-    promotion_foreign_key = table_exists?(:spree_promotions) ? { to_table: :spree_promotions } : false
+    promotion_foreign_key = table_exists?(:spree_promotions) ? {to_table: :spree_promotions} : false
 
     create_table :solidus_promotions_promotions do |t|
       t.string :description
@@ -15,7 +15,7 @@ class CreatePromotions < ActiveRecord::Migration[7.0]
       t.integer :lane, null: false, default: 1
       t.string :customer_label
       t.datetime :deleted_at
-      t.references :original_promotion, type: :integer, index: { name: :index_original_promotion_id }, foreign_key: promotion_foreign_key
+      t.references :original_promotion, type: :integer, index: {name: :index_original_promotion_id}, foreign_key: promotion_foreign_key
 
       t.timestamps
     end

data/db/migrate/20230703113625_create_promotion_benefits.rb

@@ -1,12 +1,12 @@
 class CreatePromotionBenefits < ActiveRecord::Migration[7.0]
   def change
-    promotion_action_foreign_key = table_exists?(:spree_promotion_actions) ? { to_table: :spree_promotion_actions } : false
+    promotion_action_foreign_key = table_exists?(:spree_promotion_actions) ? {to_table: :spree_promotion_actions} : false
 
     create_table :solidus_promotions_benefits do |t|
-      t.references :promotion, index: true, null: false, foreign_key: { to_table: :solidus_promotions_promotions }
+      t.references :promotion, index: true, null: false, foreign_key: {to_table: :solidus_promotions_promotions}
       t.string :type
       t.text :preferences
-      t.references :original_promotion_action, type: :integer, index: { name: :index_original_promotion_action_id }, foreign_key: promotion_action_foreign_key
+      t.references :original_promotion_action, type: :integer, index: {name: :index_original_promotion_action_id}, foreign_key: promotion_action_foreign_key
       t.index [:id, :type], name: :index_solidus_promotions_benefits_on_id_and_type
 
       t.timestamps

data/db/migrate/20230703141116_create_promotion_categories.rb

@@ -9,6 +9,6 @@ class CreatePromotionCategories < ActiveRecord::Migration[7.0]
 
     add_reference :solidus_promotions_promotions,
       :promotion_category,
-      foreign_key: { to_table: :solidus_promotions_promotion_categories }
+      foreign_key: {to_table: :solidus_promotions_promotion_categories}
   end
 end

data/db/migrate/20230703143943_create_promotion_conditions.rb

@@ -2,7 +2,7 @@ class CreatePromotionConditions < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_promotions_conditions do |t|
       t.references :benefit,
-        foreign_key: { to_table: :solidus_promotions_benefits }
+        foreign_key: {to_table: :solidus_promotions_benefits}
       t.string :type
       t.text :preferences
 

data/db/migrate/20230704083830_add_condition_join_tables.rb

@@ -1,29 +1,29 @@
 class AddConditionJoinTables < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_promotions_condition_products, force: :cascade do |t|
-      t.references :product, type: :integer, index: true, null: false, foreign_key: { to_table: :spree_products }
-      t.references :condition, index: true, null: false, foreign_key: { to_table: :solidus_promotions_conditions }
+      t.references :product, type: :integer, index: true, null: false, foreign_key: {to_table: :spree_products}
+      t.references :condition, index: true, null: false, foreign_key: {to_table: :solidus_promotions_conditions}
 
       t.timestamps
     end
 
     create_table :solidus_promotions_condition_taxons, force: :cascade do |t|
-      t.references :taxon, type: :integer, index: true, null: false, foreign_key: { to_table: :spree_taxons }
-      t.references :condition, index: true, null: false, foreign_key: { to_table: :solidus_promotions_conditions }
+      t.references :taxon, type: :integer, index: true, null: false, foreign_key: {to_table: :spree_taxons}
+      t.references :condition, index: true, null: false, foreign_key: {to_table: :solidus_promotions_conditions}
 
       t.timestamps
     end
 
     create_table :solidus_promotions_condition_users, force: :cascade do |t|
-      t.references :user, type: :integer, index: true, null: false, foreign_key: { to_table: Spree.user_class.table_name }
-      t.references :condition, index: true, null: false, foreign_key: { to_table: :solidus_promotions_conditions }
+      t.references :user, type: :integer, index: true, null: false, foreign_key: {to_table: Spree.user_class.table_name}
+      t.references :condition, index: true, null: false, foreign_key: {to_table: :solidus_promotions_conditions}
 
       t.timestamps
     end
 
     create_table :solidus_promotions_condition_stores do |t|
-      t.references :store, type: :integer, index: true, null: false, foreign_key: { to_table: :spree_stores }
-      t.references :condition, index: true, null: false, foreign_key: { to_table: :solidus_promotions_conditions }
+      t.references :store, type: :integer, index: true, null: false, foreign_key: {to_table: :spree_stores}
+      t.references :condition, index: true, null: false, foreign_key: {to_table: :solidus_promotions_conditions}
 
       t.timestamps
     end

data/db/migrate/20230704102444_create_promotion_codes.rb

@@ -1,7 +1,7 @@
 class CreatePromotionCodes < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_promotions_promotion_codes, force: :cascade do |t|
-      t.references :promotion, null: false, index: true, foreign_key: { to_table: :solidus_promotions_promotions }
+      t.references :promotion, null: false, index: true, foreign_key: {to_table: :solidus_promotions_promotions}
       t.string :value, null: false
       t.timestamps
 

data/db/migrate/20230704102656_create_promotion_code_batches.rb

@@ -3,7 +3,7 @@
 class CreatePromotionCodeBatches < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_promotions_promotion_code_batches do |t|
-      t.references :promotion, null: false, index: true, foreign_key: { to_table: :solidus_promotions_promotions }
+      t.references :promotion, null: false, index: true, foreign_key: {to_table: :solidus_promotions_promotions}
       t.string :base_code, null: false
       t.integer :number_of_codes, null: false
       t.string :join_characters, null: false, default: "_"

data/db/migrate/20230705171556_create_order_promotions.rb

@@ -1,9 +1,9 @@
 class CreateOrderPromotions < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_promotions_order_promotions do |t|
-      t.references :order, type: :integer, index: true, null: false, foreign_key: { to_table: :spree_orders }
-      t.references :promotion, index: true, null: false, foreign_key: { to_table: :solidus_promotions_promotions }
-      t.references :promotion_code, index: true, null: true, foreign_key: { to_table: :solidus_promotions_promotion_codes }
+      t.references :order, type: :integer, index: true, null: false, foreign_key: {to_table: :spree_orders}
+      t.references :promotion, index: true, null: false, foreign_key: {to_table: :solidus_promotions_promotions}
+      t.references :promotion_code, index: true, null: true, foreign_key: {to_table: :solidus_promotions_promotion_codes}
 
       t.timestamps
     end

data/db/migrate/20230725074235_create_shipping_rate_discounts.rb

@@ -1,8 +1,8 @@
 class CreateShippingRateDiscounts < ActiveRecord::Migration[7.0]
   def change
     create_table :solidus_promotions_shipping_rate_discounts do |t|
-      t.references :benefit, type: :bigint, null: false, foreign_key: { to_table: :solidus_promotions_benefits }, index: { name: "index_shipping_rate_discounts_on_benefit_id" }
-      t.references :shipping_rate, type: :integer, null: false, foreign_key: { to_table: :spree_shipping_rates }, index: { name: "index_shipping_rate_discounts_on_shipping_rate_id" }
+      t.references :benefit, type: :bigint, null: false, foreign_key: {to_table: :solidus_promotions_benefits}, index: {name: "index_shipping_rate_discounts_on_benefit_id"}
+      t.references :shipping_rate, type: :integer, null: false, foreign_key: {to_table: :spree_shipping_rates}, index: {name: "index_shipping_rate_discounts_on_shipping_rate_id"}
       t.decimal :amount, precision: 10, scale: 2, null: false
       t.string :label, null: false
 

data/db/migrate/20231104135812_add_managed_by_order_benefit_to_line_items.rb

@@ -1,5 +1,5 @@
 class AddManagedByOrderBenefitToLineItems < ActiveRecord::Migration[7.0]
   def change
-    add_reference :spree_line_items, :managed_by_order_benefit, foreign_key: { to_table: :solidus_promotions_benefits, null: true }
+    add_reference :spree_line_items, :managed_by_order_benefit, foreign_key: {to_table: :solidus_promotions_benefits, null: true}
   end
 end

data/db/migrate/20251104170913_update_promotion_code_value_collation.rb

@@ -0,0 +1,38 @@
+class UpdatePromotionCodeValueCollation < ActiveRecord::Migration[7.0]
+  def up
+    return unless mysql?
+
+    collation = use_accent_sensitive_collation? ? "utf8mb4_0900_as_cs" : "utf8mb4_bin"
+    change_column :solidus_promotions_promotion_codes, :value, :string,
+      collation: collation
+  end
+
+  def down
+    return unless mysql?
+
+    change_column :solidus_promotions_promotion_codes, :value, :string,
+      collation: "utf8mb4_general_ci"
+  end
+
+  private
+
+  def mysql?
+    ActiveRecord::Base.connection.adapter_name.downcase.include?("mysql")
+  end
+
+  def use_accent_sensitive_collation?
+    !mariadb? && mysql_version >= 8.0
+  end
+
+  def mariadb?
+    version_string.include?("mariadb")
+  end
+
+  def mysql_version
+    version_string.to_f
+  end
+
+  def version_string
+    @version_string ||= ActiveRecord::Base.connection.select_value("SELECT VERSION()").downcase
+  end
+end

data/db/migrate/20251104214304_separate_out_order_only_conditions.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class SeparateOutOrderOnlyConditions < ActiveRecord::Migration[7.0]
+  def up
+    order_only_conditions = SolidusPromotions::Condition.all.select do |condition|
+      condition.respond_to?(:preferred_line_item_applicable) && condition.preferred_line_item_applicable == false
+    end
+
+    order_only_conditions.each do |condition|
+      case condition
+      when SolidusPromotions::Conditions::Product
+        condition.type = "SolidusPromotions::Conditions::OrderProduct"
+        condition.preferences.delete(:preferred_line_item_applicable)
+        condition.save!
+      when SolidusPromotions::Conditions::Taxon
+        condition.type = "SolidusPromotions::Conditions::OrderTaxon"
+        condition.preferences.delete(:preferred_line_item_applicable)
+        condition.save!
+      when SolidusPromotions::Conditions::OptionValue
+        condition.type = "SolidusPromotions::Conditions::OrderOptionValue"
+        condition.preferences.delete(:preferred_line_item_applicable)
+        condition.save!
+      else
+        raise NotImplementedError, <<~MSG
+          Please create a new condition that is only applicable to orders for #{condition.class}
+          and update the corresponding record on the #{condition.benefit.promotion.name} Promotion.
+        MSG
+      end
+    end
+
+    SolidusPromotions::Condition.all.select do |condition|
+      condition.preferences[:preferred_line_item_applicable]
+    end.each do |condition|
+      condition.preferences.delete(:preferred_line_item_applicable)
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/eslint.config.mjs

@@ -0,0 +1,29 @@
+import { defineConfig } from "eslint/config";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+import rootConfig from "../eslint.config.mjs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default defineConfig([
+  {
+    extends: [compat.extends("eslint:recommended"), rootConfig],
+
+    languageOptions: {
+        globals: {
+            Turbo: "readonly",
+        },
+
+        ecmaVersion: 2023,
+        sourceType: "module",
+    },
+  }
+]);

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

@@ -6,7 +6,7 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
   end
 
   def title
-    t('solidus_promotions.promotion_categories.title')
+    t("solidus_promotions.promotion_categories.title")
   end
 
   def edit_path(record)
@@ -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_form },
+      data: {turbo_frame: :resource_form},
       icon: "add-line"
     )
   end
@@ -50,8 +50,8 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
       header: :name,
       data: ->(record) do
         link_to record.name, edit_path(record),
-          data: { turbo_frame: :resource_form },
-          class: 'body-link'
+          data: {turbo_frame: :resource_form},
+          class: "body-link"
       end
     }
   end
@@ -61,8 +61,8 @@ class SolidusPromotions::PromotionCategories::Index::Component < SolidusAdmin::U
       header: :code,
       data: ->(record) do
         link_to record.code, edit_path(record),
-          data: { turbo_frame: :resource_form },
-          class: 'body-link'
+          data: {turbo_frame: :resource_form},
+          class: "body-link"
       end
     }
   end

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

@@ -39,11 +39,11 @@ class SolidusPromotions::Promotions::Index::Component < SolidusAdmin::UI::Pages:
 
   def scopes
     [
-      { name: :active, label: t(".scopes.active"), default: true },
-      { name: :draft, label: t(".scopes.draft") },
-      { name: :future, label: t(".scopes.future") },
-      { name: :expired, label: t(".scopes.expired") },
-      { name: :all, label: t(".scopes.all") }
+      {name: :active, label: t(".scopes.active"), default: true},
+      {name: :draft, label: t(".scopes.draft")},
+      {name: :future, label: t(".scopes.future")},
+      {name: :expired, label: t(".scopes.expired")},
+      {name: :all, label: t(".scopes.all")}
     ]
   end
 

data/lib/solidus_promotions/configuration.rb

@@ -10,6 +10,15 @@ module SolidusPromotions
 
     class_name_attribute :coupon_code_handler_class, default: "SolidusPromotions::PromotionHandler::Coupon"
 
+    # The class used to normalize coupon codes before saving or lookup.
+    # By default, this normalizes codes to lowercase for case-insensitive matching.
+    # You can customize this by creating your own normalizer class or by overriding
+    # the existing SolidusPromotions::CouponCodeNormalizer class using a decorator.
+    # @!attribute [rw] coupon_code_normalizer_class
+    #   @return [String] The class used to normalize coupon codes.
+    #   Defaults to "SolidusPromotions::CouponCodeNormalizer".
+    class_name_attribute :coupon_code_normalizer_class, default: "SolidusPromotions::CouponCodeNormalizer"
+
     class_name_attribute :promotion_finder_class, default: "SolidusPromotions::PromotionFinder"
 
     # Allows providing a different promotion advertiser.
@@ -23,7 +32,37 @@ module SolidusPromotions
     # In case solidus_legacy_promotions is loaded, we need to define this.
     class_name_attribute :shipping_promotion_handler_class, default: "Spree::NullPromotionHandler"
 
-    add_class_set :order_conditions, default: [
+    def order_conditions
+      SolidusPromotions::Condition.applicable_to([Spree::Order])
+    end
+    deprecate order_conditions: :conditions, deprecator: Spree.deprecator
+
+    def order_conditions=(conditions)
+      conditions.each { self.conditions << _1 }
+    end
+    deprecate :order_conditions= => :conditions=, :deprecator => Spree.deprecator
+
+    def line_item_conditions
+      SolidusPromotions::Condition.applicable_to([Spree::LineItem])
+    end
+    deprecate line_item_conditions: :conditions, deprecator: Spree.deprecator
+
+    def line_item_conditions=(conditions)
+      conditions.each { self.conditions << _1 }
+    end
+    deprecate :line_item_conditions= => :conditions=, :deprecator => Spree.deprecator
+
+    def shipment_conditions
+      SolidusPromotions::Condition.applicable_to([Spree::Shipment])
+    end
+    deprecate shipment_conditions: :conditions, deprecator: Spree.deprecator
+
+    def shipment_conditions=(conditions)
+      conditions.each { self.conditions << _1 }
+    end
+    deprecate :shipment_conditions= => :conditions=, :deprecator => Spree.deprecator
+
+    add_class_set :conditions, default: [
       "SolidusPromotions::Conditions::FirstOrder",
       "SolidusPromotions::Conditions::FirstRepeatPurchaseSince",
       "SolidusPromotions::Conditions::ItemTotal",
@@ -32,34 +71,35 @@ module SolidusPromotions
       "SolidusPromotions::Conditions::NthOrder",
       "SolidusPromotions::Conditions::OneUsePerUser",
       "SolidusPromotions::Conditions::OptionValue",
+      "SolidusPromotions::Conditions::OrderOptionValue",
+      "SolidusPromotions::Conditions::OrderProduct",
       "SolidusPromotions::Conditions::Product",
       "SolidusPromotions::Conditions::Store",
       "SolidusPromotions::Conditions::Taxon",
+      "SolidusPromotions::Conditions::OrderTaxon",
       "SolidusPromotions::Conditions::UserLoggedIn",
       "SolidusPromotions::Conditions::UserRole",
-      "SolidusPromotions::Conditions::User"
-    ]
-
-    add_class_set :line_item_conditions, default: [
+      "SolidusPromotions::Conditions::User",
       "SolidusPromotions::Conditions::LineItemOptionValue",
       "SolidusPromotions::Conditions::LineItemProduct",
-      "SolidusPromotions::Conditions::LineItemTaxon"
-    ]
-    add_class_set :shipment_conditions, default: [
-      "SolidusPromotions::Conditions::ShippingMethod"
+      "SolidusPromotions::Conditions::LineItemTaxon",
+      "SolidusPromotions::Conditions::ShippingMethod",
+      "SolidusPromotions::Conditions::PriceProduct",
+      "SolidusPromotions::Conditions::PriceTaxon",
+      "SolidusPromotions::Conditions::PriceOptionValue"
     ]
 
     add_class_set :benefits, default: [
       "SolidusPromotions::Benefits::AdjustLineItem",
       "SolidusPromotions::Benefits::AdjustLineItemQuantityGroups",
       "SolidusPromotions::Benefits::AdjustShipment",
-      "SolidusPromotions::Benefits::CreateDiscountedItem"
+      "SolidusPromotions::Benefits::CreateDiscountedItem",
+      "SolidusPromotions::Benefits::AdvertisePrice"
     ]
 
     add_nested_class_set :promotion_calculators, default: {
       "SolidusPromotions::Benefits::AdjustShipment" => [
         "SolidusPromotions::Calculators::FlatRate",
-        "SolidusPromotions::Calculators::FlexiRate",
         "SolidusPromotions::Calculators::Percent",
         "SolidusPromotions::Calculators::TieredFlatRate",
         "SolidusPromotions::Calculators::TieredPercent",
@@ -70,6 +110,7 @@ module SolidusPromotions
         "SolidusPromotions::Calculators::FlatRate",
         "SolidusPromotions::Calculators::FlexiRate",
         "SolidusPromotions::Calculators::Percent",
+        "SolidusPromotions::Calculators::PercentWithCap",
         "SolidusPromotions::Calculators::TieredFlatRate",
         "SolidusPromotions::Calculators::TieredPercent",
         "SolidusPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
@@ -83,6 +124,11 @@ module SolidusPromotions
         "SolidusPromotions::Calculators::FlatRate",
         "SolidusPromotions::Calculators::Percent",
         "SolidusPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
+      ],
+      "SolidusPromotions::Benefits::AdvertisePrice" => [
+        "SolidusPromotions::Calculators::Percent",
+        "SolidusPromotions::Calculators::FlatRate",
+        "SolidusPromotions::Calculators::FlexiRate"
       ]
     }
 
@@ -105,7 +151,6 @@ module SolidusPromotions
     preference :sync_order_promotions, :boolean, default: false
 
     preference :use_new_admin, :boolean, default: false
-
     def use_new_admin?
       SolidusSupport.admin_available? && preferred_use_new_admin
     end

data/lib/solidus_promotions/promotion_map.rb

@@ -61,9 +61,9 @@ module SolidusPromotions
     actions: {
       Spree::Promotion::Actions::CreateAdjustment => ->(old_action) {
         calculator = case old_action.calculator
-                     when Spree::Calculator::FlatRate
+        when Spree::Calculator::FlatRate
           SolidusPromotions::Calculators::DistributedAmount.new(preferences: old_action.calculator.preferences)
-                     when Spree::Calculator::FlatPercentItemTotal
+        when Spree::Calculator::FlatPercentItemTotal
           SolidusPromotions::Calculators::Percent.new(preferred_percent: old_action.calculator.preferred_flat_percent)
         end
 
@@ -74,17 +74,17 @@ module SolidusPromotions
       Spree::Promotion::Actions::CreateItemAdjustments => ->(old_action) {
         preferences = old_action.calculator.preferences
         calculator = case old_action.calculator
-                     when Spree::Calculator::FlatRate
+        when Spree::Calculator::FlatRate
           SolidusPromotions::Calculators::FlatRate.new(preferences: preferences)
-                     when Spree::Calculator::PercentOnLineItem
+        when Spree::Calculator::PercentOnLineItem
           SolidusPromotions::Calculators::Percent.new(preferences: preferences)
-                     when Spree::Calculator::FlexiRate
+        when Spree::Calculator::FlexiRate
           SolidusPromotions::Calculators::FlexiRate.new(preferences: preferences)
-                     when Spree::Calculator::DistributedAmount
+        when Spree::Calculator::DistributedAmount
           SolidusPromotions::Calculators::DistributedAmount.new(preferences: preferences)
-                     when Spree::Calculator::TieredFlatRate
+        when Spree::Calculator::TieredFlatRate
           SolidusPromotions::Calculators::TieredFlatRate.new(preferences: preferences)
-                     when Spree::Calculator::TieredPercent
+        when Spree::Calculator::TieredPercent
           SolidusPromotions::Calculators::TieredPercent.new(preferences: preferences)
         end
 
@@ -95,17 +95,17 @@ module SolidusPromotions
       Spree::Promotion::Actions::CreateQuantityAdjustments => ->(old_action) {
         preferences = old_action.calculator.preferences
         calculator = case old_action.calculator
-                     when Spree::Calculator::FlatRate
+        when Spree::Calculator::FlatRate
           SolidusPromotions::Calculators::FlatRate.new(preferences: preferences)
-                     when Spree::Calculator::PercentOnLineItem
+        when Spree::Calculator::PercentOnLineItem
           SolidusPromotions::Calculators::Percent.new(preferences: preferences)
-                     when Spree::Calculator::FlexiRate
+        when Spree::Calculator::FlexiRate
           SolidusPromotions::Calculators::FlexiRate.new(preferences: preferences)
-                     when Spree::Calculator::DistributedAmount
+        when Spree::Calculator::DistributedAmount
           SolidusPromotions::Calculators::DistributedAmount.new(preferences: preferences)
-                     when Spree::Calculator::TieredFlatRate
+        when Spree::Calculator::TieredFlatRate
           SolidusPromotions::Calculators::TieredFlatRate.new(preferences: preferences)
-                     when Spree::Calculator::TieredPercent
+        when Spree::Calculator::TieredPercent
           SolidusPromotions::Calculators::TieredPercent.new(preferences: preferences)
         end