solidus_friendly_promotions 1.0.0 → 1.9.0

data/bin/sandbox

@@ -43,12 +43,13 @@ if [ ! -d "sandbox" ]; then
   exit 1
 fi
 
-echo "~~~> Adding solidus (with i18n and authentication) and your gem to the Gemfile"
+echo "~~~> Adding solidus (with i18n) to the Gemfile"
 cd ./sandbox
 cat <<RUBY >> Gemfile
 gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH'
 gem 'rails-i18n'
 gem 'solidus_i18n'
+gem 'solidus_auth_devise'
 
 gem '$extension_name', path: '..'
 
@@ -63,9 +64,8 @@ unbundled bundle install --gemfile Gemfile
 
 unbundled bundle exec rake db:drop db:create
 
-unbundled bin/rails generate solidus:install \
+unbundled bundle exec rails generate solidus:install \
   --auto-accept \
-  --admin_preview=false \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations

data/config/importmap.rb

@@ -8,5 +8,7 @@ pin_all_from SolidusFriendlyPromotions::Engine.root.join("app/javascript/solidus
   under: "solidus_friendly_promotions/controllers"
 pin_all_from SolidusFriendlyPromotions::Engine.root.join("app/javascript/solidus_friendly_promotions/jquery"),
   under: "solidus_friendly_promotions/jquery"
+pin_all_from SolidusFriendlyPromotions::Engine.root.join("app/javascript/solidus_friendly_promotions/web_components"),
+  under: "solidus_friendly_promotions/web_components"
 
 pin "solidus_friendly_promotions", to: "solidus_friendly_promotions.js", preload: true

data/config/locales/en.yml

@@ -9,41 +9,50 @@ en:
         promotion_categories: Promotion Categories
         legacy_promotions: Legacy Promotions
         legacy_promotion_categories: Legacy Promotion Categories
+    hints:
+      solidus_friendly_promotions/promotion:
+        expires_at: This determines when the promotion expires. <br> If no value is specified, the promotion will never expire.
+        promo_code_will_be_disabled: Selecting this option, promo codes will be disabled for this promotion because all its conditions / benefits will be applied automatically to all orders.
+        starts_at: This determines when the promotion can be applied to orders. <br> If no value is specified, the promotion will be immediately available.
   solidus_friendly_promotions:
-    actions: Actions
+    hints:
+      solidus_friendly_promotions/benefit:
+        conditions: This is used to determine if the benefit should be applied.
+        type: This is the type of benefit that will be applied.
+        calculator: This is used to determine the promotional discount to be applied to an order, an item, or shipping charges.
+    benefits: Benefits
     adjustment_labels:
       line_item: "%{promotion} (%{promotion_customer_label})"
       shipment: "%{promotion} (%{promotion_customer_label})"
       shipping_rate: "%{promotion} (%{promotion_customer_label})"
     adjustment_type: Adjustment type
-    add_action: New Action
-    add_rule: New Rule
-    order_rules: Order Rules
-    line_item_rules: Line Item Rules
-    shipment_rules: Shipment Rules
-    line_item_actions: Line Item Actions
-    shipment_actions: Shipment Actions
-    order_actions: Order Actions
-    invalid_promotion_rule_level: Invalid Promotion Rule Level. Must be one of "order", "shipment", or "line_item"
-    invalid_promotion_action: Invalid promotion action.
-    invalid_promotion_rule: Invalid promotion rule.
+    add_benefit: Add Benefit
+    add_condition: Add Condition
+    order_conditions: Order Conditions
+    line_item_conditions: Line Item Conditions
+    shipment_conditions: Shipment Conditions
+    line_item_benefits: Line Item Benefits
+    shipment_benefits: Shipment Benefits
+    order_benefits: Order Benefits
+    invalid_benefit: Invalid promotion benefit.
+    invalid_condition: Invalid promotion condition.
     create_promotion_code: Create promotion code
     current_promotion_usage: 'Current Usage: %{count}'
-    discount_rules: Promotion Rules
+    discount_conditions: Promotion Conditions
     download_promotion_codes_list: Download codes list
     new_promotion: New Promotion
     new_promotion_category: New Promotion Category
     new_promotion_code_batch: New Promotion Code Batch
     number_of_codes: "%{count} codes"
     legacy_promotions: Legacy Promotions
-    no_rules_added: No Rules Added
+    no_conditions_added: No Conditions Added
     promotion_successfully_created: Promotion has been successfully created!
     promotion_total_changed_before_complete: One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again.
     promotion_code_batches:
       finished: Finished
       errored: Errored
     view_promotion_codes_list: View codes list
-    promotion_rules:
+    conditions:
       line_item_product:
         match_policies:
           include: Line item's product is one of the chosen products
@@ -52,9 +61,17 @@ en:
         match_policies:
           include: Line item's product has one of the chosen taxons
           exclude: Line item's product does not have one of the chosen taxons
-    hints:
-      solidus_friendly_promotions/calculator:
-        promotions: This is used to determine the promotional discount to be applied to an order, an item, or shipping charges.
+    item_total_condition:
+      operators:
+        gt: greater than
+        gte: greater than or equal to
+    user_condition:
+      choose_users: Choose Users
+    user_role_condition:
+      choose_roles: Choose Roles
+      label: User must contain %{select} of these roles
+      match_all: all
+      match_any: at least one
     coupon_code: Coupon code
     eligibility_results:
       coupon_code_applied: The coupon code was successfully applied to your order.
@@ -67,50 +84,50 @@ en:
       coupon_code_not_found: The coupon code you entered doesn't exist. Please try again.
       coupon_code_not_present: The coupon code you are trying to remove is not present on this order.
       coupon_code_unknown_error: This coupon code could not be applied to the cart at this time.
-      solidus_friendly_promotions/rules/first_order:
+      solidus_friendly_promotions/conditions/first_order:
         not_first_order: This coupon code can only be applied to your first order.
-      solidus_friendly_promotions/rules/first_repeat_purchase_since:
-      solidus_friendly_promotions/rules/item_total:
+      solidus_friendly_promotions/conditions/first_repeat_purchase_since:
+      solidus_friendly_promotions/conditions/item_total:
         item_total_doesnt_match_with_operator: This coupon code can't be applied to orders %{operator} %{amount}.
         item_total_less_than: This coupon code can't be applied to orders less than %{amount}.
         item_total_less_than_or_equal: This coupon code can't be applied to orders less than or equal to %{amount}.
-      solidus_friendly_promotions/rules/discounted_item_total:
+      solidus_friendly_promotions/conditions/discounted_item_total:
         item_total_doesnt_match_with_operator: This coupon code can't be applied to orders %{operator} %{amount}.
         item_total_less_than: This coupon code can't be applied to orders less than %{amount}.
         item_total_less_than_or_equal: This coupon code can't be applied to orders less than or equal to %{amount}.
-      solidus_friendly_promotions/rules/landing_page:
-      solidus_friendly_promotions/rules/nth_order:
-      solidus_friendly_promotions/rules/one_use_per_user:
+      solidus_friendly_promotions/conditions/landing_page:
+      solidus_friendly_promotions/conditions/nth_order:
+      solidus_friendly_promotions/conditions/one_use_per_user:
         no_user_specified: You need to login before applying this coupon code.
         limit_once_per_user: This coupon code can only be used once per user.
-      solidus_friendly_promotions/rules/option_value:
-      solidus_friendly_promotions/rules/line_item_option_value:
-      solidus_friendly_promotions/rules/product:
+      solidus_friendly_promotions/conditions/option_value:
+      solidus_friendly_promotions/conditions/line_item_option_value:
+      solidus_friendly_promotions/conditions/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.
-      solidus_friendly_promotions/rules/line_item_product:
+      solidus_friendly_promotions/conditions/line_item_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.
-      solidus_friendly_promotions/rules/taxon:
+      solidus_friendly_promotions/conditions/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.
-      solidus_friendly_promotions/rules/line_item_taxon:
+      solidus_friendly_promotions/conditions/line_item_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.
-      solidus_friendly_promotions/rules/user:
+      solidus_friendly_promotions/conditions/user:
         no_user_specified: You need to login before applying this coupon code.
-      solidus_friendly_promotions/rules/user_logged_in:
+      solidus_friendly_promotions/conditions/user_logged_in:
         no_user_specified: You need to login before applying this coupon code.
-      solidus_friendly_promotions/rules/user_role:
-      solidus_friendly_promotions/rules/minimum_quantity:
+      solidus_friendly_promotions/conditions/user_role:
+      solidus_friendly_promotions/conditions/minimum_quantity:
         quantity_less_than_minimum:
           one: "You need to add a least 1 applicable item to your order."
           other: "You need to add a least %{count} applicable items to your order."
-    product_rule:
+    product_condition:
       choose_products: Choose products
       label: Order must contain %{select} these products
       match_all: all of
@@ -120,19 +137,23 @@ en:
       product_source:
         group: From product group
         manual: Manually choose
-    taxon_rule:
+    taxon_condition:
       choose_taxons: Choose taxons
       label: Order must contain %{select} of these taxons
       match_all: all
       match_any: at least one
       match_none: none
+    line_item_option_value_condition:
+      add_product: Add product
+    option_value_condition:
+      add_product: Add product
     crud:
       add: Add
       destroy: Delete
       update: Update
     admin:
       promotions:
-        actions:
+        benefits:
           calculator_label: Calculated by
         activations_edit:
           auto: All orders will attempt to use this promotion
@@ -147,8 +168,9 @@ en:
           expires_at_placeholder: Never
           general: General
           starts_at_placeholder: Immediately
+          codes_present: This promotion has promotion codes defined. You cannot select the apply automatically option.
         edit:
-          order_rules: Order Rules
+          order_conditions: Order Conditions
         calculator:
           add_tier: Add tier
       promotion_status:
@@ -165,34 +187,34 @@ en:
         subject: Promotion code batch finished
   activerecord:
     models:
-      solidus_friendly_promotions/actions/adjust_shipment: Discount matching shipments
-      solidus_friendly_promotions/actions/adjust_line_item: Discount matching line items
-      solidus_friendly_promotions/actions/create_discounted_item: Create discounted line item
-      solidus_friendly_promotions/actions/adjust_line_item_quantity_groups: Discount matching line items based on quantity groups
+      solidus_friendly_promotions/benefits/adjust_shipment: Discount matching shipments
+      solidus_friendly_promotions/benefits/adjust_line_item: Discount matching line items
+      solidus_friendly_promotions/benefits/create_discounted_item: Create discounted line item
+      solidus_friendly_promotions/benefits/adjust_line_item_quantity_groups: Discount matching line items based on quantity groups
       solidus_friendly_promotions/calculators/distributed_amount: Distributed Amount
-      solidus_friendly_promotions/calculators/percent: Flat Percent
+      solidus_friendly_promotions/calculators/percent: Percent
       solidus_friendly_promotions/calculators/flat_rate: Flat Rate
       solidus_friendly_promotions/calculators/flexi_rate: Flexible Rate
       solidus_friendly_promotions/calculators/tiered_flat_rate: Tiered Flat Rate
       solidus_friendly_promotions/calculators/tiered_percent: Tiered Percent
       solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity: Tiered Percent based on eligible item quantity
-      solidus_friendly_promotions/rules/first_order: First Order
-      solidus_friendly_promotions/rules/first_repeat_purchase_since: First Repeat Purchase Since
-      solidus_friendly_promotions/rules/item_total: Item Total
-      solidus_friendly_promotions/rules/discounted_item_total: Item Total after previous lanes
-      solidus_friendly_promotions/rules/landing_page: Landing Page
-      solidus_friendly_promotions/rules/minimum_quantity: Minimum Quantity
-      solidus_friendly_promotions/rules/nth_order: Nth Order
-      solidus_friendly_promotions/rules/one_use_per_user: One Use Per User
-      solidus_friendly_promotions/rules/option_value: Option Value(s)
-      solidus_friendly_promotions/rules/line_item_option_value: Line Item Option Value(s)
-      solidus_friendly_promotions/rules/product: Order Product(s)
-      solidus_friendly_promotions/rules/line_item_product: Line Item Product(s)
-      solidus_friendly_promotions/rules/taxon: Order Taxon(s)
-      solidus_friendly_promotions/rules/line_item_taxon: Line Item Taxon(s)
-      solidus_friendly_promotions/rules/user: User
-      solidus_friendly_promotions/rules/user_logged_in: User Logged In
-      solidus_friendly_promotions/rules/user_role: User Role(s)
+      solidus_friendly_promotions/conditions/first_order: First Order
+      solidus_friendly_promotions/conditions/first_repeat_purchase_since: First Repeat Purchase Since
+      solidus_friendly_promotions/conditions/item_total: Item Total
+      solidus_friendly_promotions/conditions/discounted_item_total: Item Total after previous lanes
+      solidus_friendly_promotions/conditions/landing_page: Landing Page
+      solidus_friendly_promotions/conditions/minimum_quantity: Minimum Quantity
+      solidus_friendly_promotions/conditions/nth_order: Nth Order
+      solidus_friendly_promotions/conditions/one_use_per_user: One Use Per User
+      solidus_friendly_promotions/conditions/option_value: Option Value(s)
+      solidus_friendly_promotions/conditions/line_item_option_value: Line Item Option Value(s)
+      solidus_friendly_promotions/conditions/product: Order Product(s)
+      solidus_friendly_promotions/conditions/line_item_product: Line Item Product(s)
+      solidus_friendly_promotions/conditions/taxon: Order Taxon(s)
+      solidus_friendly_promotions/conditions/line_item_taxon: Line Item Taxon(s)
+      solidus_friendly_promotions/conditions/user: User
+      solidus_friendly_promotions/conditions/user_logged_in: User Logged In
+      solidus_friendly_promotions/conditions/user_role: User Role(s)
       solidus_friendly_promotions/promotion_code_batch:
         one: Code batch
         other: Code batches
@@ -205,57 +227,61 @@ en:
           pre: Pre
           default: Default
           post: Post
-      solidus_friendly_promotions/promotion_action:
-        type: Action Type
-      solidus_friendly_promotions/actions/adjust_line_item:
+      solidus_friendly_promotions/benefit:
+        type: Benefit Type
+      solidus_friendly_promotions/condition:
+        type: Condition Type
+      solidus_friendly_promotions/benefits/adjust_line_item:
         description: Creates a promotion credit on matching line items
-      solidus_friendly_promotions/actions/adjust_shipment:
+      solidus_friendly_promotions/benefits/adjust_shipment:
         description: Creates a promotion credit on matching shipments
-      solidus_friendly_promotions/actions/create_discounted_item:
+      solidus_friendly_promotions/benefits/create_discounted_item:
         description: Creates a discounted item with the quantity the applicable line items.
         preferred_quantity: Quantity per applicable line item quantity
         preferred_necessary_quantity: Number of items needed for a discounted item
-      solidus_friendly_promotions/rules/first_order:
+      solidus_friendly_promotions/conditions/first_order:
         description: Must be the customer's first order
-      solidus_friendly_promotions/rules/first_repeat_purchase_since:
-        description: Available only to user who have not purchased in a while
-        form_text: Apply this promotion to users whose last order was more than X days ago
-      solidus_friendly_promotions/rules/item_total:
-        description: Order total meets these criteria
-      solidus_friendly_promotions/rules/landing_page:
+      solidus_friendly_promotions/conditions/first_repeat_purchase_since:
+        description: Available only to users who have not purchased in a while
+        preferred_days_ago: Last purchase was at least this many days ago
+      solidus_friendly_promotions/conditions/item_total:
+        description: Order total must be greater than or equal to the specified amount
+        preferred_operator: Operator
+        preferred_amount: Amount
+      solidus_friendly_promotions/conditions/landing_page:
         description: Customer must have visited the specified page
-      solidus_friendly_promotions/rules/nth_order:
-        description: Apply a promotion to every nth order a user has completed.
+      solidus_friendly_promotions/conditions/nth_order:
+        description: Apply a promotion to the nth order a user has completed.
         form_text: 'Apply this promotion on the users Nth order: '
-      solidus_friendly_promotions/rules/one_use_per_user:
+      solidus_friendly_promotions/conditions/one_use_per_user:
         description: Only one use per user
-      solidus_friendly_promotions/rules/option_value:
+      solidus_friendly_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_friendly_promotions/rules/line_item_option_value:
+      solidus_friendly_promotions/conditions/line_item_option_value:
         description: Line Item has specified product with matching option value
-      solidus_friendly_promotions/rules/minimum_quantity:
+      solidus_friendly_promotions/conditions/minimum_quantity:
         description: Order contains minimum quantity of applicable items
-      solidus_friendly_promotions/rules/product:
+      solidus_friendly_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_friendly_promotions/rules/line_item_product:
+      solidus_friendly_promotions/conditions/line_item_product:
         description: Line item matches specified product(s)
         preferred_match_policy: Match Policy
-      solidus_friendly_promotions/rules/store:
+      solidus_friendly_promotions/conditions/store:
         description: Available only to the specified stores
-      solidus_friendly_promotions/rules/taxon:
+      solidus_friendly_promotions/conditions/taxon:
         description: Order includes products with specified taxon(s)
         preferred_line_item_applicable: Should also apply to line items
-      solidus_friendly_promotions/rules/line_item_taxon:
+      solidus_friendly_promotions/conditions/line_item_taxon:
         description: Line Item has product with specified taxon(s)
         preferred_match_policy: Match Policy
-      solidus_friendly_promotions/rules/user:
+      solidus_friendly_promotions/conditions/user:
         description: Available only to the specified users
-      solidus_friendly_promotions/rules/user_logged_in:
+      solidus_friendly_promotions/conditions/user_logged_in:
         description: Available only to logged in users
-      solidus_friendly_promotions/rules/user_role:
+      solidus_friendly_promotions/conditions/user_role:
         description: Order includes User with specified Role(s)
       solidus_friendly_promotions/calculators/tiered_flat_rate:
         description: Flat Rate in tiers based on item amount
@@ -265,16 +291,26 @@ en:
         description: Tiered percentage based on order's item total
         preferred_base_percent: Base Percent
         tiers: Tiers
+        order_item_total: Order Item Total
+        percent: Percent
       solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity:
         description: Tiered percentage based on eligible item quantity
         preferred_base_percent: Base Percent
         tiers: Tiers
+        order_item_total: Order Item Total
+        discount: Discount
       solidus_friendly_promotions/calculators/flat_rate:
         description: Provides a flat rate discount
+      solidus_friendly_promotions/calculators/flexi_rate:
+        description: Calculates a discount for the first item and (separately) any additional items, with a maximum number of items that can be specified.
+        preferred_first_item: Discount for the first item
+        preferred_additional_item: Discount for additional items
+        preferred_max_items: Maximum number of items
+        preferred_currency: Currency
       solidus_friendly_promotions/calculators/percent:
         description: Provides a discount calculated by percent of the discountable amount of the item being discounted
       solidus_friendly_promotions/calculators/distributed_amount:
-        description: Distributed the configured amount among all eligible line items of the order
+        description: Distributes the configured amount among all eligible line items of the order.
         explanation: |
           <p>
             This amount will be distributed to line items weighted relative to
@@ -311,13 +347,20 @@ en:
               </tr>
             </tbody>
           </table>
+        preferred_amount: Amount
 
     errors:
       models:
-        solidus_friendly_promotions/promotion_action:
+        solidus_friendly_promotions/benefit:
           attributes:
             base:
-              cannot_destroy_if_order_completed: Action has been applied to complete orders. It cannot be destroyed.
+              cannot_destroy_if_order_completed: Benefit has been applied to complete orders. It cannot be destroyed.
+        solidus_friendly_promotions/condition:
+          attributes:
+            benefit:
+              already_contains_condition_type: already contains this condition type
+            type:
+              invalid_condition_type: is not a valid condition type
         solidus_friendly_promotions/promotion_code:
           attributes:
             base:
@@ -325,4 +368,9 @@ en:
         spree/line_item:
           attributes:
             quantity:
-              cannot_be_changed_for_automated_items: cannot be changed on a line item managed by a promotion action
+              cannot_be_changed_for_automated_items: cannot be changed on a line item managed by a promotion benefit
+        solidus_friendly_promotions/promotion:
+          attributes:
+            apply_automatically:
+              disallowed_with_path: cannot be set to true when path is present
+              disallowed_with_promotion_codes: cannot be set to true when promotion code is present

data/config/routes.rb

@@ -6,8 +6,9 @@ SolidusFriendlyPromotions::Engine.routes.draw do
       resources :promotion_categories, except: [:show]
 
       resources :promotions do
-        resources :promotion_rules
-        resources :promotion_actions
+        resources :benefits do
+          resources :conditions
+        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"}

data/db/migrate/20231011120928_add_db_comments_to_friendly_promotion_rules_taxons.rb

@@ -16,8 +16,8 @@ class AddDbCommentsToFriendlyPromotionRulesTaxons < ActiveRecord::Migration[6.1]
 
   def friendly_promotion_rules_taxons_table_comment
     <<~COMMENT
-      Join table between promotion rules and taxons. Only used if the promotion rule's type is SolidusFriendlyPromotion::Rules::Taxon or
-      SolidusFriendlyPromotion::Rules::LineItemTaxon. Represents those taxons that the promotion rule matches on using its any/all/none
+      Join table between promotion rules and taxons. Only used if the promotion rule's type is SolidusFriendlyPromotion::Conditions::Taxon or
+      SolidusFriendlyPromotion::Conditions::LineItemTaxon. Represents those taxons that the promotion rule matches on using its any/all/none
       or include/exclude match policy.
     COMMENT
   end

data/db/migrate/20231011142040_add_db_comments_to_friendly_promotion_rules_users.rb

@@ -16,7 +16,7 @@ class AddDbCommentsToFriendlyPromotionRulesUsers < ActiveRecord::Migration[6.1]
 
   def friendly_promotion_rules_users_table_comment
     <<~COMMENT
-      Join table between promotion rules and users. Used with promotion rules of type "SolidusFriendlyPromotions::Rules::User".
+      Join table between promotion rules and users. Used with promotion rules of type "SolidusFriendlyPromotions::Conditions::User".
       An entry here indicates that a promotion is eligible for the user ID specified here.
     COMMENT
   end

data/db/migrate/20231011190222_add_db_comments_to_friendly_promotion_actions.rb

@@ -38,7 +38,7 @@ class AddDbCommentsToFriendlyPromotionActions < ActiveRecord::Migration[6.1]
   def type_comment
     <<~COMMENT
       A class name representing which promotion action this represents.
-      Usually SolidusFriendlyPromotions::Actions::Adjust{LineItem,Shipment}.
+      Usually SolidusFriendlyPromotions::PromotionAction::Adjust{LineItem,Shipment}.
     COMMENT
   end
 

data/db/migrate/20240409093831_add_action_reference_to_rules.rb

@@ -0,0 +1,34 @@
+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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,19 @@
+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

data/db/migrate/20240612113608_update_column_comments_for_benefits.rb

@@ -0,0 +1,31 @@
+class UpdateColumnCommentsForBenefits < ActiveRecord::Migration[6.1]
+  def up
+    if connection.supports_comments?
+      change_table_comment(:friendly_benefits, friendly_benefits_table_comment)
+      change_column_comment(:friendly_benefits, :type, type_comment)
+      change_column_comment(:friendly_benefits, :preferences, preferences_comment)
+    end
+  end
+
+  private
+
+  def friendly_benefits_table_comment
+    <<~COMMENT
+      Single Table inheritance table. Represents what to do to an order when the linked promotion is eligible.
+      Promotions can have many benefits.
+    COMMENT
+  end
+
+  def type_comment
+    <<~COMMENT
+      A class name representing which benefit this represents.
+      Usually SolidusFriendlyPromotions::Benefits::Adjust{LineItem,Shipment}.
+    COMMENT
+  end
+
+  def preferences_comment
+    <<~COMMENT
+      Preferences for this benefit. Serialized YAML.
+    COMMENT
+  end
+end

data/db/migrate/20240612114132_update_column_comments_for_conditions.rb

@@ -0,0 +1,30 @@
+class UpdateColumnCommentsForConditions < ActiveRecord::Migration[7.1]
+  def up
+    if connection.supports_comments?
+      change_table_comment(:friendly_conditions, friendly_conditions_table_comment)
+      change_column_comment(:friendly_conditions, :benefit_id, benefit_id_comment)
+      change_column_comment(:friendly_conditions, :preferences, preferences_comment)
+    end
+  end
+
+  private
+
+  def friendly_conditions_table_comment
+    <<~COMMENT
+      Represents a promotion benefit condition. A promotion benefit may have many conditions, which determine whether the benefit is eligible.
+      All conditions must be eligible for the benefit to be eligible. If there are no conditions, the benefit is always eligible.
+    COMMENT
+  end
+
+  def benefit_id_comment
+    <<~COMMENT
+      Foreign key to the friendly_benefits table.
+    COMMENT
+  end
+
+  def preferences_comment
+    <<~COMMENT
+      Preferences for this promotion condition. Serialized YAML column with preferences for this promotion condition.
+    COMMENT
+  end
+end