solidus_friendly_promotions 1.0.1 → 1.9.0

data/db/migrate/20240612120411_update_column_comments_for_condition_taxons.rb

@@ -0,0 +1,24 @@
+class UpdateColumnCommentsForConditionTaxons < ActiveRecord::Migration[7.1]
+  def up
+    if connection.supports_comments?
+      change_table_comment(:friendly_condition_taxons, friendly_condition_taxons_table_comment)
+      change_column_comment(:friendly_condition_taxons, :condition_id, condition_id_comment)
+    end
+  end
+
+  private
+
+  def friendly_condition_taxons_table_comment
+    <<~COMMENT
+      Join table between conditions and taxons. Only used if the promotion condition's type is SolidusFriendlyPromotion::Conditions::Taxon or
+      SolidusFriendlyPromotion::Conditions::LineItemTaxon. Represents those taxons that the promotion condition matches on using its any/all/none
+      or include/exclude match policy.
+    COMMENT
+  end
+
+  def condition_id_comment
+    <<~COMMENT
+      Foreign key to the friendly_conditions table.
+    COMMENT
+  end
+end

data/db/migrate/20240612121049_update_column_comments_for_condition_users.rb

@@ -0,0 +1,23 @@
+class UpdateColumnCommentsForConditionUsers < ActiveRecord::Migration[7.1]
+  def up
+    if connection.supports_comments?
+      change_table_comment(:friendly_condition_users, friendly_condition_users_table_comment)
+      change_column_comment(:friendly_condition_users, :condition_id, condition_id_comment)
+    end
+  end
+
+  private
+
+  def friendly_condition_users_table_comment
+    <<~COMMENT
+      Join table between promotion conditions and users. Used with promotion conditions of type "SolidusFriendlyPromotions::Conditions::User".
+      An entry here indicates that a promotion is eligible for the user ID specified here.
+    COMMENT
+  end
+
+  def condition_id_comment
+    <<~COMMENT
+      Foreign key to the friendly_conditions table.
+    COMMENT
+  end
+end

data/lib/generators/solidus_friendly_promotions/install/templates/initializer.rb

@@ -5,7 +5,7 @@ Spree::Config.order_contents_class = "SolidusFriendlyPromotions::SimpleOrderCont
 Spree::Config.promotion_adjuster_class = "SolidusFriendlyPromotions::FriendlyPromotionAdjuster"
 
 Rails.application.config.to_prepare do |config|
-  Spree::Order.line_item_comparison_hooks << :free_from_order_action?
+  Spree::Order.line_item_comparison_hooks << :free_from_order_benefit?
 end
 
 # Replace the promotions menu from core with ours
@@ -68,7 +68,7 @@ SolidusFriendlyPromotions.configure do |config|
   config.promotions_per_page = 25
 
   config.promotion_calculators = SolidusFriendlyPromotions::NestedClassSet.new(
-    "SolidusFriendlyPromotions::Actions::AdjustShipment" => [
+    "SolidusFriendlyPromotions::Benefits::AdjustShipment" => [
       "SolidusFriendlyPromotions::Calculators::FlatRate",
       "SolidusFriendlyPromotions::Calculators::FlexiRate",
       "SolidusFriendlyPromotions::Calculators::Percent",
@@ -76,7 +76,7 @@ SolidusFriendlyPromotions.configure do |config|
       "SolidusFriendlyPromotions::Calculators::TieredPercent",
       "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ],
-    "SolidusFriendlyPromotions::Actions::AdjustLineItem" => [
+    "SolidusFriendlyPromotions::Benefits::AdjustLineItem" => [
       "SolidusFriendlyPromotions::Calculators::DistributedAmount",
       "SolidusFriendlyPromotions::Calculators::FlatRate",
       "SolidusFriendlyPromotions::Calculators::FlexiRate",
@@ -85,47 +85,47 @@ SolidusFriendlyPromotions.configure do |config|
       "SolidusFriendlyPromotions::Calculators::TieredPercent",
       "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ],
-    "SolidusFriendlyPromotions::Actions::AdjustLineItemQuantityGroups" => [
+    "SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups" => [
       "SolidusFriendlyPromotions::Calculators::FlatRate",
       "SolidusFriendlyPromotions::Calculators::Percent",
       "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ],
-    "SolidusFriendlyPromotions::Actions::CreateDiscountedItem" => [
+    "SolidusFriendlyPromotions::Benefits::CreateDiscountedItem" => [
       "SolidusFriendlyPromotions::Calculators::FlatRate",
       "SolidusFriendlyPromotions::Calculators::Percent",
       "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
     ]
   )
 
-  config.order_rules = [
-    "SolidusFriendlyPromotions::Rules::FirstOrder",
-    "SolidusFriendlyPromotions::Rules::FirstRepeatPurchaseSince",
-    "SolidusFriendlyPromotions::Rules::ItemTotal",
-    "SolidusFriendlyPromotions::Rules::DiscountedItemTotal",
-    "SolidusFriendlyPromotions::Rules::MinimumQuantity",
-    "SolidusFriendlyPromotions::Rules::NthOrder",
-    "SolidusFriendlyPromotions::Rules::OneUsePerUser",
-    "SolidusFriendlyPromotions::Rules::OptionValue",
-    "SolidusFriendlyPromotions::Rules::Product",
-    "SolidusFriendlyPromotions::Rules::Store",
-    "SolidusFriendlyPromotions::Rules::Taxon",
-    "SolidusFriendlyPromotions::Rules::UserLoggedIn",
-    "SolidusFriendlyPromotions::Rules::UserRole",
-    "SolidusFriendlyPromotions::Rules::User"
+  config.order_conditions = [
+    "SolidusFriendlyPromotions::Conditions::FirstOrder",
+    "SolidusFriendlyPromotions::Conditions::FirstRepeatPurchaseSince",
+    "SolidusFriendlyPromotions::Conditions::ItemTotal",
+    "SolidusFriendlyPromotions::Conditions::DiscountedItemTotal",
+    "SolidusFriendlyPromotions::Conditions::MinimumQuantity",
+    "SolidusFriendlyPromotions::Conditions::NthOrder",
+    "SolidusFriendlyPromotions::Conditions::OneUsePerUser",
+    "SolidusFriendlyPromotions::Conditions::OptionValue",
+    "SolidusFriendlyPromotions::Conditions::Product",
+    "SolidusFriendlyPromotions::Conditions::Store",
+    "SolidusFriendlyPromotions::Conditions::Taxon",
+    "SolidusFriendlyPromotions::Conditions::UserLoggedIn",
+    "SolidusFriendlyPromotions::Conditions::UserRole",
+    "SolidusFriendlyPromotions::Conditions::User"
   ]
-  config.line_item_rules = [
-    "SolidusFriendlyPromotions::Rules::LineItemOptionValue",
-    "SolidusFriendlyPromotions::Rules::LineItemProduct",
-    "SolidusFriendlyPromotions::Rules::LineItemTaxon"
+  config.line_item_conditions = [
+    "SolidusFriendlyPromotions::Conditions::LineItemOptionValue",
+    "SolidusFriendlyPromotions::Conditions::LineItemProduct",
+    "SolidusFriendlyPromotions::Conditions::LineItemTaxon"
   ]
-  config.shipment_rules = [
-    "SolidusFriendlyPromotions::Rules::ShippingMethod"
+  config.shipment_conditions = [
+    "SolidusFriendlyPromotions::Conditions::ShippingMethod"
   ]
 
   config.actions = [
-    "SolidusFriendlyPromotions::Actions::AdjustLineItem",
-    "SolidusFriendlyPromotions::Actions::AdjustLineItemQuantityGroups",
-    "SolidusFriendlyPromotions::Actions::AdjustShipment",
-    "SolidusFriendlyPromotions::Actions::CreateDiscountedItem"
+    "SolidusFriendlyPromotions::Benefits::AdjustLineItem",
+    "SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups",
+    "SolidusFriendlyPromotions::Benefits::AdjustShipment",
+    "SolidusFriendlyPromotions::Benefits::CreateDiscountedItem"
   ]
 end

data/lib/solidus_friendly_promotions/configuration.rb

@@ -19,9 +19,9 @@ module SolidusFriendlyPromotions
     add_class_set :line_item_discount_calculators
     add_class_set :shipment_discount_calculators
 
-    add_class_set :order_rules
-    add_class_set :line_item_rules
-    add_class_set :shipment_rules
+    add_class_set :order_conditions
+    add_class_set :line_item_conditions
+    add_class_set :shipment_conditions
 
     add_class_set :actions
 
@@ -29,6 +29,14 @@ module SolidusFriendlyPromotions
     class_name_attribute :promotion_code_batch_mailer_class,
       default: "SolidusFriendlyPromotions::PromotionCodeBatchMailer"
 
+    # Allows providing a different promotion advertiser.
+    # @!attribute [rw] advertiser_class
+    # @see Spree::PromotionAdvertiser
+    # @return [Class] an object that conforms to the API of
+    #   the standard promotion advertiser class
+    #   Spree::PromotionAdvertiser.
+    class_name_attribute :advertiser_class, default: "SolidusFriendlyPromotions::PromotionAdvertiser"
+
     # @!attribute [rw] promotions_per_page
     #   @return [Integer] Promotions to show per-page in the admin (default: +25+)
     preference :promotions_per_page, :integer, default: 25

data/lib/solidus_friendly_promotions/migrate_adjustments.rb

@@ -8,17 +8,17 @@ module SolidusFriendlyPromotions
           <<~SQL
             UPDATE spree_adjustments
               INNER JOIN spree_promotion_actions ON spree_adjustments.source_id = spree_promotion_actions.id and spree_adjustments.source_type = 'Spree::PromotionAction'
-              INNER JOIN friendly_promotion_actions ON friendly_promotion_actions.original_promotion_action_id = spree_promotion_actions.id
-            SET source_id = friendly_promotion_actions.id,
-              source_type = 'SolidusFriendlyPromotions::PromotionAction'
+              INNER JOIN friendly_benefits ON friendly_benefits.original_promotion_action_id = spree_promotion_actions.id
+            SET source_id = friendly_benefits.id,
+              source_type = 'SolidusFriendlyPromotions::Benefit'
           SQL
         else
           <<~SQL
             UPDATE spree_adjustments
-            SET source_id = friendly_promotion_actions.id,
-              source_type = 'SolidusFriendlyPromotions::PromotionAction'
+            SET source_id = friendly_benefits.id,
+              source_type = 'SolidusFriendlyPromotions::Benefit'
             FROM spree_promotion_actions
-              INNER JOIN friendly_promotion_actions ON friendly_promotion_actions.original_promotion_action_id = spree_promotion_actions.id
+              INNER JOIN friendly_benefits ON friendly_benefits.original_promotion_action_id = spree_promotion_actions.id
             WHERE spree_adjustments.source_id = spree_promotion_actions.id and spree_adjustments.source_type = 'Spree::PromotionAction'
           SQL
         end
@@ -30,11 +30,11 @@ module SolidusFriendlyPromotions
         sql = if ActiveRecord::Base.connection_db_config.adapter == "mysql2"
           <<~SQL
             UPDATE spree_adjustments
-              INNER JOIN friendly_promotion_actions 
-              INNER JOIN spree_promotion_actions ON spree_adjustments.source_id = friendly_promotion_actions.id and spree_adjustments.source_type = 'SolidusFriendlyPromotions::PromotionAction'
+              INNER JOIN friendly_benefits
+              INNER JOIN spree_promotion_actions ON spree_adjustments.source_id = friendly_benefits.id and spree_adjustments.source_type = 'SolidusFriendlyPromotions::Benefit'
             SET source_id = spree_promotion_actions.id,
               source_type = 'Spree::PromotionAction'
-            WHERE friendly_promotion_actions.original_promotion_action_id = spree_promotion_actions.id
+            WHERE friendly_benefits.original_promotion_action_id = spree_promotion_actions.id
           SQL
         else
           <<~SQL
@@ -42,8 +42,8 @@ module SolidusFriendlyPromotions
             SET source_id = spree_promotion_actions.id,
                 source_type = 'Spree::PromotionAction'
             FROM spree_promotion_actions
-              INNER JOIN friendly_promotion_actions ON friendly_promotion_actions.original_promotion_action_id = spree_promotion_actions.id
-            WHERE spree_adjustments.source_id = friendly_promotion_actions.id and spree_adjustments.source_type = 'SolidusFriendlyPromotions::PromotionAction'
+              INNER JOIN friendly_benefits ON friendly_benefits.original_promotion_action_id = spree_promotion_actions.id
+            WHERE spree_adjustments.source_id = friendly_benefits.id and spree_adjustments.source_type = 'SolidusFriendlyPromotions::Benefit'
           SQL
         end
 

data/lib/solidus_friendly_promotions/promotion_map.rb

@@ -2,31 +2,31 @@
 
 module SolidusFriendlyPromotions
   PROMOTION_MAP = {
-    rules: {
+    conditions: {
       Spree::Promotion::Rules::ItemTotal =>
-        SolidusFriendlyPromotions::Rules::ItemTotal,
+        SolidusFriendlyPromotions::Conditions::ItemTotal,
       Spree::Promotion::Rules::Product =>
-        SolidusFriendlyPromotions::Rules::Product,
+        SolidusFriendlyPromotions::Conditions::Product,
       Spree::Promotion::Rules::User =>
-        SolidusFriendlyPromotions::Rules::User,
+        SolidusFriendlyPromotions::Conditions::User,
       Spree::Promotion::Rules::FirstOrder =>
-        SolidusFriendlyPromotions::Rules::FirstOrder,
+        SolidusFriendlyPromotions::Conditions::FirstOrder,
       Spree::Promotion::Rules::UserLoggedIn =>
-        SolidusFriendlyPromotions::Rules::UserLoggedIn,
+        SolidusFriendlyPromotions::Conditions::UserLoggedIn,
       Spree::Promotion::Rules::OneUsePerUser =>
-        SolidusFriendlyPromotions::Rules::OneUsePerUser,
+        SolidusFriendlyPromotions::Conditions::OneUsePerUser,
       Spree::Promotion::Rules::Taxon =>
-        SolidusFriendlyPromotions::Rules::Taxon,
+        SolidusFriendlyPromotions::Conditions::Taxon,
       Spree::Promotion::Rules::NthOrder =>
-        SolidusFriendlyPromotions::Rules::NthOrder,
+        SolidusFriendlyPromotions::Conditions::NthOrder,
       Spree::Promotion::Rules::OptionValue =>
-        SolidusFriendlyPromotions::Rules::OptionValue,
+        SolidusFriendlyPromotions::Conditions::OptionValue,
       Spree::Promotion::Rules::FirstRepeatPurchaseSince =>
-        SolidusFriendlyPromotions::Rules::FirstRepeatPurchaseSince,
+        SolidusFriendlyPromotions::Conditions::FirstRepeatPurchaseSince,
       Spree::Promotion::Rules::UserRole =>
-        SolidusFriendlyPromotions::Rules::UserRole,
+        SolidusFriendlyPromotions::Conditions::UserRole,
       Spree::Promotion::Rules::Store =>
-        SolidusFriendlyPromotions::Rules::Store
+        SolidusFriendlyPromotions::Conditions::Store
     },
     actions: {
       Spree::Promotion::Actions::CreateAdjustment => ->(old_action) {
@@ -37,7 +37,7 @@ module SolidusFriendlyPromotions
           SolidusFriendlyPromotions::Calculators::Percent.new(preferred_percent: old_action.calculator.preferred_flat_percent)
         end
 
-        SolidusFriendlyPromotions::Actions::AdjustLineItem.new(
+        SolidusFriendlyPromotions::Benefits::AdjustLineItem.new(
           calculator: calculator
         )
       },
@@ -58,7 +58,7 @@ module SolidusFriendlyPromotions
           SolidusFriendlyPromotions::Calculators::TieredPercent.new(preferences: preferences)
         end
 
-        SolidusFriendlyPromotions::Actions::AdjustLineItem.new(
+        SolidusFriendlyPromotions::Benefits::AdjustLineItem.new(
           calculator: calculator
         )
       },
@@ -79,13 +79,13 @@ module SolidusFriendlyPromotions
           SolidusFriendlyPromotions::Calculators::TieredPercent.new(preferences: preferences)
         end
 
-        SolidusFriendlyPromotions::Actions::AdjustLineItemQuantityGroups.new(
+        SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups.new(
           preferred_group_size: old_action.preferred_group_size,
           calculator: calculator
         )
       },
       Spree::Promotion::Actions::FreeShipping => ->(old_action) {
-        SolidusFriendlyPromotions::Actions::AdjustShipment.new(
+        SolidusFriendlyPromotions::Benefits::AdjustShipment.new(
           calculator: SolidusFriendlyPromotions::Calculators::Percent.new(
             preferred_percent: 100
           )

data/lib/solidus_friendly_promotions/promotion_migrator.rb

@@ -2,7 +2,7 @@
 
 module SolidusFriendlyPromotions
   class PromotionMigrator
-    PROMOTION_IGNORED_ATTRIBUTES = ["id", "type", "promotion_category_id"]
+    PROMOTION_IGNORED_ATTRIBUTES = ["id", "type", "promotion_category_id", "promotion_id"]
 
     attr_reader :promotion_map
 
@@ -24,12 +24,12 @@ module SolidusFriendlyPromotions
             name: promotion.promotion_category.name
           )
         end
-        new_promotion.rules = promotion.rules.flat_map do |old_promotion_rule|
-          generate_new_promotion_rules(old_promotion_rule)
-        end
-        new_promotion.actions = promotion.actions.flat_map do |old_promotion_action|
-          generate_new_promotion_actions(old_promotion_action)&.tap do |new_promotion_action|
+        new_promotion.benefits = promotion.actions.flat_map do |old_promotion_action|
+          generate_new_benefits(old_promotion_action)&.tap do |new_promotion_action|
             new_promotion_action.original_promotion_action = old_promotion_action
+            new_promotion_action.conditions = promotion.rules.flat_map do |old_promotion_rule|
+              generate_new_promotion_conditions(old_promotion_rule)
+            end
           end
         end.compact
         new_promotion.save!
@@ -75,7 +75,7 @@ module SolidusFriendlyPromotions
       )
     end
 
-    def generate_new_promotion_actions(old_promotion_action)
+    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")
@@ -84,19 +84,19 @@ module SolidusFriendlyPromotions
       promo_action_config.call(old_promotion_action)
     end
 
-    def generate_new_promotion_rules(old_promotion_rule)
-      new_promo_rule_class = promotion_map[:rules][old_promotion_rule.class]
-      if new_promo_rule_class.nil?
+    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")
         []
-      elsif new_promo_rule_class.respond_to?(:call)
-        new_promo_rule_class.call(old_promotion_rule)
+      elsif new_promo_condition_class.respond_to?(:call)
+        new_promo_condition_class.call(old_promotion_rule)
       else
-        new_rule = new_promo_rule_class.new(old_promotion_rule.attributes.except(*PROMOTION_IGNORED_ATTRIBUTES))
-        new_rule.preload_relations.each do |relation|
-          new_rule.send(:"#{relation}=", old_promotion_rule.send(relation))
+        new_condition = new_promo_condition_class.new(old_promotion_rule.attributes.except(*PROMOTION_IGNORED_ATTRIBUTES))
+        new_condition.preload_relations.each do |relation|
+          new_condition.send(:"#{relation}=", old_promotion_rule.send(relation))
         end
-        [new_rule]
+        [new_condition]
       end
     end
   end

data/lib/solidus_friendly_promotions/testing_support/factories/friendly_promotion_factory.rb

@@ -14,28 +14,29 @@ FactoryBot.define do
       end
     end
 
-    trait :with_adjustable_action do
+    trait :with_adjustable_benefit do
       transient do
         preferred_amount { 10 }
         calculator_class { SolidusFriendlyPromotions::Calculators::FlatRate }
-        promotion_action_class { SolidusFriendlyPromotions::Actions::AdjustLineItem }
+        promotion_benefit_class { SolidusFriendlyPromotions::Benefits::AdjustLineItem }
+        conditions { [] }
       end
 
       after(:create) do |promotion, evaluator|
         calculator = evaluator.calculator_class.new
         calculator.preferred_amount = evaluator.preferred_amount
-        evaluator.promotion_action_class.create!(calculator: calculator, promotion: promotion)
+        evaluator.promotion_benefit_class.create!(calculator: calculator, promotion: promotion, conditions: evaluator.conditions)
       end
     end
 
-    factory :friendly_promotion_with_action_adjustment, traits: [:with_adjustable_action]
+    factory :friendly_promotion_with_benefit_adjustment, traits: [:with_adjustable_benefit]
 
     trait :with_line_item_adjustment do
       transient do
         adjustment_rate { 10 }
       end
 
-      with_adjustable_action
+      with_adjustable_benefit
       preferred_amount { adjustment_rate }
     end
 
@@ -45,7 +46,7 @@ FactoryBot.define do
       after(:create) do |promotion|
         calculator = SolidusFriendlyPromotions::Calculators::Percent.new(preferred_percent: 100)
 
-        SolidusFriendlyPromotions::Actions::AdjustShipment.create!(promotion: promotion, calculator: calculator)
+        SolidusFriendlyPromotions::Benefits::AdjustShipment.create!(promotion: promotion, calculator: calculator)
       end
     end
 
@@ -54,38 +55,11 @@ FactoryBot.define do
         weighted_order_adjustment_amount { 10 }
       end
 
-      with_adjustable_action
+      with_adjustable_benefit
       preferred_amount { weighted_order_adjustment_amount }
       calculator_class { SolidusFriendlyPromotions::Calculators::DistributedAmount }
     end
 
     factory :friendly_promotion_with_order_adjustment, traits: [:with_order_adjustment]
-
-    trait :with_item_total_rule do
-      transient do
-        item_total_threshold_amount { 10 }
-      end
-
-      after(:create) do |promotion, evaluator|
-        rule = SolidusFriendlyPromotions::Rules::ItemTotal.create!(
-          promotion: promotion,
-          preferred_operator: "gte",
-          preferred_amount: evaluator.item_total_threshold_amount
-        )
-        promotion.rules << rule
-        promotion.save!
-      end
-    end
-    factory :friendly_promotion_with_item_total_rule, traits: [:with_item_total_rule]
-    trait :with_first_order_rule do
-      after(:create) do |promotion, _evaluator|
-        rule = SolidusFriendlyPromotions::Rules::FirstOrder.create!(
-          promotion: promotion
-        )
-        promotion.rules << rule
-        promotion.save!
-      end
-    end
-    factory :friendly_promotion_with_first_order_rule, traits: [:with_first_order_rule]
   end
 end

data/lib/solidus_friendly_promotions/testing_support/factories/friendly_shipping_rate_discount_factory.rb

@@ -4,10 +4,10 @@ FactoryBot.define do
   factory :friendly_shipping_rate_discount, class: "SolidusFriendlyPromotions::ShippingRateDiscount" do
     amount { BigDecimal("-4.00") }
     shipping_rate
-    promotion_action do
+    benefit do
       promotion = create(:friendly_promotion, name: "10% off shipping!", customer_label: "10% off")
       ten_percent = SolidusFriendlyPromotions::Calculators::Percent.new(preferred_percent: 10)
-      SolidusFriendlyPromotions::Actions::AdjustShipment.create!(promotion: promotion, calculator: ten_percent)
+      SolidusFriendlyPromotions::Benefits::AdjustShipment.create!(promotion: promotion, calculator: ten_percent)
     end
     label { "10% off" }
   end

data/lib/solidus_friendly_promotions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  VERSION = "1.0.1"
+  VERSION = "1.9.0"
 end

data/lib/tasks/solidus_friendly_promotions/migrate_adjustments.rake

@@ -2,13 +2,13 @@
 
 namespace :solidus_friendly_promotions do
   namespace :migrate_adjustments do
-    desc "Migrate adjustments with Spree::PromotionAction sources to SolidusFriendlyPromotions::PromotionAction sources"
+    desc "Migrate adjustments with Spree::Benefit sources to SolidusFriendlyPromotions::Benefit sources"
     task up: :environment do
       require "solidus_friendly_promotions/migrate_adjustments"
       SolidusFriendlyPromotions::MigrateAdjustments.up
     end
 
-    desc "Migrate adjustments with SolidusFriendlyPromotions::PromotionAction sources to Spree::PromotionAction sources"
+    desc "Migrate adjustments with SolidusFriendlyPromotions::Benefit sources to Spree::Benefit sources"
     task down: :environment do
       require "solidus_friendly_promotions/migrate_adjustments"
       SolidusFriendlyPromotions::MigrateAdjustments.down

data/solidus_friendly_promotions.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary = "A replacement for Solidus' promotion system"
   spec.description = "Experimental replacement for the promotion system in Solidus"
-  spec.homepage = "https://github.com/solidusio-contrib/solidus_friendly_promotions#readme"
+  spec.homepage = "https://github.com/friendlycart/solidus_friendly_promotions#readme"
   spec.license = "BSD-3-Clause"
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "solidus_core", [">= 4.0.0", "< 5"]
+  spec.add_dependency "solidus_core", [">= 4.0.0", "< 4.4"]
   spec.add_dependency "solidus_support", "~> 0.5"
   spec.add_dependency "turbo-rails", "~> 1.4"
   spec.add_dependency "stimulus-rails", "~> 1.2"