solidus_promotions 4.6.2 → 4.7.0

data/lib/solidus_promotions/testing_support/shared_examples/option_value_condition.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "an option value condition" do
+  let(:condition) do
+    super()
+  rescue NoMethodError
+    described_class.new
+  end
+
+  describe "#preferred_eligible_values" do
+    subject { condition.preferred_eligible_values }
+
+    it "assigns a nicely formatted hash" do
+      condition.preferred_eligible_values = {"5" => "1,2", "6" => "1"}
+      expect(subject).to eq({5 => [1, 2], 6 => [1]})
+    end
+  end
+end

data/lib/solidus_promotions/testing_support/shared_examples/product_condition.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "a product condition" do
+  let(:condition) do
+    super()
+  rescue NoMethodError
+    described_class.new
+  end
+
+  it { is_expected.to have_many :products }
+
+  describe "#product_ids_string" do
+    it "returns a string of product ids" do
+      condition.products = [create(:product), create(:product)]
+      expect(condition.product_ids_string).to eq("#{condition.products[0].id},#{condition.products[1].id}")
+    end
+  end
+
+  describe "#preload_relations" do
+    subject { condition.preload_relations }
+    it { is_expected.to eq([:products]) }
+  end
+
+  describe "#product_ids_string=" do
+    it "sets products based on a string of product ids" do
+      product_one = create(:product)
+      product_two = create(:product)
+      condition.product_ids_string = "#{product_one.id},#{product_two.id}"
+      expect(condition.products).to eq([product_one, product_two])
+    end
+  end
+
+  describe "#preload_relations" do
+    subject { condition.preload_relations }
+    it { is_expected.to eq([:products]) }
+  end
+end

data/lib/solidus_promotions/testing_support/shared_examples/promotion_calculator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "a promotion calculator" do
+  describe ".description" do
+    subject { described_class.description }
+
+    it "has a description" do
+      expect(subject.size).to be > 0
+    end
+  end
+end

data/lib/solidus_promotions/testing_support/shared_examples/taxon_condition.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "a taxon condition" do
+  let(:condition) do
+    super()
+  rescue NoMethodError
+    described_class.new
+  end
+
+  it { is_expected.to have_many :taxons }
+
+  describe "#taxon_ids_string" do
+    it "returns a string of taxon ids" do
+      condition.taxons = [create(:taxon), create(:taxon)]
+      expect(condition.taxon_ids_string).to eq("#{condition.taxons[0].id},#{condition.taxons[1].id}")
+    end
+  end
+
+  describe "#preload_relations" do
+    subject { condition.preload_relations }
+    it { is_expected.to eq([:taxons]) }
+  end
+
+  describe "#taxon_ids_string=" do
+    it "sets taxons based on a string of taxon ids" do
+      taxon_one = create(:taxon)
+      taxon_two = create(:taxon)
+      condition.taxon_ids_string = "#{taxon_one.id},#{taxon_two.id}"
+      expect(condition.taxons).to eq([taxon_one, taxon_two])
+    end
+  end
+
+  describe "#preload_relations" do
+    subject { condition.preload_relations }
+    it { is_expected.to eq([:taxons]) }
+  end
+end

data/lib/solidus_promotions/testing_support/shared_examples.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require "solidus_promotions/testing_support/shared_examples/product_condition"
+require "solidus_promotions/testing_support/shared_examples/taxon_condition"
+require "solidus_promotions/testing_support/shared_examples/option_value_condition"
+require "solidus_promotions/testing_support/shared_examples/promotion_calculator"

data/lib/views/backend/solidus_promotions/admin/benefit_fields/_advertise_price.html.erb

@@ -0,0 +1,7 @@
+
+<%= render(
+  "solidus_promotions/admin/benefit_fields/calculator_fields",
+  benefit: benefit,
+  param_prefix: param_prefix,
+  form: form
+) %>

data/lib/views/backend/solidus_promotions/admin/calculator_fields/_default_fields.html.erb

@@ -2,5 +2,5 @@
   <%= render "solidus_promotions/admin/shared/preference_fields/#{calculator.preference_type(name)}",
     name: "#{prefix}[calculator_attributes][preferred_#{name}]",
     value: calculator.get_preference(name),
-    label: calculator.class.human_attribute_name("preferred_#{name}", default: I18n.t(name, scope: :spree, default: name.humanize)) %>
+    label: calculator.class.human_attribute_name("preferred_#{name}", default: I18n.t(name, scope: :spree, default: name.to_s.humanize)) %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <div class="form-group">
   <%= fields_for "#{prefix}[calculator_attributes]", calculator do |f| %>
     <%= f.label :preferred_percent %>
-    <%= f.number_field :preferred_percent, step: 1, min: 1, max: 100, default: 1, class: "form-control" %>
+    <%= f.number_field :preferred_percent, step: 0.01, min: 1, max: 100, default: 1, class: "form-control" %>
   <% end %>
 </div>

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

@@ -5,19 +5,20 @@
 <div class="field promo-condition-option-values">
   <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
   <div class="row">
-    <div class="col-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
+    <div class="col-5"><%= label_tag nil, Spree::Product.model_name.human %></div>
     <div class="col-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
+    <div class="col-1">&nbsp;</div>
   </div>
 
   <div class="form-group">
     <div data-controller="product-option-values">
       <template data-product-option-values-target="template">
-        <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form %>
+        <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form, index: 0 %>
       </template>
-      <% form.object.preferred_eligible_values.each do |product_option_values| %>
-        <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: product_option_values, form: form %>
+      <% form.object.preferred_eligible_values.each.with_index do |product_option_values, index| %>
+        <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values:, form:, index: %>
       <% end %>
-      <div class="mb-3" data-product-option-values-target="links">
+      <div class="mt-3" data-product-option-values-target="links">
         <%= link_to t(:add_product, scope: [:solidus_promotions, :line_item_option_value_condition]), "#", class: "btn btn-outline-primary", data: { action: "click->product-option-values#add_row" } %>
       </div>
     </div>

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

@@ -7,30 +7,24 @@
   <div class="field promo-condition-option-values">
     <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
     <div class="row">
-      <div class="col-6"><%= label_tag nil, Spree::Product.model_name.human %></div>
+      <div class="col-5"><%= label_tag nil, Spree::Product.model_name.human %></div>
       <div class="col-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
+      <div class="col-1">&nbsp;</div>
     </div>
 
     <div class="form-group">
       <div data-controller="product-option-values">
         <template data-product-option-values-target="template">
-          <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form %>
+          <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form:, index: 0 %>
         </template>
-        <% form.object.preferred_eligible_values.each do |product_option_values| %>
-          <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: product_option_values, form: form %>
+        <% form.object.preferred_eligible_values.each.with_index do |product_option_values, index| %>
+          <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values:, form:, index: %>
         <% end %>
-        <div class="mb-3" data-product-option-values-target="links">
+        <div class="mt-3" data-product-option-values-target="links">
           <%= link_to t(:add_product, scope: [:solidus_promotions, :option_value_condition]), "#", class: "btn btn-outline-primary", data: { action: "click->product-option-values#add_row" } %>
         </div>
       </div>
     </div>
-
-    <div class="form-group">
-      <%= form.label :preferred_line_item_applicable do %>
-        <%= form.check_box :preferred_line_item_applicable %>
-        <%= condition.class.human_attribute_name(:preferred_line_item_applicable) %>
-      <% end %>
-    </div>
   </div>
 <% else %>
   <p>

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

@@ -0,0 +1,26 @@
+
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="field promo-condition-option-values">
+  <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
+  <div class="row">
+    <div class="col-5"><%= label_tag nil, Spree::Product.model_name.human %></div>
+    <div class="col-6"><%= label_tag nil, plural_resource_name(Spree::OptionValue) %></div>
+    <div class="col-1">&nbsp;</div>
+  </div>
+
+  <div class="form-group">
+    <div data-controller="product-option-values">
+      <template data-product-option-values-target="template">
+        <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values: [nil, []], form: form, index: 0 %>
+      </template>
+      <% form.object.preferred_eligible_values.each.with_index do |product_option_values, index| %>
+        <%= render "solidus_promotions/admin/condition_fields/line_item_option_value/option_value_fields", product_option_values:, form:, index: %>
+      <% end %>
+      <div class="mt-3" data-product-option-values-target="links">
+        <%= link_to t(:add_product, scope: [:solidus_promotions, :line_item_option_value_condition]), "#", class: "btn btn-outline-primary", data: { action: "click->product-option-values#add_row" } %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,21 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="row">
+  <div class="col-12">
+    <div class="field products_condition_products">
+      <%= label_tag "#{param_prefix}_product_ids_string", t('solidus_promotions.product_condition.choose_products') %>
+      <%= hidden_field_tag "#{param_prefix}[product_ids_string]", condition.product_ids.join(","), class: "fullwidth", is: "product-picker" %>
+    </div>
+  </div>
+  <div class="col-12">
+    <div class="form-group">
+        <%= label_tag("#{param_prefix}_preferred_match_policy", condition.class.human_attribute_name(:preferred_match_policy)) %>
+        <%= select_tag(
+          "#{param_prefix}[preferred_match_policy]",
+          options_for_select(I18n.t("solidus_promotions.conditions.price_product.match_policies").to_a.map(&:reverse), condition.preferred_match_policy),
+          class: "custom-select fullwidth"
+        ) %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,17 @@
+<p>
+  <%= condition.class.human_attribute_name(:description) %>
+</p>
+<div class="field taxons_condition_taxons">
+  <%= label_tag "#{param_prefix}_taxon_ids_string", t("solidus_promotions.taxon_condition.choose_taxons") %>
+  <%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", condition.taxon_ids.join(","), is: "taxon-picker", class: "fullwidth", id: "product_taxon_ids" %>
+</div>
+<div class="form-group">
+   <div class="form-group">
+        <%= label_tag("#{param_prefix}_preferred_match_policy", condition.class.human_attribute_name(:preferred_match_policy)) %>
+        <%= select_tag(
+              "#{param_prefix}[preferred_match_policy]",
+              options_for_select(I18n.t("solidus_promotions.conditions.price_taxon.match_policies").to_a.map(&:reverse), condition.preferred_match_policy),
+              class: "custom-select fullwidth",
+            ) %>
+    </div>
+</div>

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

@@ -17,11 +17,4 @@
       <% select = form.select :preferred_match_policy, match_policy_options %>
       <%= form.label :preferred_match_policy, t('solidus_promotions.product_condition.label', select: select).html_safe %>
     </div>
-
-    <div class="form-group">
-      <%= form.label :preferred_line_item_applicable do %>
-        <%= form.check_box :preferred_line_item_applicable %>
-        <%= condition.class.human_attribute_name(:preferred_line_item_applicable) %>
-      <% end %>
-    </div>
   <% end %>

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

@@ -17,11 +17,4 @@
     <% select = form.select :preferred_match_policy, match_policy_options %>
     <%= form.label :preferred_match_policy, t('solidus_promotions.taxon_condition.label', select: select).html_safe %>
   </div>
-
-  <div class="form-group">
-    <%= form.label :preferred_line_item_applicable do %>
-      <%= form.check_box :preferred_line_item_applicable %>
-      <%= condition.class.human_attribute_name(:preferred_line_item_applicable) %>
-    <% end %>
-  </div>
 <% end %>

data/lib/views/backend/solidus_promotions/admin/condition_fields/line_item_option_value/_option_value_fields.html.erb

@@ -1,21 +1,27 @@
-<div class="fullwidth promo-condition-option-value d-flex align-content-stretch mb-3">
-  <div class="mr-2" style="flex-grow: 1;">
+<div class="promo-condition-option-value row">
+  <div class="col-5">
     <input
       is="product-picker"
+      id="ov-product-picker-<%= index %>"
       class="w-100"
       data-action="select2Change->product-option-values#propagate_product_id_to_value_input"
+      data-multiple="false"
       type="hidden"
       value="<%= product_option_values[0] %>"
     >
   </div>
-  <div class="mr-2 ml-2" style="flex-grow: 1;">
+  <div class="col-6">
     <input
       is="option-value-picker"
+      id="option-value-picker-<%= index %>"
       class="fullwidth"
       name="<%= form.object_name %>[preferred_eligible_values][<%= product_option_values[0] %>]"
       type="hidden"
+      data-product-id="<%= product_option_values[0] %>"
       value="<%= product_option_values[1].join(",") %>"
     >
   </div>
-  <a class="fa fa-trash remove p-2" data-action="click->product-option-values#remove_row"></a>
+  <div class="col-1">
+    <a class="fa fa-trash remove p-2 float-right" data-action="click->product-option-values#remove_row"></a>
+  </div>
 </div>

data/solidus_promotions.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
 
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 - Solidus Team
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -126,7 +127,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".eslintrc.json"
 - ".github/stale.yml"
 - MIGRATING.md
 - README.md
@@ -150,19 +150,26 @@ files:
 - app/javascript/backend/solidus_promotions/web_components/variant_picker.js
 - app/jobs/solidus_promotions/promotion_code_batch_job.rb
 - app/mailers/solidus_promotions/promotion_code_batch_mailer.rb
+- app/models/concerns/solidus_promotions/adjustment_discounts.rb
 - app/models/concerns/solidus_promotions/benefits/line_item_benefit.rb
 - app/models/concerns/solidus_promotions/benefits/order_benefit.rb
 - app/models/concerns/solidus_promotions/benefits/shipment_benefit.rb
 - app/models/concerns/solidus_promotions/calculators/promotion_calculator.rb
 - app/models/concerns/solidus_promotions/conditions/line_item_applicable_order_level_condition.rb
 - app/models/concerns/solidus_promotions/conditions/line_item_level_condition.rb
+- app/models/concerns/solidus_promotions/conditions/option_value_condition.rb
 - app/models/concerns/solidus_promotions/conditions/order_level_condition.rb
+- app/models/concerns/solidus_promotions/conditions/product_condition.rb
 - app/models/concerns/solidus_promotions/conditions/shipment_level_condition.rb
+- app/models/concerns/solidus_promotions/conditions/taxon_condition.rb
+- app/models/concerns/solidus_promotions/coupon_code_normalizer.rb
 - app/models/concerns/solidus_promotions/discountable_amount.rb
+- app/models/concerns/solidus_promotions/discounted_amount.rb
 - app/models/solidus_promotions/benefit.rb
 - app/models/solidus_promotions/benefits/adjust_line_item.rb
 - app/models/solidus_promotions/benefits/adjust_line_item_quantity_groups.rb
 - app/models/solidus_promotions/benefits/adjust_shipment.rb
+- app/models/solidus_promotions/benefits/advertise_price.rb
 - app/models/solidus_promotions/benefits/create_discounted_item.rb
 - app/models/solidus_promotions/calculators/distributed_amount.rb
 - app/models/solidus_promotions/calculators/flat_rate.rb
@@ -188,6 +195,12 @@ files:
 - app/models/solidus_promotions/conditions/nth_order.rb
 - app/models/solidus_promotions/conditions/one_use_per_user.rb
 - app/models/solidus_promotions/conditions/option_value.rb
+- app/models/solidus_promotions/conditions/order_option_value.rb
+- app/models/solidus_promotions/conditions/order_product.rb
+- app/models/solidus_promotions/conditions/order_taxon.rb
+- app/models/solidus_promotions/conditions/price_option_value.rb
+- app/models/solidus_promotions/conditions/price_product.rb
+- app/models/solidus_promotions/conditions/price_taxon.rb
 - app/models/solidus_promotions/conditions/product.rb
 - app/models/solidus_promotions/conditions/shipping_method.rb
 - app/models/solidus_promotions/conditions/store.rb
@@ -205,9 +218,11 @@ files:
 - app/models/solidus_promotions/order_adjuster/choose_discounts.rb
 - app/models/solidus_promotions/order_adjuster/discount_order.rb
 - app/models/solidus_promotions/order_adjuster/load_promotions.rb
-- app/models/solidus_promotions/order_adjuster/persist_discounted_order.rb
+- app/models/solidus_promotions/order_adjuster/recalculate_promo_totals.rb
+- app/models/solidus_promotions/order_adjuster/set_discounts_to_zero.rb
 - app/models/solidus_promotions/order_promotion.rb
 - app/models/solidus_promotions/permission_sets/solidus_promotion_management.rb
+- app/models/solidus_promotions/product_advertiser.rb
 - app/models/solidus_promotions/promotion.rb
 - app/models/solidus_promotions/promotion_advertiser.rb
 - app/models/solidus_promotions/promotion_category.rb
@@ -217,11 +232,13 @@ files:
 - app/models/solidus_promotions/promotion_finder.rb
 - app/models/solidus_promotions/promotion_handler/coupon.rb
 - app/models/solidus_promotions/promotion_handler/page.rb
+- app/models/solidus_promotions/promotion_lane.rb
 - app/models/solidus_promotions/shipping_rate_discount.rb
 - app/patches/models/solidus_promotions/adjustment_patch.rb
 - app/patches/models/solidus_promotions/line_item_patch.rb
 - app/patches/models/solidus_promotions/order_patch.rb
 - app/patches/models/solidus_promotions/order_recalculator_patch.rb
+- app/patches/models/solidus_promotions/price_patch.rb
 - app/patches/models/solidus_promotions/shipment_patch.rb
 - app/patches/models/solidus_promotions/shipping_rate_patch.rb
 - app/subscribers/solidus_promotions/order_promotion_subscriber.rb
@@ -251,6 +268,9 @@ files:
 - db/migrate/20231012020928_add_db_comments_to_condition_products.rb
 - db/migrate/20231012120928_add_db_comments_to_promotion_categories.rb
 - db/migrate/20231104135812_add_managed_by_order_benefit_to_line_items.rb
+- db/migrate/20251104170913_update_promotion_code_value_collation.rb
+- db/migrate/20251104214304_separate_out_order_only_conditions.rb
+- eslint.config.mjs
 - lib/components/admin/solidus_admin/orders/show/adjustments/index/source/solidus_promotions_benefit/component.rb
 - lib/components/admin/solidus_promotions/orders/index/component.rb
 - lib/components/admin/solidus_promotions/orders/index/component.yml
@@ -288,12 +308,18 @@ files:
 - lib/solidus_promotions/testing_support/factories/solidus_promotion_factory.rb
 - lib/solidus_promotions/testing_support/factories/solidus_shipping_rate_discount_factory.rb
 - lib/solidus_promotions/testing_support/factory_bot.rb
+- lib/solidus_promotions/testing_support/shared_examples.rb
+- lib/solidus_promotions/testing_support/shared_examples/option_value_condition.rb
+- lib/solidus_promotions/testing_support/shared_examples/product_condition.rb
+- lib/solidus_promotions/testing_support/shared_examples/promotion_calculator.rb
+- lib/solidus_promotions/testing_support/shared_examples/taxon_condition.rb
 - lib/tasks/solidus_promotions/migrate_adjustments.rake
 - lib/tasks/solidus_promotions/migrate_existing_promotions.rake
 - lib/tasks/solidus_promotions/migrate_order_promotions.rake
 - lib/views/backend/solidus_promotions/admin/benefit_fields/_adjust_line_item.html.erb
 - lib/views/backend/solidus_promotions/admin/benefit_fields/_adjust_line_item_quantity_groups.html.erb
 - lib/views/backend/solidus_promotions/admin/benefit_fields/_adjust_shipment.html.erb
+- lib/views/backend/solidus_promotions/admin/benefit_fields/_advertise_price.html.erb
 - lib/views/backend/solidus_promotions/admin/benefit_fields/_calculator_fields.erb
 - lib/views/backend/solidus_promotions/admin/benefit_fields/_create_discounted_item.html.erb
 - lib/views/backend/solidus_promotions/admin/benefits/_benefit.html.erb
@@ -324,6 +350,9 @@ files:
 - lib/views/backend/solidus_promotions/admin/condition_fields/_nth_order.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_one_use_per_user.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_option_value.html.erb
+- lib/views/backend/solidus_promotions/admin/condition_fields/_price_option_value.html.erb
+- lib/views/backend/solidus_promotions/admin/condition_fields/_price_product.html.erb
+- lib/views/backend/solidus_promotions/admin/condition_fields/_price_taxon.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_product.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_shipping_method.html.erb
 - lib/views/backend/solidus_promotions/admin/condition_fields/_store.html.erb
@@ -370,6 +399,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   homepage_uri: https://github.com/solidusio/solidus/blob/main/promotions/README.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -377,14 +407,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: New promotion system for Solidus
 test_files: []

data/.eslintrc.json

@@ -1,10 +0,0 @@
-{
-  "extends": "eslint:recommended",
-  "parserOptions": {
-    "ecmaVersion": 2023,
-    "sourceType": "module"
-  },
-  "globals": {
-    "Turbo": "readonly"
-  }
-}

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

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusPromotions
-  class OrderAdjuster
-    class PersistDiscountedOrder
-      def initialize(order)
-        @order = order
-      end
-
-      def call
-        order.line_items.each do |line_item|
-          update_adjustments(line_item, line_item.current_discounts)
-        end
-
-        order.shipments.each do |shipment|
-          update_adjustments(shipment, shipment.current_discounts)
-        end
-
-        order.shipments.flat_map(&:shipping_rates).each do |shipping_rate|
-          shipping_rate.discounts = shipping_rate.current_discounts.map do |discount|
-            SolidusPromotions::ShippingRateDiscount.create!(
-              shipping_rate: shipping_rate,
-              amount: discount.amount,
-              label: discount.label,
-              benefit: discount.source
-            )
-          end
-        end
-        order.reset_current_discounts
-        order
-      end
-
-      private
-
-      attr_reader :order
-
-      # Walk through the discounts for an item and update adjustments for it. Once
-      # all of the discounts have been added as adjustments, remove any old promotion
-      # adjustments that weren't touched.
-      #
-      # @private
-      # @param [#adjustments] item a {Spree::LineItem} or {Spree::Shipment}
-      # @param [Array<SolidusPromotions::ItemDiscount>] item_discounts a list of calculated discounts for an item
-      # @return [void]
-      def update_adjustments(item, item_discounts)
-        promotion_adjustments = item.adjustments.select(&:promotion?)
-
-        active_adjustments = item_discounts.map do |item_discount|
-          update_adjustment(item, item_discount)
-        end
-        item.update(promo_total: active_adjustments.sum(&:amount))
-        # Remove any promotion adjustments tied to promotion benefits which no longer match.
-        unmatched_adjustments = promotion_adjustments - active_adjustments
-
-        item.adjustments.destroy(unmatched_adjustments)
-      end
-
-      # Update or create a new promotion adjustment on an item.
-      #
-      # @private
-      # @param [#adjustments] item a {Spree::LineItem} or {Spree::Shipment}
-      # @param [SolidusPromotions::ItemDiscount] discount_item calculated discounts for an item
-      # @return [Spree::Adjustment] the created or updated promotion adjustment
-      def update_adjustment(item, discount_item)
-        adjustment = item.adjustments.detect do |item_adjustment|
-          item_adjustment.source == discount_item.source
-        end
-
-        adjustment ||= item.adjustments.new(
-          source: discount_item.source,
-          order_id: item.is_a?(Spree::Order) ? item.id : item.order_id,
-          label: discount_item.label
-        )
-        adjustment.update!(amount: discount_item.amount)
-        adjustment
-      end
-    end
-  end
-end