solidus_friendly_promotions 1.0.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6735f8983491ab3b703bc8c095f8331efb28e58b9a59fde2e74a338dc60c03f
-  data.tar.gz: 4f4ecb6904c2aba33880b6601bd3a1efb3d72c283f6c1a6aab3167bc2739767d
+  metadata.gz: 8c80d1d515ec8f0e3b4a5742c3715d92394e054b7b53bc41df7b8ba0c0532824
+  data.tar.gz: 2aa767f69a6df858b9ccf19cda5c65db70770feb3a087ca0fbc62f6d82ce4e37
 SHA512:
-  metadata.gz: b6a4ae6ae4f22709c40865d60e125f07ac55bd58cf944415f41c6431d8260da20d16f4b33b78d2a0219366c58d13441d5701bc935d09760751a413fceed487e2
-  data.tar.gz: 640c4da14f4f8d70fb7f8d9fce147f0344a4812384f44a5da379e61c55a5cafacb0b8ff161f752930523c0ad198dadfd1fd047c577976f1818e28938b5631277
+  metadata.gz: 80d3369aed9485a308424965906944f8ccc10159fd125da74a1f5446866727c6b8df986df7c13d0bceac1a8e24a191383ac18bc011c7fd7962ca03f3168ec1cf
+  data.tar.gz: 2dfd860061b46abd2324e86cc4e3bd89a8627b57097484c121fa4bc7282c7a976f7472b3f2033df2dddc5daf85f2af060bb6531ff9080f2321ae7b4a0bdafc69

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [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)
+
+**Merged pull requests:**
+
+- 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))
+- Rename promotion actions to benefits [\#113](https://github.com/friendlycart/solidus_friendly_promotions/pull/113) ([mamhoff](https://github.com/mamhoff))
+- Include Discarded Promotions [\#112](https://github.com/friendlycart/solidus_friendly_promotions/pull/112) ([manleyac](https://github.com/manleyac))
+- Rename promotion rules to conditions [\#111](https://github.com/friendlycart/solidus_friendly_promotions/pull/111) ([mamhoff](https://github.com/mamhoff))
+- 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.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

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch("SOLIDUS_BRANCH", "main")
+branch = ENV.fetch("SOLIDUS_BRANCH", "v4.3")
 gem "solidus", github: "solidusio/solidus", branch: branch
 
 # The solidus_frontend gem has been pulled out since v3.2

data/MIGRATING.md

@@ -95,7 +95,7 @@ would become:
 
 ```rb
 class MyNewRule < SolidusFriendlyPromotions::PromotionRule
-  include LineItemLevelRule
+  include LineItemLevelCondition
   def eligible?(promotable)
     promotable.quantity > 3
   end

data/README.md

@@ -10,11 +10,7 @@ The basic architecture is very similar to the one in core Solidus, but with a fe
 
 This extension centralizes promotion handling in the order updater. A service class, the `SolidusFriendlyPromotions::FriendlyPromotionAdjuster` applies the current promotion configuration to the order, adjusting or removing adjustments as necessary.
 
-In Solidus Core, Promotion adjustments get recalculated twice on every change to the cart; once in `Spree::OrderContents#after_add_or_remove` and in `Spree::OrderUpdater#update_promotions`. To make things more complicated, `Spree::OrderContents` leverages the `Spree::PromotionHandler#cart`, while the order updater goes through `Spree::Adjustment#recalculate`.
-
-The design decision here is to make the code path easier to follow, and consequently to make it more performant ("Make it easy, then make it fast").
-
-`SolidusFriendlyPromotions::Promotion` objects have rules and actions, just like `Spree::Promotion`. However, both rules and actions work slightly differently.
+`SolidusFriendlyPromotions::Promotion` objects have benefits, and benefits have conditions. For example, a promotion that is "20% off shirts" would have a benefit of type "AdjustLineItem", and that benefit would have a condition of type "LineItemTaxon" that makes sure only line items with the "shirts" taxon will get the benefit.
 
 ### Promotion lanes
 
@@ -31,25 +27,37 @@ SolidusFriendlyPromotions.configure do |config|
 end
 ```
 
-### Promotion Rules
+### Benefits
+
+Solidus Friendly Promotions ships with only three benefit types by default that should cover most use cases: `AdjustLineItem`, `AdjustShipment` and `CreateDiscountedItem`. There is no benefit that creates order-level adjustments, as this feature of Solidus' legacy promotions system has proven to be very difficult for customer service and finance departments due to the difficulty of accruing order-level adjustments to individual line items when e.g. processing returns. In order to give a fixed discount to all line items in an order, use the `AdjustLineItem` benefit with the `DistributedAmount` calculator.
+
+Alle benefits are calculable. By setting their `calculator` to one of the classes provided, a great range of discounts is possible.
 
-Promotion rules can be applicable to either `Spree::Order`, `Spree::LineItem`, or `Spree::Shipment` objects. If they are applicable, they will be asked for eligibility. Rules applicable to orders are processed first. If a promotion has a rule that makes it ineligible for an order, line items and shipments will not be adjusted. If there are no rules that are applicable, the promotion will be considered eligible.
+#### `AdjustLineItem`
 
-### Promotion Actions
+Benefits of this class will create promotion adjustments on line items. By default, they will create a discount on every line item in the order. If you want to restrict which line items get the discount, add line-item level conditions, such as `LineItemProduct`.
 
-There are only two actions by default that should cover most use cases: `AdjustLineItem` and `AdjustShipment`. Ther is no action that creates order-level adjustments, as this feature of core Solidus has proven to be very difficult for customer service and finance departments due to the difficulty of accruing order-level adjustments to individual line items when e.g. processing returns. In order to give a fixed discount to all line items in an order, use the `AdjustLineItem` action with the `DistributedAmount` calculator.
+#### `AdjustShipment`
 
-Both actions are calculable. By setting their `calculator` to one of the classes provided, a great range of discount possibilities is maintained.
+Benefits of this class will create promotion adjustments on shipments. By default, they will create a discount on every shipment in the order. If you want to restrict which shipments get a discount, add shipment-level conditions, such as `ShippingMethod`.
+
+### Conditions
+
+Every type of benefit has a list of rules that can be applied to them. When calculating adjustments for an order, benefits will only produce adjustments on line items or shipments if all their respective conditions are true.
 
 ### Connecting promotions to orders
 
-When there is a join record `SolidusFriendlyPromotions::OrderPromotion`, the promotion and the order will be "connected", and the promotion will be applied even if it does not `apply_automatically` (see below). There's a difference to Solidus' system here in that promotions are not automatically connected to orders when they apply.
+When there is a join record `SolidusFriendlyPromotions::OrderPromotion`, the promotion and the order will be "connected", and the promotion will be applied even if it does not `apply_automatically` (see below). This is different from Solidus' legacy promotion system here in that promotions are not automatically connected to orders when they produce an adjustment.
 
-One way of connecting orders to promotions is via a promotion code.
+If you want to create an `OrderPromotion` record, the usual way to do this is via a promotion handler:
+
+- `SolidusFriendlyPromotions::PromotionHandler::Coupon`: Connects orders to promotions if a customer or service agent enters a matching promotion code.
+- `SolidusFriendlyPromotions::PromotionHandler::Page`: Connects orders to promotions if a customer visits a page with the correct path. This handler is not integrated in core Solidus, and must be integrated by you.
+- `SolidusFriendlyPromotions::PromotionHandler::Page`: Connects orders to promotions if a customer visits a page with the correct path. This handler is not integrated in core Solidus, and must be integrated by you.
 
 ### Promotion categories
 
-Promotion categories simply allow admins to group promotion actions. They have no further significance with regards to the functionality of the promotion system. This is the same behavior as in core.
+Promotion categories simply allow admins to group promotions. They have no further significance with regards to the functionality of the promotion system.
 
 ### Promotion recalculation
 
@@ -78,9 +86,7 @@ bin/rails generate solidus_friendly_promotions:install
 ```
 
 This will create the tables for this extension. It will also replace the promotion administration system under
-`/admin/promotions` with a new one that needs `turbo-rails`.
-
-It will also create an initializer within which Solidus is configured to use this extension's `SimpleOrderContents` and `FriendlyPromotionAdjuster` classes. Feel free to override with your own implementations!
+`/admin/promotions` with a new one that needs `turbo-rails`. It will also create an initializer within which Solidus is configured to use `Spree::SimpleOrderContents` and this extension's `FriendlyPromotionAdjuster` classes. Feel free to override with your own implementations!
 
 ## Usage
 

data/app/assets/config/solidus_friendly_promotions/manifest.js

@@ -4,4 +4,10 @@
 //= link solidus_friendly_promotions/controllers/calculator_tiers_controller.js
 //= link solidus_friendly_promotions/controllers/flash_controller.js
 //= link solidus_friendly_promotions/controllers/product_option_values_controller.js
-//= link solidus_friendly_promotions/jquery/option_value_picker.js
+//= link solidus_friendly_promotions/web_components/option_value_picker.js
+//= link solidus_friendly_promotions/web_components/product_picker.js
+//= link solidus_friendly_promotions/web_components/user_picker.js
+//= link solidus_friendly_promotions/web_components/taxon_picker.js
+//= link solidus_friendly_promotions/web_components/variant_picker.js
+//= link solidus_friendly_promotions/web_components/number_with_currency.js
+//= link solidus_friendly_promotions/web_components/select_two.js

data/app/controllers/solidus_friendly_promotions/admin/benefits_controller.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  module Admin
+    class BenefitsController < Spree::Admin::BaseController
+      before_action :load_promotion, only: [:create, :destroy, :new, :update, :edit]
+      before_action :validate_benefit_type, only: [:create, :edit]
+
+      def new
+        @benefit = @promotion.benefits.build(benefit_params)
+        render layout: false
+      end
+
+      def create
+        @benefit = @benefit_type.new(benefit_params)
+        @benefit.promotion = @promotion
+        if @benefit.save(validate: false)
+          flash[:success] =
+            t("spree.successfully_created", resource: SolidusFriendlyPromotions::Benefit.model_name.human)
+          redirect_to location_after_save, format: :html
+        else
+          render :new, layout: false
+        end
+      end
+
+      def edit
+        @benefit = @promotion.benefits.find(params[:id])
+        if params.dig(:benefit, :calculator_type)
+          @benefit.calculator_type = params[:benefit][:calculator_type]
+        end
+        render layout: false
+      end
+
+      def update
+        @benefit = @promotion.benefits.find(params[:id])
+        @benefit.assign_attributes(benefit_params)
+        if @benefit.save
+          flash[:success] =
+            t("spree.successfully_updated", resource: SolidusFriendlyPromotions::Benefit.model_name.human)
+          redirect_to location_after_save, format: :html
+        else
+          render :edit
+        end
+      end
+
+      def destroy
+        @benefit = @promotion.benefits.find(params[:id])
+        if @benefit.destroy
+          flash[:success] =
+            t("spree.successfully_removed", resource: SolidusFriendlyPromotions::Benefit.model_name.human)
+        end
+        redirect_to location_after_save, format: :html
+      end
+
+      private
+
+      def location_after_save
+        solidus_friendly_promotions.edit_admin_promotion_path(@promotion)
+      end
+
+      def load_promotion
+        @promotion = SolidusFriendlyPromotions::Promotion.find(params[:promotion_id])
+      end
+
+      def benefit_params
+        params[:benefit].try(:permit!) || {}
+      end
+
+      def validate_benefit_type
+        requested_type = params[:benefit].delete(:type)
+        benefit_types = SolidusFriendlyPromotions.config.actions
+        @benefit_type = benefit_types.detect do |klass|
+          klass.name == requested_type
+        end
+        return if @benefit_type
+
+        flash[:error] = t("solidus_friendly_promotions.invalid_benefit")
+        respond_to do |format|
+          format.html { redirect_to solidus_friendly_promotions.edit_admin_promotion_path(@promotion) }
+          format.js { render layout: false }
+        end
+      end
+    end
+  end
+end

data/app/controllers/solidus_friendly_promotions/admin/conditions_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  module Admin
+    class ConditionsController < Spree::Admin::BaseController
+      helper "solidus_friendly_promotions/admin/conditions"
+
+      before_action :load_benefit, only: [:create, :destroy, :update, :new]
+      rescue_from ActiveRecord::SubclassNotFound, with: :invalid_condition_error
+
+      def new
+        @condition = @benefit.conditions.build(condition_params)
+        render layout: false
+      end
+
+      def create
+        @condition = @benefit.conditions.build(condition_params)
+        if @condition.save
+          flash[:success] =
+            t("spree.successfully_created", resource: model_class.model_name.human)
+        end
+        redirect_to location_after_save
+      end
+
+      def update
+        @condition = @benefit.conditions.find(params[:id])
+        @condition.assign_attributes(condition_params)
+        if @condition.save
+          flash[:success] =
+            t("spree.successfully_updated", resource: model_class.model_name.human)
+        end
+        redirect_to location_after_save
+      end
+
+      def destroy
+        @condition = @benefit.conditions.find(params[:id])
+        if @condition.destroy
+          flash[:success] =
+            t("spree.successfully_removed", resource: model_class.model_name.human)
+        end
+        redirect_to location_after_save
+      end
+
+      private
+
+      def invalid_condition_error
+        flash[:error] = t("solidus_friendly_promotions.invalid_condition")
+        redirect_to location_after_save
+      end
+
+      def location_after_save
+        solidus_friendly_promotions.edit_admin_promotion_path(@promotion)
+      end
+
+      def load_benefit
+        @promotion = SolidusFriendlyPromotions::Promotion.find(params[:promotion_id])
+        @benefit = @promotion.benefits.find(params[:benefit_id])
+      end
+
+      def model_class
+        SolidusFriendlyPromotions::Condition
+      end
+
+      def condition_params
+        params[:condition].try(:permit!) || {}
+      end
+    end
+  end
+end

data/app/controllers/solidus_friendly_promotions/admin/promotions_controller.rb

@@ -5,8 +5,8 @@ module SolidusFriendlyPromotions
     class PromotionsController < BaseController
       before_action :load_data
 
-      helper "solidus_friendly_promotions/admin/promotion_rules"
-      helper "solidus_friendly_promotions/admin/promotion_actions"
+      helper "solidus_friendly_promotions/admin/conditions"
+      helper "solidus_friendly_promotions/admin/benefits"
       helper "solidus_friendly_promotions/admin/promotions"
 
       def create
@@ -46,7 +46,7 @@ module SolidusFriendlyPromotions
       end
 
       def promotion_includes
-        [:actions]
+        [:benefits]
       end
 
       def model_class

data/app/decorators/models/solidus_friendly_promotions/adjustment_decorator.rb

@@ -3,16 +3,16 @@
 module SolidusFriendlyPromotions
   module AdjustmentDecorator
     def self.prepended(base)
-      base.scope :friendly_promotion, -> { where(source_type: "SolidusFriendlyPromotions::PromotionAction") }
-      base.scope :promotion, -> { where(source_type: ["SolidusFriendlyPromotions::PromotionAction", "Spree::PromotionAction"]) }
+      base.scope :friendly_promotion, -> { where(source_type: "SolidusFriendlyPromotions::Benefit") }
+      base.scope :promotion, -> { where(source_type: ["SolidusFriendlyPromotions::Benefit", "Spree::PromotionAction"]) }
     end
 
     def friendly_promotion?
-      source_type == "SolidusFriendlyPromotions::PromotionAction"
+      source_type == "SolidusFriendlyPromotions::Benefit"
     end
 
     def promotion?
-      super || source_type == "SolidusFriendlyPromotions::PromotionAction"
+      super || source_type == "SolidusFriendlyPromotions::Benefit"
     end
 
     private

data/app/decorators/models/solidus_friendly_promotions/line_item_decorator.rb

@@ -4,7 +4,7 @@ module SolidusFriendlyPromotions
   module LineItemDecorator
     def self.prepended(base)
       base.attr_accessor :quantity_setter
-      base.belongs_to :managed_by_order_action, class_name: "SolidusFriendlyPromotions::PromotionAction", optional: true
+      base.belongs_to :managed_by_order_benefit, class_name: "SolidusFriendlyPromotions::Benefit", optional: true
       base.validate :validate_managed_quantity_same, on: :update
       base.after_save :reset_quantity_setter
     end
@@ -12,7 +12,7 @@ module SolidusFriendlyPromotions
     private
 
     def validate_managed_quantity_same
-      if managed_by_order_action && quantity_changed? && quantity_setter != managed_by_order_action
+      if managed_by_order_benefit && quantity_changed? && quantity_setter != managed_by_order_benefit
         errors.add(:quantity, :cannot_be_changed_for_automated_items)
       end
     end

data/app/decorators/models/solidus_friendly_promotions/order_decorator.rb

@@ -29,11 +29,11 @@ module SolidusFriendlyPromotions
       shipments.each(&:reset_current_discounts)
     end
 
-    # This helper method excludes line items that are managed by an order action for the benefit
-    # of calculators and actions that discount normal line items. Line items that are managed by an
-    # order actions handle their discounts themselves.
+    # This helper method excludes line items that are managed by an order benefit for the benefit
+    # of calculators and benefits that discount normal line items. Line items that are managed by an
+    # order benefits handle their discounts themselves.
     def discountable_line_items
-      line_items.reject(&:managed_by_order_action)
+      line_items.reject(&:managed_by_order_benefit)
     end
 
     def apply_shipping_promotions
@@ -44,8 +44,8 @@ module SolidusFriendlyPromotions
       end
     end
 
-    def free_from_order_action?(line_item, _options)
-      !line_item.managed_by_order_action
+    def free_from_order_benefit?(line_item, _options)
+      !line_item.managed_by_order_benefit
     end
 
     Spree::Order.prepend self

data/app/helpers/solidus_friendly_promotions/admin/benefits_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  module Admin
+    module BenefitsHelper
+      def options_for_benefit_calculator_types(benefit)
+        calculators = benefit.available_calculators
+        options = calculators.map { |calculator| [calculator.model_name.human, calculator.name] }
+        options_for_select(options, benefit.calculator_type.to_s)
+      end
+
+      def options_for_benefit_types(benefit)
+        benefits = SolidusFriendlyPromotions.config.actions
+        options = benefits.map { |action| [action.model_name.human, action.name] }
+        options_for_select(options, benefit&.type&.to_s)
+      end
+    end
+  end
+end

data/app/helpers/solidus_friendly_promotions/admin/conditions_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  module Admin
+    module ConditionsHelper
+      def options_for_condition_types(benefit, condition)
+        options = benefit.available_conditions.map { |condition| [condition.model_name.human, condition.name] }
+        options_for_select(options, condition&.type.to_s)
+      end
+    end
+  end
+end

data/app/javascript/solidus_friendly_promotions/controllers/product_option_values_controller.js

@@ -5,7 +5,7 @@ export default class extends Controller {
 
   connect() {
     this.wrapperClass =
-      this.data.get("wrapperClass") || "promo-rule-option-value";
+      this.data.get("wrapperClass") || "promo-condition-option-value";
 
     this.element.querySelectorAll("." + this.wrapperClass).forEach((element) => this.buildSelects(element))
   }

data/app/javascript/solidus_friendly_promotions/web_components/number_with_currency.js

@@ -0,0 +1,35 @@
+class NumberWithCurrency extends HTMLElement {
+  connectedCallback() {
+    this.currencySelector = this.querySelector('.number-with-currency-select');
+    this.render()
+    this.addEventListener('change', this);
+  }
+
+  handleEvent() {
+    this.render()
+  }
+
+  get currency() {
+    if (this.currencySelector) {
+      return this.currencySelector.value;
+    } else {
+      return this.querySelector('.number-with-currency-addon')?.dataset?.currency;
+    }
+  }
+
+  get currencySymbol() {
+    const currency = this.currency;
+    if (currency) {
+      const currencyInfo = Spree.currencyInfo[currency];
+      return currencyInfo[0];
+    } else {
+      return '';
+    }
+  }
+
+  render() {
+    this.querySelector('.number-with-currency-symbol').textContent = this.currencySymbol;
+  }
+}
+
+customElements.define('number-with-currency', NumberWithCurrency);

data/app/javascript/solidus_friendly_promotions/{jquery → web_components}/option_value_picker.js

@@ -42,3 +42,11 @@ $.fn.optionValueAutocomplete = function (options) {
     formatSelection: formatOptionValue
   });
 };
+
+class OptionValuePicker extends HTMLInputElement {
+  connectedCallback() {
+    $(this).optionValueAutocomplete();
+  }
+}
+
+customElements.define('option-value-picker', OptionValuePicker, { extends: 'input' });

data/app/javascript/solidus_friendly_promotions/web_components/product_picker.js

@@ -0,0 +1,7 @@
+class ProductPicker extends HTMLInputElement {
+  connectedCallback() {
+    $(this).productAutocomplete();
+  }
+}
+
+customElements.define('product-picker', ProductPicker, { extends: 'input' });

data/app/javascript/solidus_friendly_promotions/web_components/select_two.js

@@ -0,0 +1,11 @@
+class SelectTwo extends HTMLSelectElement {
+  connectedCallback() {
+    $(this).select2({
+      allowClear: true,
+      dropdownAutoWidth: true,
+      minimumResultsForSearch: 8,
+    });
+  }
+}
+
+customElements.define("select-two", SelectTwo, { extends: "select" });

data/app/javascript/solidus_friendly_promotions/web_components/taxon_picker.js

@@ -0,0 +1,7 @@
+class TaxonPicker extends HTMLInputElement {
+  connectedCallback() {
+    $(this).taxonAutocomplete();
+  }
+}
+
+customElements.define('taxon-picker', TaxonPicker, { extends: 'input' });

data/app/javascript/solidus_friendly_promotions/web_components/user_picker.js

@@ -0,0 +1,7 @@
+class UserPicker extends HTMLInputElement {
+  connectedCallback() {
+    $(this).userAutocomplete();
+  }
+}
+
+customElements.define('user-picker', UserPicker, { extends: 'input' });

data/app/javascript/solidus_friendly_promotions/web_components/variant_picker.js

@@ -0,0 +1,7 @@
+class VariantPicker extends HTMLInputElement {
+  connectedCallback() {
+    $(this).variantAutocomplete();
+  }
+}
+
+customElements.define('variant-picker', VariantPicker, { extends: 'input' });

data/app/javascript/solidus_friendly_promotions.js

@@ -1,15 +1,11 @@
 import "@hotwired/turbo-rails";
 import "solidus_friendly_promotions/controllers";
-import "solidus_friendly_promotions/jquery/option_value_picker"
+import "solidus_friendly_promotions/web_components/option_value_picker"
+import "solidus_friendly_promotions/web_components/product_picker"
+import "solidus_friendly_promotions/web_components/user_picker"
+import "solidus_friendly_promotions/web_components/taxon_picker"
+import "solidus_friendly_promotions/web_components/variant_picker"
+import "solidus_friendly_promotions/web_components/number_with_currency"
+import "solidus_friendly_promotions/web_components/select_two"
 
 Turbo.session.drive = false;
-
-const initPickers = ({ _target }) => {
-  Spree.initNumberWithCurrency();
-  $(".product_picker").productAutocomplete();
-  $(".user_picker").userAutocomplete();
-  $(".taxon_picker").taxonAutocomplete();
-  $(".variant_autocomplete").variantAutocomplete();
-};
-document.addEventListener("turbo:frame-load", initPickers);
-document.addEventListener("DOMContentLoaded", initPickers);

data/app/models/concerns/solidus_friendly_promotions/{actions/order_level_action.rb → benefits/order_benefit.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  module Actions
-    module OrderLevelAction
+  module Benefits
+    module OrderBenefit
       def can_discount?(_)
         false
       end

data/app/models/concerns/solidus_friendly_promotions/{rules/line_item_applicable_order_rule.rb → conditions/line_item_applicable_order_condition.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  module Rules
-    module LineItemApplicableOrderRule
+  module Conditions
+    module LineItemApplicableOrderCondition
       def self.included(klass)
         klass.preference :line_item_applicable, :boolean, default: true
       end

data/app/models/concerns/solidus_friendly_promotions/{rules/line_item_level_rule.rb → conditions/line_item_level_condition.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  module Rules
-    module LineItemLevelRule
+  module Conditions
+    module LineItemLevelCondition
       def applicable?(promotable)
         promotable.is_a?(Spree::LineItem)
       end

data/app/models/concerns/solidus_friendly_promotions/{rules/order_level_rule.rb → conditions/order_level_condition.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  module Rules
-    module OrderLevelRule
+  module Conditions
+    module OrderLevelCondition
       def applicable?(promotable)
         promotable.is_a?(Spree::Order)
       end

data/app/models/concerns/solidus_friendly_promotions/{rules/shipment_level_rule.rb → conditions/shipment_level_condition.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  module Rules
-    module ShipmentLevelRule
+  module Conditions
+    module ShipmentLevelCondition
       def applicable?(promotable)
         promotable.is_a?(Spree::Shipment)
       end