solidus_friendly_promotions 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c80d1d515ec8f0e3b4a5742c3715d92394e054b7b53bc41df7b8ba0c0532824
-  data.tar.gz: 2aa767f69a6df858b9ccf19cda5c65db70770feb3a087ca0fbc62f6d82ce4e37
+  metadata.gz: b1d63ce9c998edebedc88fa30880ca469075882379c83e7d8b6400422b1c788a
+  data.tar.gz: b7baf6e466a970deb57e03c73ebcb138124fbe5df6fb34fd969d78e2f8ddfc4b
 SHA512:
-  metadata.gz: 80d3369aed9485a308424965906944f8ccc10159fd125da74a1f5446866727c6b8df986df7c13d0bceac1a8e24a191383ac18bc011c7fd7962ca03f3168ec1cf
-  data.tar.gz: 2dfd860061b46abd2324e86cc4e3bd89a8627b57097484c121fa4bc7282c7a976f7472b3f2033df2dddc5daf85f2af060bb6531ff9080f2321ae7b4a0bdafc69
+  metadata.gz: 86b3fb7b6c95683987c2dc421e4d9d06c7ef5893e4d30dcf0b9bfde07ba0e940f1e7190fc991f0cfbc012263263fd5db40441543b4edab3ef6114c5958341f19
+  data.tar.gz: ffd6bfbd56c2a0a0f64bc5f00dbc9f332c9c929ab004e675347d500a650a93f952d37d8014a59e3f6a26bd2b0bd1b4fcf156ced24a0199e4f4056e38ae17029a

data/.circleci/config.yml

@@ -21,7 +21,6 @@ jobs:
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/run-tests-solidus-main
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
@@ -31,7 +30,6 @@ jobs:
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/run-tests-solidus-main
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
@@ -41,7 +39,6 @@ jobs:
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/run-tests-solidus-main
 workflows:
   Run specs on supported Solidus versions:
     jobs:

data/CHANGELOG.md

@@ -1,11 +1,21 @@
 # Changelog
 
-## [v1.9.0](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.9.0) (2024-06-13)
+## [v1.9.2](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.9.2) (2024-06-28)
 
-[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.1...v1.9.0)
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.9.1...v1.9.2)
+
+## [v1.9.1](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.9.1) (2024-06-28)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.9.0...v1.9.1)
 
 **Merged pull requests:**
 
+- Fix specs after solidus merges [\#132](https://github.com/friendlycart/solidus_friendly_promotions/pull/132) ([mamhoff](https://github.com/mamhoff))
+- Use ActiveRecord::Migration\[7.0\] [\#131](https://github.com/friendlycart/solidus_friendly_promotions/pull/131) ([mamhoff](https://github.com/mamhoff))
+- Split rails\_helper and spec\_helper [\#126](https://github.com/friendlycart/solidus_friendly_promotions/pull/126) ([mamhoff](https://github.com/mamhoff))
+- Use single-file dummy app from Solidus core [\#124](https://github.com/friendlycart/solidus_friendly_promotions/pull/124) ([mamhoff](https://github.com/mamhoff))
+- Allow Turbo 2.x, but fix its issues [\#122](https://github.com/friendlycart/solidus_friendly_promotions/pull/122) ([mamhoff](https://github.com/mamhoff))
+- Miscellaneous spec fixes [\#121](https://github.com/friendlycart/solidus_friendly_promotions/pull/121) ([mamhoff](https://github.com/mamhoff))
 - Documentation updates [\#116](https://github.com/friendlycart/solidus_friendly_promotions/pull/116) ([mamhoff](https://github.com/mamhoff))
 - Fix homepage path in gemspec [\#115](https://github.com/friendlycart/solidus_friendly_promotions/pull/115) ([pelargir](https://github.com/pelargir))
 - Use Bootstrap cards for admin UI [\#114](https://github.com/friendlycart/solidus_friendly_promotions/pull/114) ([mamhoff](https://github.com/mamhoff))
@@ -15,6 +25,10 @@
 - Rules per action [\#110](https://github.com/friendlycart/solidus_friendly_promotions/pull/110) ([mamhoff](https://github.com/mamhoff))
 - Promotion advertiser [\#109](https://github.com/friendlycart/solidus_friendly_promotions/pull/109) ([mamhoff](https://github.com/mamhoff))
 
+## [v1.9.0](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.9.0) (2024-06-13)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.1...v1.9.0)
+
 ## [v1.0.1](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.1) (2024-05-07)
 
 [Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0...v1.0.1)

data/Gemfile

@@ -26,6 +26,8 @@ when "postgresql"
 else
   gem "sqlite3", "~> 1.3"
 end
+# Fix for Ruby 3.3.3 packaging bug
+gem "net-pop", github: "ruby/net-pop"
 
 gemspec
 

data/Rakefile

@@ -1,7 +1,18 @@
 # frozen_string_literal: true
 
+require "rubygems"
+require "rake"
+require "rake/testtask"
+require "rspec/core/rake_task"
+require "spree/testing_support/dummy_app/rake_tasks"
 require "bundler/gem_tasks"
-require "solidus_dev_support/rake_tasks"
-SolidusDevSupport::RakeTasks.install
 
-task default: "extension:specs"
+RSpec::Core::RakeTask.new
+task default: :spec
+
+DummyApp::RakeTasks.new(
+  gem_root: File.dirname(__FILE__),
+  lib_name: "solidus_friendly_promotions"
+)
+
+task test_app: "db:reset"

data/app/jobs/solidus_friendly_promotions/promotion_code_batch_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  class PromotionCodeBatchJob < ApplicationJob
+  class PromotionCodeBatchJob < ActiveJob::Base
     queue_as :default
 
     def perform(promotion_code_batch)

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

@@ -18,6 +18,10 @@ module SolidusFriendlyPromotions
 
       preference :match_policy, :string, default: MATCH_POLICIES.first
 
+      def preload_relations
+        [:products]
+      end
+
       def eligible?(line_item, _options = {})
         order_includes_product = product_ids.include?(line_item.variant.product_id)
         success = inverse? ? !order_includes_product : order_includes_product

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

@@ -15,6 +15,10 @@ module SolidusFriendlyPromotions
 
       preference :match_policy, :string, default: MATCH_POLICIES.first
 
+      def preload_relations
+        [:taxons]
+      end
+
       def eligible?(line_item, _options = {})
         found = Spree::Classification.where(
           product_id: line_item.variant.product_id,

data/app/views/solidus_friendly_promotions/admin/promotions/_table_filter.html.erb

@@ -9,33 +9,33 @@
         <div class="col-4">
           <div class="form-group">
             <%= label_tag :q_name_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:name) %>
-            <%= f.text_field :name_cont, tabindex: 1 %>
+            <%= f.text_field :name_cont, tabindex: 1, class: "w-100" %>
           </div>
         </div>
 
         <div class="col-4">
           <div class="form-group">
             <%= label_tag :q_customer_label_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:customer_label) %>
-            <%= f.text_field :customer_label_cont, tabindex: 1 %>
+            <%= f.text_field :customer_label_cont, tabindex: 1, class: "w-100" %>
           </div>
         </div>
 
         <div class="col-2">
           <div class="form-group">
             <%= label_tag :q_codes_value_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:code) %>
-            <%= f.text_field :codes_value_cont, tabindex: 1 %>
+            <%= f.text_field :codes_value_cont, tabindex: 1, class: "w-100" %>
           </div>
         </div>
 
         <div class="col-2">
           <div class="form-group">
             <%= label_tag :q_path_cont, SolidusFriendlyPromotions::Promotion.human_attribute_name(:path) %>
-            <%= f.text_field :path_cont, tabindex: 1 %>
+            <%= f.text_field :path_cont, tabindex: 1, class: "w-100" %>
           </div>
         </div>
 
         <div class="col-2">
-          <div class="date-range-filter field">
+          <div class="date-range-filter form-group">
             <%= label_tag :q_active, SolidusFriendlyPromotions::Promotion.human_attribute_name(:active) %>
             <%= f.text_field :active, value: params[:q][:active],
                              class: 'datepicker datepicker-from fullwidth',

data/db/migrate/20240409093831_rename_promotion_rules_to_conditions.rb

@@ -0,0 +1,48 @@
+class RenamePromotionRulesToConditions < ActiveRecord::Migration[7.0]
+  def up
+    rename_table :friendly_promotion_rules, :friendly_conditions
+    rename_table :friendly_promotion_rules_stores, :friendly_condition_stores
+    rename_table :friendly_promotion_rules_taxons, :friendly_condition_taxons
+    rename_table :friendly_promotion_rules_users, :friendly_condition_users
+    rename_table :friendly_products_promotion_rules, :friendly_condition_products
+    rename_column :friendly_condition_stores, :promotion_rule_id, :condition_id
+    rename_column :friendly_condition_taxons, :promotion_rule_id, :condition_id
+    rename_column :friendly_condition_users, :promotion_rule_id, :condition_id
+    rename_column :friendly_condition_products, :promotion_rule_id, :condition_id
+    solidus_sql = <<~SQL
+      UPDATE friendly_conditions
+      SET type = REPLACE(type, 'SolidusFriendlyPromotions::Rules', 'SolidusFriendlyPromotions::Conditions')
+    SQL
+    execute(solidus_sql)
+
+    cs_sql = <<~SQL
+      UPDATE friendly_conditions
+      SET type = REPLACE(type, 'Cs::Promotion::Rules', 'Cs::Promotion::Conditions')
+    SQL
+    execute(cs_sql)
+  end
+
+  def down
+    rename_table :friendly_conditions, :friendly_promotion_rules
+    rename_table :friendly_condition_stores, :friendly_promotion_rules_stores
+    rename_table :friendly_condition_taxons, :friendly_promotion_rules_taxons
+    rename_table :friendly_condition_users, :friendly_promotion_rules_users
+    rename_table :friendly_condition_products, :friendly_products_promotion_rules
+    rename_column :friendly_promotion_rules_stores, :condition_id, :promotion_rule_id
+    rename_column :friendly_promotion_rules_taxons, :condition_id, :promotion_rule_id
+    rename_column :friendly_promotion_rules_users, :condition_id, :promotion_rule_id
+    rename_column :friendly_products_promotion_rules, :condition_id, :promotion_rule_id
+
+    solidus_sql = <<~SQL
+      UPDATE friendly_promotion_rules
+      SET type = REPLACE(type, 'SolidusFriendlyPromotions::Conditions', 'SolidusFriendlyPromotions::Rules')
+    SQL
+    execute(solidus_sql)
+
+    cs_sql = <<~SQL
+      UPDATE friendly_promotion_rules
+      SET type = REPLACE(type, 'Cs::Promotion::Conditions', 'Cs::Promotion::Rules')
+    SQL
+    execute(cs_sql)
+  end
+end

data/db/migrate/20240506142650_rename_friendly_promotion_actions_to_friendly_benefits.rb

@@ -0,0 +1,35 @@
+class RenameFriendlyPromotionActionsToFriendlyBenefits < ActiveRecord::Migration[6.1]
+  def up
+    rename_table :friendly_promotion_actions, :friendly_benefits
+    rename_column :spree_line_items, :managed_by_order_action_id, :managed_by_order_benefit_id
+    rename_column :friendly_shipping_rate_discounts, :promotion_action_id, :benefit_id
+    update_benefit_type_sql = <<~SQL
+      UPDATE friendly_benefits
+      SET type = REPLACE(type, 'SolidusFriendlyPromotions::Actions', 'SolidusFriendlyPromotions::Benefits')
+    SQL
+    execute(update_benefit_type_sql)
+    update_adjustment_source_type_sql = <<~SQL
+      UPDATE spree_adjustments
+      SET source_type = REPLACE(source_type, 'SolidusFriendlyPromotions::PromotionAction', 'SolidusFriendlyPromotions::Benefit')
+      WHERE source_type = 'SolidusFriendlyPromotions::PromotionAction'
+    SQL
+    execute(update_adjustment_source_type_sql)
+  end
+
+  def down
+    rename_table :friendly_benefits, :friendly_promotion_actions
+    rename_column :spree_line_items, :managed_by_order_benefit_id, :managed_by_order_action_id
+    rename_column :friendly_shipping_rate_discounts, :benefit_id, :promotion_action_id
+    update_benefit_type_sql = <<~SQL
+      UPDATE friendly_promotion_actions
+      SET type = REPLACE(type, 'SolidusFriendlyPromotions::Benefits', 'SolidusFriendlyPromotions::Actions')
+    SQL
+    execute(update_benefit_type_sql)
+    update_adjustment_source_type_sql = <<~SQL
+      UPDATE spree_adjustments
+      SET source_type = REPLACE(source_type, 'SolidusFriendlyPromotions::Benefit', 'SolidusFriendlyPromotions::PromotionAction')
+      WHERE source_type = 'SolidusFriendlyPromotions::Benefit'
+    SQL
+    execute(update_adjustment_source_type_sql)
+  end
+end

data/db/migrate/20240506142651_change_calculable_types.rb

@@ -0,0 +1,17 @@
+class ChangeCalculableTypes < ActiveRecord::Migration[6.1]
+  def up
+    sql = <<~SQL
+      UPDATE spree_calculators
+      SET calculable_type = REPLACE(calculable_type, 'SolidusFriendlyPromotions::PromotionAction', 'SolidusFriendlyPromotions::Benefit')
+    SQL
+    execute(sql)
+  end
+
+  def down
+    sql = <<~SQL
+      UPDATE spree_calculators
+      SET calculable_type = REPLACE(calculable_type, 'SolidusFriendlyPromotions::Benefit', 'SolidusFriendlyPromotions::PromotionAction')
+    SQL
+    execute(sql)
+  end
+end

data/db/migrate/20240508080834_add_benefit_reference_to_conditions.rb

@@ -0,0 +1,29 @@
+class AddBenefitReferenceToConditions < ActiveRecord::Migration[6.1]
+  def up
+    remove_foreign_key :friendly_conditions, :friendly_promotions
+    change_column :friendly_conditions, :promotion_id, :integer, null: true
+
+    add_reference :friendly_conditions, :benefit, index: {name: :condition}, null: true, foreign_key: {to_table: :friendly_benefits}
+
+    SolidusFriendlyPromotions::Condition.reset_column_information
+
+    SolidusFriendlyPromotions::Benefit.find_each do |benefit|
+      SolidusFriendlyPromotions::Condition.where(promotion_id: benefit.promotion_id).each do |condition|
+        condition.dup.tap do |new_condition|
+          new_condition.preload_relations.each do |relation|
+            new_condition.send(:"#{relation}=", condition.send(relation).dup)
+          end
+          new_condition.benefit = benefit
+          new_condition.save!
+        end
+        condition.destroy!
+      end
+    end
+  end
+
+  def down
+    SolidusFriendlyPromotions::Condition.where.not(benefit_id: nil).delete_all
+    change_column :friendly_conditions, :promotion_id, :integer, null: true
+    add_foreign_key :friendly_conditions, :friendly_promotions, column: :promotion_id
+  end
+end

data/db/migrate/20240508131514_remove_conditions_promotion_id.rb

@@ -0,0 +1,5 @@
+class RemoveConditionsPromotionId < ActiveRecord::Migration[6.1]
+  def up
+    remove_column :friendly_conditions, :promotion_id
+  end
+end

data/db/migrate/20240612114132_update_column_comments_for_conditions.rb

@@ -1,4 +1,4 @@
-class UpdateColumnCommentsForConditions < ActiveRecord::Migration[7.1]
+class UpdateColumnCommentsForConditions < ActiveRecord::Migration[7.0]
   def up
     if connection.supports_comments?
       change_table_comment(:friendly_conditions, friendly_conditions_table_comment)

data/db/migrate/20240612115209_update_column_comments_for_condition_stores.rb

@@ -1,4 +1,4 @@
-class UpdateColumnCommentsForConditionStores < ActiveRecord::Migration[7.1]
+class UpdateColumnCommentsForConditionStores < ActiveRecord::Migration[7.0]
   def up
     if connection.supports_comments?
       change_table_comment(:friendly_condition_stores, friendly_condition_stores_table_comment)

data/db/migrate/20240612115749_update_column_comments_for_condition_products.rb

@@ -1,4 +1,4 @@
-class UpdateColumnCommentsForConditionProducts < ActiveRecord::Migration[7.1]
+class UpdateColumnCommentsForConditionProducts < ActiveRecord::Migration[7.0]
   def up
     if connection.supports_comments?
       change_table_comment(:friendly_condition_products, friendly_condition_products_table_comment)

data/db/migrate/20240612120411_update_column_comments_for_condition_taxons.rb

@@ -1,4 +1,4 @@
-class UpdateColumnCommentsForConditionTaxons < ActiveRecord::Migration[7.1]
+class UpdateColumnCommentsForConditionTaxons < ActiveRecord::Migration[7.0]
   def up
     if connection.supports_comments?
       change_table_comment(:friendly_condition_taxons, friendly_condition_taxons_table_comment)

data/db/migrate/20240612121049_update_column_comments_for_condition_users.rb

@@ -1,4 +1,4 @@
-class UpdateColumnCommentsForConditionUsers < ActiveRecord::Migration[7.1]
+class UpdateColumnCommentsForConditionUsers < ActiveRecord::Migration[7.0]
   def up
     if connection.supports_comments?
       change_table_comment(:friendly_condition_users, friendly_condition_users_table_comment)

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

@@ -4,10 +4,6 @@
 Spree::Config.order_contents_class = "SolidusFriendlyPromotions::SimpleOrderContents"
 Spree::Config.promotion_adjuster_class = "SolidusFriendlyPromotions::FriendlyPromotionAdjuster"
 
-Rails.application.config.to_prepare do |config|
-  Spree::Order.line_item_comparison_hooks << :free_from_order_benefit?
-end
-
 # Replace the promotions menu from core with ours
 Spree::Backend::Config.configure do |config|
   config.menu_items = config.menu_items.map do |item|
@@ -60,72 +56,5 @@ Spree::Backend::Config.configure do |config|
 end
 
 SolidusFriendlyPromotions.configure do |config|
-  # This class chooses which promotion should apply to a line item in case
-  # that more than one promotion is eligible.
-  config.discount_chooser_class = "SolidusFriendlyPromotions::FriendlyPromotionAdjuster::ChooseDiscounts"
-
-  # How many promotions should be displayed on the index page in the admin.
-  config.promotions_per_page = 25
-
-  config.promotion_calculators = SolidusFriendlyPromotions::NestedClassSet.new(
-    "SolidusFriendlyPromotions::Benefits::AdjustShipment" => [
-      "SolidusFriendlyPromotions::Calculators::FlatRate",
-      "SolidusFriendlyPromotions::Calculators::FlexiRate",
-      "SolidusFriendlyPromotions::Calculators::Percent",
-      "SolidusFriendlyPromotions::Calculators::TieredFlatRate",
-      "SolidusFriendlyPromotions::Calculators::TieredPercent",
-      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
-    ],
-    "SolidusFriendlyPromotions::Benefits::AdjustLineItem" => [
-      "SolidusFriendlyPromotions::Calculators::DistributedAmount",
-      "SolidusFriendlyPromotions::Calculators::FlatRate",
-      "SolidusFriendlyPromotions::Calculators::FlexiRate",
-      "SolidusFriendlyPromotions::Calculators::Percent",
-      "SolidusFriendlyPromotions::Calculators::TieredFlatRate",
-      "SolidusFriendlyPromotions::Calculators::TieredPercent",
-      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
-    ],
-    "SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups" => [
-      "SolidusFriendlyPromotions::Calculators::FlatRate",
-      "SolidusFriendlyPromotions::Calculators::Percent",
-      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
-    ],
-    "SolidusFriendlyPromotions::Benefits::CreateDiscountedItem" => [
-      "SolidusFriendlyPromotions::Calculators::FlatRate",
-      "SolidusFriendlyPromotions::Calculators::Percent",
-      "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
-    ]
-  )
-
-  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_conditions = [
-    "SolidusFriendlyPromotions::Conditions::LineItemOptionValue",
-    "SolidusFriendlyPromotions::Conditions::LineItemProduct",
-    "SolidusFriendlyPromotions::Conditions::LineItemTaxon"
-  ]
-  config.shipment_conditions = [
-    "SolidusFriendlyPromotions::Conditions::ShippingMethod"
-  ]
-
-  config.actions = [
-    "SolidusFriendlyPromotions::Benefits::AdjustLineItem",
-    "SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups",
-    "SolidusFriendlyPromotions::Benefits::AdjustShipment",
-    "SolidusFriendlyPromotions::Benefits::CreateDiscountedItem"
-  ]
+  # Add your custom configuration here
 end

data/lib/solidus_friendly_promotions/configuration.rb

@@ -1,31 +1,98 @@
 # frozen_string_literal: true
 
-require "spree/core/environment_extension"
+require "solidus_friendly_promotions/environment_extension"
 
 module SolidusFriendlyPromotions
   class Configuration < Spree::Preferences::Configuration
     attr_accessor :sync_order_promotions
     attr_accessor :recalculate_complete_orders
-    attr_accessor :promotion_calculators
 
     def initialize
       @sync_order_promotions = true
       @recalculate_complete_orders = true
-      @promotion_calculators = NestedClassSet.new
     end
 
-    include Spree::Core::EnvironmentExtension
+    include SolidusFriendlyPromotions::EnvironmentExtension
 
-    add_class_set :line_item_discount_calculators
-    add_class_set :shipment_discount_calculators
+    class_name_attribute :order_adjuster_class, default: "SolidusFriendlyPromotions::FriendlyPromotionAdjuster"
 
-    add_class_set :order_conditions
-    add_class_set :line_item_conditions
-    add_class_set :shipment_conditions
+    class_name_attribute :coupon_code_handler_class, default: "SolidusFriendlyPromotions::PromotionHandler::Coupon"
 
-    add_class_set :actions
+    # Allows providing a different promotion advertiser.
+    # @!attribute [rw] advertiser_class
+    # @see Spree::NullPromotionAdvertiser
+    # @return [Class] an object that conforms to the API of
+    #   the standard promotion advertiser class
+    #   Spree::NullPromotionAdvertiser.
+    class_name_attribute :advertiser_class, default: "SolidusFriendlyPromotions::PromotionAdvertiser"
+
+    # 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: [
+      "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"
+    ]
+
+    add_class_set :line_item_conditions, default: [
+      "SolidusFriendlyPromotions::Conditions::LineItemOptionValue",
+      "SolidusFriendlyPromotions::Conditions::LineItemProduct",
+      "SolidusFriendlyPromotions::Conditions::LineItemTaxon"
+    ]
+    add_class_set :shipment_conditions, default: [
+      "SolidusFriendlyPromotions::Conditions::ShippingMethod"
+    ]
+
+    add_class_set :actions, default: [
+      "SolidusFriendlyPromotions::Benefits::AdjustLineItem",
+      "SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups",
+      "SolidusFriendlyPromotions::Benefits::AdjustShipment",
+      "SolidusFriendlyPromotions::Benefits::CreateDiscountedItem"
+    ]
+
+    add_nested_class_set :promotion_calculators, default: {
+      "SolidusFriendlyPromotions::Benefits::AdjustShipment" => [
+        "SolidusFriendlyPromotions::Calculators::FlatRate",
+        "SolidusFriendlyPromotions::Calculators::FlexiRate",
+        "SolidusFriendlyPromotions::Calculators::Percent",
+        "SolidusFriendlyPromotions::Calculators::TieredFlatRate",
+        "SolidusFriendlyPromotions::Calculators::TieredPercent",
+        "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
+      ],
+      "SolidusFriendlyPromotions::Benefits::AdjustLineItem" => [
+        "SolidusFriendlyPromotions::Calculators::DistributedAmount",
+        "SolidusFriendlyPromotions::Calculators::FlatRate",
+        "SolidusFriendlyPromotions::Calculators::FlexiRate",
+        "SolidusFriendlyPromotions::Calculators::Percent",
+        "SolidusFriendlyPromotions::Calculators::TieredFlatRate",
+        "SolidusFriendlyPromotions::Calculators::TieredPercent",
+        "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
+      ],
+      "SolidusFriendlyPromotions::Benefits::AdjustLineItemQuantityGroups" => [
+        "SolidusFriendlyPromotions::Calculators::FlatRate",
+        "SolidusFriendlyPromotions::Calculators::Percent",
+        "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
+      ],
+      "SolidusFriendlyPromotions::Benefits::CreateDiscountedItem" => [
+        "SolidusFriendlyPromotions::Calculators::FlatRate",
+        "SolidusFriendlyPromotions::Calculators::Percent",
+        "SolidusFriendlyPromotions::Calculators::TieredPercentOnEligibleItemQuantity"
+      ]
+    }
 
-    class_name_attribute :discount_chooser_class, default: "SolidusFriendlyPromotions::DiscountChooser"
+    class_name_attribute :discount_chooser_class, default: "SolidusFriendlyPromotions::FriendlyPromotionAdjuster::ChooseDiscounts"
     class_name_attribute :promotion_code_batch_mailer_class,
       default: "SolidusFriendlyPromotions::PromotionCodeBatchMailer"
 

data/lib/solidus_friendly_promotions/engine.rb

@@ -20,6 +20,12 @@ module SolidusFriendlyPromotions
       app.config.assets.precompile << "solidus_friendly_promotions/manifest.js"
     end
 
+    initializer "solidus_promotions.spree_config", after: "spree.load_config_initializers" do
+      Rails.application.config.to_prepare do
+        Spree::Order.line_item_comparison_hooks << :free_from_order_benefit?
+      end
+    end
+
     initializer "solidus_friendly_promotions.importmap" do |app|
       SolidusFriendlyPromotions.importmap.draw(Engine.root.join("config", "importmap.rb"))
 

data/lib/solidus_friendly_promotions/environment_extension.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "spree/core/class_constantizer"
+require "solidus_friendly_promotions/nested_class_set"
+
+module SolidusFriendlyPromotions
+  module EnvironmentExtension
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def add_class_set(name, default: [])
+        define_method(name) do
+          set = instance_variable_get(:"@#{name}")
+          set ||= send(:"#{name}=", default)
+          set
+        end
+
+        define_method(:"#{name}=") do |klasses|
+          set = Spree::Core::ClassConstantizer::Set.new
+          set.concat(klasses)
+          instance_variable_set(:"@#{name}", set)
+        end
+      end
+
+      def add_nested_class_set(name, default: {})
+        define_method(name) do
+          set = instance_variable_get(:"@#{name}")
+          set ||= send(:"#{name}=", default)
+          set
+        end
+
+        define_method(:"#{name}=") do |hash|
+          set = SolidusFriendlyPromotions::NestedClassSet.new(hash)
+          instance_variable_set(:"@#{name}", set)
+        end
+      end
+    end
+  end
+end

data/lib/solidus_friendly_promotions/version.rb

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

data/solidus_friendly_promotions.gemspec

@@ -30,11 +30,12 @@ Gem::Specification.new do |spec|
 
   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 "turbo-rails", ">= 1.4"
   spec.add_dependency "stimulus-rails", "~> 1.2"
   spec.add_dependency "importmap-rails", "~> 1.2"
   spec.add_dependency "ransack-enum", "~> 1.0"
   spec.add_development_dependency "rspec-activemodel-mocks", "~> 1.0"
+  spec.add_development_dependency "rspec-retry"
   spec.add_development_dependency "shoulda-matchers", "~> 5.3"
   spec.add_development_dependency "solidus_dev_support", "~> 2.6"
   spec.add_development_dependency "standard", "~> 1.31"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_friendly_promotions
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -48,14 +48,14 @@ dependencies:
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -384,10 +398,11 @@ files:
 - db/migrate/20231104135812_add_managed_by_order_action_to_line_items.rb
 - db/migrate/20240124104855_add_deleted_at_to_promotions.rb
 - db/migrate/20240125102050_drop_deleted_at_from_promotion_actions.rb
-- db/migrate/20240409093831_add_action_reference_to_rules.rb
-- db/migrate/20240506142650_remove_promotion_rules_promotion_id.rb
-- db/migrate/20240508080834_rename_promotion_rules_to_conditions.rb
-- db/migrate/20240508131514_rename_friendly_promotion_actions_to_friendly_benefits.rb
+- db/migrate/20240409093831_rename_promotion_rules_to_conditions.rb
+- db/migrate/20240506142650_rename_friendly_promotion_actions_to_friendly_benefits.rb
+- db/migrate/20240506142651_change_calculable_types.rb
+- db/migrate/20240508080834_add_benefit_reference_to_conditions.rb
+- db/migrate/20240508131514_remove_conditions_promotion_id.rb
 - db/migrate/20240612113608_update_column_comments_for_benefits.rb
 - db/migrate/20240612114132_update_column_comments_for_conditions.rb
 - db/migrate/20240612115209_update_column_comments_for_condition_stores.rb
@@ -399,6 +414,7 @@ files:
 - lib/solidus_friendly_promotions.rb
 - lib/solidus_friendly_promotions/configuration.rb
 - lib/solidus_friendly_promotions/engine.rb
+- lib/solidus_friendly_promotions/environment_extension.rb
 - lib/solidus_friendly_promotions/migrate_adjustments.rb
 - lib/solidus_friendly_promotions/migrate_order_promotions.rb
 - lib/solidus_friendly_promotions/nested_class_set.rb

data/db/migrate/20240409093831_add_action_reference_to_rules.rb

@@ -1,34 +0,0 @@
-class AddActionReferenceToRules < ActiveRecord::Migration[7.0]
-  class LocalBenefit < ApplicationRecord
-    self.table_name = "friendly_promotion_actions"
-    has_many :actions, class_name: "SolidusFriendlyPromotions::Condition", foreign_key: :action_id
-  end
-
-  def up
-    remove_foreign_key :friendly_promotion_rules, :friendly_promotions
-    change_column :friendly_promotion_rules, :promotion_id, :integer, null: true
-
-    add_reference :friendly_promotion_rules, :action, index: {name: :rule}, null: true, foreign_key: {to_table: :friendly_promotion_actions}
-
-    SolidusFriendlyPromotions::Condition.reset_column_information
-
-    LocalBenefit.find_each do |action|
-      SolidusFriendlyPromotions::Condition.where(promotion_id: action.promotion_id).each do |rule|
-        rule.dup.tap do |new_rule|
-          new_rule.preload_relations.each do |relation|
-            new_rule.send(:"#{relation}=", rule.send(relation).dup)
-          end
-          new_rule.action = action
-          new_rule.save!
-        end
-        rule.destroy!
-      end
-    end
-  end
-
-  def down
-    SolidusFriendlyPromotions::Condition.where.not(action_id: nil).delete_all
-    change_column :friendly_promotion_rules, :promotion_id, :integer, null: true
-    add_foreign_key :friendly_promotion_rules, :friendly_promotions, column: :promotion_id
-  end
-end

data/db/migrate/20240506142650_remove_promotion_rules_promotion_id.rb

@@ -1,5 +0,0 @@
-class RemovePromotionRulesPromotionId < ActiveRecord::Migration[7.1]
-  def up
-    remove_column :friendly_promotion_rules, :promotion_id
-  end
-end

data/db/migrate/20240508080834_rename_promotion_rules_to_conditions.rb

@@ -1,19 +0,0 @@
-class RenamePromotionRulesToConditions < ActiveRecord::Migration[7.1]
-  def change
-    rename_table :friendly_promotion_rules, :friendly_conditions
-    rename_table :friendly_promotion_rules_stores, :friendly_condition_stores
-    rename_table :friendly_promotion_rules_taxons, :friendly_condition_taxons
-    rename_table :friendly_promotion_rules_users, :friendly_condition_users
-    rename_table :friendly_products_promotion_rules, :friendly_condition_products
-    rename_column :friendly_condition_stores, :promotion_rule_id, :condition_id
-    rename_column :friendly_condition_taxons, :promotion_rule_id, :condition_id
-    rename_column :friendly_condition_users, :promotion_rule_id, :condition_id
-    rename_column :friendly_condition_products, :promotion_rule_id, :condition_id
-    sql = <<~SQL
-      UPDATE friendly_conditions
-      SET type = REPLACE(type, 'SolidusFriendlyPromotions::Rules', 'SolidusFriendlyPromotions::Conditions')
-    SQL
-
-    execute(sql)
-  end
-end

data/db/migrate/20240508131514_rename_friendly_promotion_actions_to_friendly_benefits.rb

@@ -1,19 +0,0 @@
-class RenameFriendlyPromotionActionsToFriendlyBenefits < ActiveRecord::Migration[7.1]
-  def change
-    rename_table :friendly_promotion_actions, :friendly_benefits
-    rename_column :friendly_conditions, :action_id, :benefit_id
-    rename_column :spree_line_items, :managed_by_order_action_id, :managed_by_order_benefit_id
-    rename_column :friendly_shipping_rate_discounts, :promotion_action_id, :benefit_id
-    update_benefit_type_sql = <<~SQL
-      UPDATE friendly_benefits
-      SET type = REPLACE(type, 'SolidusFriendlyPromotions::Actions', 'SolidusFriendlyPromotions::Benefits')
-    SQL
-    execute(update_benefit_type_sql)
-    update_adjustment_source_type_sql = <<~SQL
-      UPDATE spree_adjustments
-      SET source_type = REPLACE(source_type, 'SolidusFriendlyPromotions::Actions', 'SolidusFriendlyPromotions::Benefits')
-      WHERE source_type LIKE 'SolidusFriendlyPromotions::Actions%'
-    SQL
-    execute(update_adjustment_source_type_sql)
-  end
-end