solidus_promotions 4.7.2 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e2451b1f94d95a3ec8151297d094332656c24101b8db9b2940d8c29fc801f5b
-  data.tar.gz: '0296e8e6ecd7044da5d0a72e7247b7c177edf520908416d1c27d775a082fcde6'
+  metadata.gz: 811d1da52213897e7b0d15eb5edcebfff15c589a2cba817a78cd71102108bda8
+  data.tar.gz: 97b589f9439bee201fee75b9a6b290c55e04f8f4f9980108052b8162308fd932
 SHA512:
-  metadata.gz: e6cc3fe416a832ed5abf6cfe424c68472c97bb1eda709df891240f72d1a13bebc76d8ebd4c8b8adb75bc03654976631ba6bd6ba924c7b6233e8ac6ac3dc6cbaa
-  data.tar.gz: f895736cae7093535b52ae333f1c883dc438b77f92002ab930801b042d3bfb401095640b6f10c800c62feecac811f6715c2494e0863bb07dc057ddcfed05a1ad
+  metadata.gz: ba882e0b5172335780662f5d13acd8d12e569318d7998b0ba05d057353d8ada749b916d9520cc180e0978fd6bdf9a557c55d2cb39589ab01848dae40d3b88427
+  data.tar.gz: e4277bbede3bcb99ea59d265a9e86f0bb75dce9f09cfb17079231144919a8b5d2e8435d372a5d4eaf9027785ec57c9e7638879f4dc3797498c2bb4b04651360a

data/LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2024-2026, Martin Meyerhoff and other Solidus contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name Solidus nor the names of its contributors may be used to
+      endorse or promote products derived from this software without specific
+      prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -129,4 +129,4 @@ SolidusDevSupport::TestingSupport::Factories.load_for(SolidusPromotions::Engine)
 
 ## License
 
-Copyright (c) 2024 Martin Meyerhoff, Solidus Team, released under the [license of the parent repository](https://github.com/solidusio/solidus/blob/main/LICENSE.md).
+Copyright (c) 2024 Martin Meyerhoff, Solidus Team, released under the [BSD-3-Clause license](./LICENSE).

data/app/models/concerns/solidus_promotions/conditions/taxon_condition.rb

@@ -52,6 +52,8 @@ module SolidusPromotions
       end
 
       def load_taxon_ids_with_children
+        return [] unless taxon_ids.present?
+
         aggregation_function = if ActiveRecord::Base.connection.adapter_name.downcase.match?(/postgres/)
           "string_agg(child.id::text, ',')"
         else

data/app/models/solidus_promotions/benefit.rb

@@ -270,6 +270,12 @@ module SolidusPromotions
     # @param dry_run [Boolean] whether to collect detailed eligibility information
     # @return [Boolean] true when all applicable conditions are eligible
     def eligible_by_applicable_conditions?(promotable, dry_run: false)
+      if dry_run
+        Spree.deprecator.warn <<~MSG
+          Passing `dry_run` to `#eligible_by_applicable_conditions` is deprecated. If you want to check promotion
+          eligibility, use the `SolidusPromotions::PromotionEligibilityChecker` service object instead.
+        MSG
+      end
       conditions.map do |condition|
         next unless condition.applicable?(promotable)
         eligible = condition.eligible?(promotable)

data/app/models/solidus_promotions/calculators/distributed_amount.rb

@@ -19,7 +19,7 @@ module SolidusPromotions
       include PromotionCalculator
 
       preference :amount, :decimal, default: Spree::ZERO
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
 
       # Computes the weighted discount amount for a specific line item.
       #

data/app/models/solidus_promotions/calculators/flat_rate.rb

@@ -12,7 +12,7 @@ module SolidusPromotions
       include PromotionCalculator
 
       preference :amount, :decimal, default: Spree::ZERO
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
 
       # Computes the discount amount for an item.
       #

data/app/models/solidus_promotions/calculators/flexi_rate.rb

@@ -25,7 +25,7 @@ module SolidusPromotions
       preference :first_item, :decimal, default: Spree::ZERO
       preference :additional_item, :decimal, default: Spree::ZERO
       preference :max_items, :integer, default: 0
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
 
       # Computes the discount amount for a line item based on its quantity.
       #

data/app/models/solidus_promotions/calculators/tiered_flat_rate.rb

@@ -40,7 +40,7 @@ module SolidusPromotions
 
       preference :base_amount, :decimal, default: Spree::ZERO
       preference :tiers, :hash, default: {10 => 10}
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
 
       before_validation :transform_preferred_tiers
 

data/app/models/solidus_promotions/calculators/tiered_percent.rb

@@ -45,7 +45,7 @@ module SolidusPromotions
 
       preference :base_percent, :decimal, default: Spree::ZERO
       preference :tiers, :hash, default: {50 => 5}
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
 
       before_validation :transform_preferred_tiers
 

data/app/models/solidus_promotions/calculators/tiered_percent_on_eligible_item_quantity.rb

@@ -46,7 +46,7 @@ module SolidusPromotions
 
       preference :base_percent, :decimal, default: Spree::ZERO
       preference :tiers, :hash, default: {10 => 5}
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
 
       before_validation :transform_preferred_tiers
 

data/app/models/solidus_promotions/conditions/item_total.rb

@@ -12,7 +12,7 @@ module SolidusPromotions
       include OrderLevelCondition
 
       preference :amount, :decimal, default: 100.00
-      preference :currency, :string, default: -> { Spree::Config[:currency] }
+      preference :currency, :string, default: -> { Spree::Config.currency }
       preference :operator, :string, default: "gt"
 
       # The list of allowed operators names mapped to their symbols.

data/app/models/solidus_promotions/conditions/taxon_revenue.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  module Conditions
+    class TaxonRevenue < Condition
+      include OrderLevelCondition
+      include TaxonCondition
+
+      preference :operator, :string, default: "gte"
+      preference :amount, :decimal, default: 0
+      preference :currency, :string, default: -> { Spree::Config.currency }
+      preference :match_policy, :string, default: "include"
+
+      OPERATORS = {"gte" => :>=, "gt" => :>, "lt" => :<, "lte" => :<=}.freeze
+      MATCH_POLICIES = ["include", "exclude"].freeze
+
+      validates :preferred_match_policy, inclusion: {in: MATCH_POLICIES}
+
+      def self.operator_options
+        OPERATORS.map do |name, _method|
+          [I18n.t(name, scope: [:solidus_promotions, :operators]), name]
+        end
+      end
+
+      def self.match_policy_options
+        MATCH_POLICIES.map do |name|
+          [I18n.t(name, scope: %i[solidus_promotions conditions taxon_revenue match_policies]), name]
+        end
+      end
+
+      def order_eligible?(order, _options = {})
+        matching = order.line_items.select { |line_item| taxon_match?(line_item) }
+
+        matching.sum(&:discounted_amount).public_send(OPERATORS.fetch(preferred_operator), preferred_amount)
+      end
+
+      private
+
+      def taxon_match?(line_item)
+        line_item_taxon_ids = line_item.variant.product.classifications.map(&:taxon_id)
+
+        in_selected_taxons = taxon_ids_with_children.any? do |taxon_and_descendant_ids|
+          (line_item_taxon_ids & taxon_and_descendant_ids).any?
+        end
+
+        (preferred_match_policy == "exclude") ? !in_selected_taxons : in_selected_taxons
+      end
+    end
+  end
+end

data/app/models/solidus_promotions/load_promotions.rb

@@ -3,6 +3,12 @@
 module SolidusPromotions
   class LoadPromotions
     def initialize(order:, dry_run_promotion: nil)
+      if dry_run_promotion
+        Spree.deprecator.warn <<~MSG
+          Passing `dry_run_promotion` to `SolidusPromotions::LoadPromotions` is deprecated.
+          Use `Spree::Config.promotions.eligibility_checker_class.new(order: order, promotion: promotion).call` instead.
+        MSG
+      end
       @order = order
       @dry_run_promotion = dry_run_promotion
     end

data/app/models/solidus_promotions/order_adjuster/discount_order.rb

@@ -6,6 +6,12 @@ module SolidusPromotions
       attr_reader :order, :promotions, :dry_run
 
       def initialize(order, promotions, dry_run: false)
+        if dry_run
+          Spree.deprecator.warn <<~MSG
+            Passing `dry_run` to `SolidusPromotions::OrderAdjuster::DiscountOrder` is deprecated.
+            Use `Spree::Config.promotions.eligibility_checker_class.new(order: order, promotion: promotion).call` instead.
+          MSG
+        end
         @order = order
         @promotions = promotions
         @dry_run = dry_run
@@ -46,27 +52,20 @@ module SolidusPromotions
       def adjust_line_items(benefits)
         order.discountable_line_items.filter_map do |line_item|
           next unless line_item.variant.product.promotionable?
-
-          discounts = generate_discounts(benefits, line_item)
-          chosen_discounts = SolidusPromotions.config.discount_chooser_class.new(discounts).call
-          (line_item.current_lane_discounts - chosen_discounts).each(&:mark_for_destruction)
+          generate_discounts(benefits, line_item)
         end
       end
 
       def adjust_shipments(benefits)
         order.shipments.map do |shipment|
-          discounts = generate_discounts(benefits, shipment)
-          chosen_discounts = SolidusPromotions.config.discount_chooser_class.new(discounts).call
-          (shipment.current_lane_discounts - chosen_discounts).each(&:mark_for_destruction)
+          generate_discounts(benefits, shipment)
         end
       end
 
       def adjust_shipping_rates(benefits)
         order.shipments.flat_map(&:shipping_rates).filter_map do |rate|
           next unless rate.cost
-          discounts = generate_discounts(benefits, rate)
-          chosen_discounts = SolidusPromotions.config.discount_chooser_class.new(discounts).call
-          (rate.current_lane_discounts - chosen_discounts).each(&:mark_for_destruction)
+          generate_discounts(benefits, rate)
         end
       end
 
@@ -78,9 +77,11 @@ module SolidusPromotions
 
       def generate_discounts(possible_benefits, item)
         eligible_benefits = eligible_benefits_for_promotable(possible_benefits, item)
-        eligible_benefits.filter_map do |benefit|
+        discounts = eligible_benefits.filter_map do |benefit|
           benefit.can_discount?(item) && benefit.discount(item)
         end
+        chosen_discounts = SolidusPromotions.config.discount_chooser_class.new(discounts).call
+        (item.current_lane_discounts - chosen_discounts).each(&:mark_for_destruction)
       end
     end
   end

data/app/models/solidus_promotions/order_adjuster.rb

@@ -5,6 +5,12 @@ module SolidusPromotions
     attr_reader :order, :promotions, :dry_run
 
     def initialize(order, dry_run_promotion: nil)
+      if dry_run_promotion
+        Spree.deprecator.warn <<~MSG
+          Passing `dry_run_promotion` to `SolidusPromotions::OrderAdjuster` is deprecated.
+          Use `Spree::Config.promotions.eligibility_checker_class.new(order: order, promotion: promotion).call` instead.
+        MSG
+      end
       @order = order
       @dry_run = !!dry_run_promotion
       @promotions = SolidusPromotions::LoadPromotions.new(
@@ -16,6 +22,10 @@ module SolidusPromotions
     def call(persist: true) # rubocop:disable Lint/UnusedMethodArgument
       return order unless SolidusPromotions::Promotion.order_activatable?(order)
 
+      ActiveRecord::Associations::Preloader.new(records: order.line_items + order.shipments, associations: :adjustments).call
+      # DiscountOrder dereferences `line_item.variant.product` for every line item.
+      ActiveRecord::Associations::Preloader.new(records: order.line_items, associations: {variant: :product}).call
+
       SetDiscountsToZero.call(order)
 
       DiscountOrder.new(order, promotions, dry_run: dry_run).call

data/app/models/solidus_promotions/promotion.rb

@@ -152,6 +152,7 @@ module SolidusPromotions
     def eligibility_results
       @eligibility_results ||= SolidusPromotions::EligibilityResults.new(self)
     end
+    deprecate eligibility_results: "Please use the `SolidusPromotions::PromotionEligibilityChecker` service object instead", deprecator: Spree.deprecator
 
     private
 

data/app/models/solidus_promotions/promotion_eligibility_checker.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module SolidusPromotions
+  class PromotionEligibilityChecker
+    attr_reader :results
+
+    def initialize(order:, promotion:)
+      @order = order
+      @promotion = promotion
+      @results = SolidusPromotions::EligibilityResults.new(promotion)
+    end
+
+    def call
+      SolidusPromotions::PromotionLane.set(current_lane: promotion.lane) do
+        promotion.benefits.any? do |benefit|
+          # We're running this first and storing the result so the following
+          # block does not short-circuit on ineligible items, and we get all errors.
+          order_eligible = applicable_conditions_eligible?(order, benefit)
+          (
+            order.line_items.any? do |line_item|
+              check_item(line_item, benefit)
+            end || order.shipments.any? do |shipment|
+              check_item(shipment, benefit)
+            end
+          ) && order_eligible
+        end
+      end
+    end
+
+    private
+
+    attr_reader :order, :promotion
+
+    def check_item(item, benefit)
+      benefit.can_discount?(item) &&
+        applicable_conditions_eligible?(item, benefit)
+    end
+
+    def applicable_conditions_eligible?(item, benefit)
+      benefit.conditions.map do |condition|
+        next unless condition.applicable?(item)
+        eligible = !!condition.eligible?(item)
+
+        if condition.eligibility_errors.details[:base].first
+          code = condition.eligibility_errors.details[:base].first[:error_code]
+          message = condition.eligibility_errors.full_messages.first
+        end
+        results.add(
+          item: item,
+          condition: condition,
+          success: eligible,
+          code: eligible ? nil : (code || :coupon_code_unknown_error),
+          message: eligible ? nil : (message || I18n.t(:coupon_code_unknown_error, scope: [:solidus_promotions, :eligibility_errors]))
+        )
+
+        eligible
+      end.compact.all?
+    end
+  end
+end

data/app/models/solidus_promotions/promotion_handler/coupon.rb

@@ -77,10 +77,10 @@ module SolidusPromotions
         return promotion_usage_limit_exceeded if promotion.usage_limit_exceeded? || promotion_code.usage_limit_exceeded?
         return promotion_applied if promotion_exists_on_order?(order, promotion)
 
-        # Try applying this promotion, with no effects
-        Spree::Config.promotions.order_adjuster_class.new(order, dry_run_promotion: promotion).call
+        # Check promotion eligibility
+        checker = Spree::Config.promotions.eligibility_checker_class.new(order: order, promotion: promotion)
 
-        if promotion.eligibility_results.success?
+        if checker.call
           order.solidus_order_promotions.create!(
             promotion: promotion,
             promotion_code: promotion_code
@@ -88,13 +88,13 @@ module SolidusPromotions
           order.recalculate
           set_success_code :coupon_code_applied
         else
-          set_promotion_eligibility_error(promotion)
+          set_promotion_eligibility_error(checker.results)
         end
       end
 
-      def set_promotion_eligibility_error(promotion)
-        eligibility_error = promotion.eligibility_results.detect { |result| !result.success }
-        set_error_code(eligibility_error.code, error: eligibility_error.message, errors: promotion.eligibility_results.error_messages)
+      def set_promotion_eligibility_error(results)
+        eligibility_error = results.detect { |result| !result.success }
+        set_error_code(eligibility_error.code, error: eligibility_error.message, errors: results.error_messages)
       end
 
       def promotion_usage_limit_exceeded

data/app/models/solidus_promotions/promotion_handler/page.rb

@@ -3,20 +3,20 @@
 module SolidusPromotions
   module PromotionHandler
     class Page
-      attr_reader :order, :path
+      attr_reader :order, :path, :checker
 
       def initialize(order, path)
         @order = order
         @path = path.delete_prefix("/")
+        @checker = Spree::Config.promotions.eligibility_checker_class.new(order: order, promotion: promotion)
       end
 
+      delegate :results, to: :checker
+
       def activate
-        if promotion
-          Spree::Config.promotions.order_adjuster_class.new(order, dry_run_promotion: promotion).call
-          if promotion.eligibility_results.success?
-            order.solidus_promotions << promotion
-            order.recalculate
-          end
+        if promotion && checker.call
+          order.solidus_promotions << promotion
+          order.recalculate
         end
       end
 

data/config/locales/en.yml

@@ -76,6 +76,10 @@ 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
+      taxon_revenue:
+        match_policies:
+            include: Revenue from selected taxons
+            exclude: Revenue excluding selected taxons
     item_total_condition:
       operators:
         gt: greater than
@@ -175,6 +179,11 @@ en:
       add: Add
       destroy: Delete
       update: Update
+    operators:
+      gt: greater than
+      gte: greater than or equal to
+      lt: less than
+      lte: less than or equal to
     admin:
       promotions:
         benefits:
@@ -247,6 +256,7 @@ en:
       solidus_promotions/conditions/price_product: Price matches specified product(s)
       solidus_promotions/conditions/price_taxon: Price matches specified taxon(s)
       solidus_promotions/conditions/price_option_value: Price matches specified option value(s)
+      solidus_promotions/conditions/taxon_revenue: Taxon Revenue
       solidus_promotions/promotion_category:
         one: Promotion Category
         other: Promotion Categories
@@ -324,6 +334,11 @@ en:
         description: Available only to logged in users
       solidus_promotions/conditions/user_role:
         description: Order includes User with specified Role(s)
+      solidus_promotions/conditions/taxon_revenue:
+        description: Controls eligibility by matching on revenue from or excluding selected taxons.
+        preferred_operator: Operator
+        preferred_amount: Amount
+        preferred_match_policy: Match Policy
       solidus_promotions/calculators/tiered_flat_rate:
         description: Flat Rate in tiers based on item amount
         preferred_base_amount: Base Amount

data/lib/solidus_promotions/configuration.rb

@@ -8,6 +8,11 @@ module SolidusPromotions
 
     class_name_attribute :order_adjuster_class, default: "SolidusPromotions::OrderAdjuster"
 
+    # Service object that checks whether a promotion is eligible for an order.
+    # @!attribute [rw] eligibility_checker_class
+    #   @return [String] Defaults to "SolidusPromotions::PromotionEligibilityChecker".
+    class_name_attribute :eligibility_checker_class, default: "SolidusPromotions::PromotionEligibilityChecker"
+
     class_name_attribute :coupon_code_handler_class, default: "SolidusPromotions::PromotionHandler::Coupon"
 
     # The class used to normalize coupon codes before saving or lookup.
@@ -86,7 +91,8 @@ module SolidusPromotions
       "SolidusPromotions::Conditions::ShippingMethod",
       "SolidusPromotions::Conditions::PriceProduct",
       "SolidusPromotions::Conditions::PriceTaxon",
-      "SolidusPromotions::Conditions::PriceOptionValue"
+      "SolidusPromotions::Conditions::PriceOptionValue",
+      "SolidusPromotions::Conditions::TaxonRevenue"
     ]
 
     add_class_set :benefits, default: [

data/lib/solidus_promotions/promotion_migrator.rb

@@ -61,7 +61,10 @@ module SolidusPromotions
         SELECT solidus_promotions_promotions.id AS promotion_id, solidus_promotions_promotion_code_batches.id AS promotion_code_batch_id, value, spree_promotion_codes.created_at, spree_promotion_codes.updated_at
         FROM spree_promotion_codes
         LEFT OUTER JOIN spree_promotion_code_batches ON spree_promotion_code_batches.id = spree_promotion_codes.promotion_code_batch_id
-        LEFT OUTER JOIN solidus_promotions_promotion_code_batches ON solidus_promotions_promotion_code_batches.base_code = spree_promotion_code_batches.base_code
+        LEFT OUTER JOIN solidus_promotions_promotion_code_batches
+          ON solidus_promotions_promotion_code_batches.base_code = spree_promotion_code_batches.base_code
+          AND solidus_promotions_promotion_code_batches.promotion_id = #{new_promotion.id}
+          AND solidus_promotions_promotion_code_batches.created_at = spree_promotion_code_batches.created_at
         INNER JOIN spree_promotions ON spree_promotion_codes.promotion_id = spree_promotions.id
         INNER JOIN solidus_promotions_promotions ON spree_promotions.id = solidus_promotions_promotions.original_promotion_id
         WHERE spree_promotion_codes.promotion_id = #{new_promotion.original_promotion_id};

data/lib/views/backend/solidus_promotions/admin/calculator_fields/tiered_percent/_fields.html.erb

@@ -14,7 +14,7 @@
     "#{prefix}[calculator_attributes][preferred_currency]",
     options_for_select(
       Spree::Config.available_currencies,
-      calculator.preferred_currency || Spree::Config[:currency]
+      calculator.preferred_currency || Spree::Config.currency
     ),
     { is: "select-two", class: 'fullwidth' }
   ) %>

data/lib/views/backend/solidus_promotions/admin/calculator_fields/tiered_percent_on_eligible_item_quantity/_fields.html.erb

@@ -14,7 +14,7 @@
     "#{prefix}[calculator_attributes][preferred_currency]",
     options_for_select(
       Spree::Config.available_currencies,
-      calculator.preferred_currency || Spree::Config[:currency]
+      calculator.preferred_currency || Spree::Config.currency
     ),
     { is: "select-two", class: 'fullwidth' }
   ) %>

data/lib/views/backend/solidus_promotions/admin/condition_fields/_taxon_revenue.html.erb

@@ -0,0 +1,35 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<%= fields_for param_prefix, condition do |form| %>
+  <div class="field">
+    <%= form.label :preferred_match_policy %>
+    <%= form.select :preferred_match_policy,
+      SolidusPromotions::Conditions::TaxonRevenue.match_policy_options,
+      {}, class: "custom-select fullwidth" %>
+  </div>
+
+  <div class="row">
+    <div class="col-6">
+      <div class="field">
+        <%= form.label :preferred_operator %>
+        <%= form.select :preferred_operator, options_for_select(condition.class.operator_options, condition.preferred_operator), {}, {class: 'custom-select select_item_total fullwidth'} %>
+      </div>
+    </div>
+
+    <div class="col-6">
+      <div class="field">
+        <%= fields_for param_prefix, condition do |f| %>
+          <%= f.label :preferred_amount %>
+          <%= render "solidus_promotions/admin/shared/number_with_currency", f: f, amount_attr: :preferred_amount, currency_attr: :preferred_currency %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="field taxons_condition_taxons">
+    <%= form.label :taxon_ids_string, t('solidus_promotions.taxon_condition.choose_taxons') %>
+    <%= form.hidden_field :taxon_ids_string, value: condition.taxon_ids.join(","), is: "taxon-picker", class: "fullwidth" %>
+  </div>
+
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.7.2
+  version: 4.8.0
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -127,6 +127,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/stale.yml"
+- LICENSE
 - MIGRATING.md
 - README.md
 - Rakefile
@@ -204,6 +205,7 @@ files:
 - app/models/solidus_promotions/conditions/shipping_method.rb
 - app/models/solidus_promotions/conditions/store.rb
 - app/models/solidus_promotions/conditions/taxon.rb
+- app/models/solidus_promotions/conditions/taxon_revenue.rb
 - app/models/solidus_promotions/conditions/user.rb
 - app/models/solidus_promotions/conditions/user_logged_in.rb
 - app/models/solidus_promotions/conditions/user_role.rb
@@ -228,6 +230,7 @@ files:
 - app/models/solidus_promotions/promotion_code.rb
 - app/models/solidus_promotions/promotion_code/batch_builder.rb
 - app/models/solidus_promotions/promotion_code_batch.rb
+- app/models/solidus_promotions/promotion_eligibility_checker.rb
 - app/models/solidus_promotions/promotion_finder.rb
 - app/models/solidus_promotions/promotion_handler/coupon.rb
 - app/models/solidus_promotions/promotion_handler/page.rb
@@ -357,6 +360,7 @@ files:
 - lib/views/backend/solidus_promotions/admin/condition_fields/_shipping_method.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_store.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_taxon.html.erb
+- lib/views/backend/solidus_promotions/admin/condition_fields/_taxon_revenue.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_user.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_user_logged_in.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_user_role.html.erb
@@ -413,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: New promotion system for Solidus
 test_files: []