solidus_legacy_promotions 4.5.0 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a55daf802efdf77185de8109a5214de29a6a0eecabb6630a7fbe9cd86deb526
-  data.tar.gz: 84674636a0a129b192d70ebabf17be810c0dc36790a7ed03f0edccc4a6521dee
+  metadata.gz: cf47c0f45a295148fe77753d40e3010744ea09c9e4a541213744c7534ddc0616
+  data.tar.gz: 9fceff71425ec0cd5bca313747bb602daae0417fe091144c39bf6489f9e44679
 SHA512:
-  metadata.gz: e68e598172fd94f4eedc72b1d35b325fa3d248ca209d70ddda8b9c235cc4c000a08fe5b1418b0e2dbde9b20c9a7319f10b2117003aca4a99a55db5934f30366d
-  data.tar.gz: 363c73e69b24eb4790233c0454b2649f85dba023e97310c42e8b2b6372834625b2ec41d179ea59cfdc2e0afb66deb79344bb2c667a5581c61817d209aa050bcb
+  metadata.gz: 6485062b87b025dcf87dff943480f5272a7c938cdcc46a3abf9ff9ae1fae28a68a08898e64f5070e0442c6ba939e04d0c8eebe283fcf7424ac0863c4dcdc9a14
+  data.tar.gz: 052be047b145b6798edeeabd7de5d4029048ffb5161bb9d62c743fa7ef6dce6a0b21c81d352c8dd454fd4329e5dc8c0e09b39e61f6dd01b3d95550d990a295ff

data/app/models/spree/calculator/flexi_rate.rb

@@ -13,7 +13,7 @@ module Spree
       items_count = object.quantity
       items_count = [items_count, preferred_max_items].min unless preferred_max_items.zero?
 
-      return BigDecimal(0) if items_count == 0
+      return Spree::ZERO if items_count == 0
 
       additional_items_count = items_count - 1
       preferred_first_item + preferred_additional_item * additional_items_count

data/app/models/spree/calculator/tiered_flat_rate.rb

@@ -35,8 +35,6 @@ module Spree
 
     def cast_to_d(value)
       value.to_s.to_d
-    rescue ArgumentError
-      BigDecimal(0)
     end
 
     def preferred_tiers_content

data/app/models/spree/calculator/tiered_percent.rb

@@ -42,8 +42,6 @@ module Spree
 
     def cast_to_d(value)
       value.to_s.to_d
-    rescue ArgumentError
-      BigDecimal(0)
     end
 
     def preferred_tiers_content

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -7,7 +7,7 @@ module Spree
         include Spree::CalculatedAdjustments
         include Spree::AdjustmentSource
 
-        has_many :adjustments, as: :source
+        has_many :adjustments, as: :source, dependent: :restrict_with_error
 
         delegate :eligible?, to: :promotion
 
@@ -43,7 +43,7 @@ module Spree
         # item_total and ship_total
         def compute_amount(calculable)
           amount = calculator.compute(calculable)
-          amount ||= BigDecimal(0)
+          amount ||= Spree::ZERO
           amount = amount.abs
           [(calculable.item_total + calculable.ship_total), amount].min * -1
         end

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -7,7 +7,7 @@ module Spree
         include Spree::CalculatedAdjustments
         include Spree::AdjustmentSource
 
-        has_many :adjustments, as: :source
+        has_many :adjustments, as: :source, dependent: :restrict_with_error
 
         delegate :eligible?, to: :promotion
 
@@ -37,7 +37,7 @@ module Spree
           order = adjustable.is_a?(Order) ? adjustable : adjustable.order
           return 0 unless promotion.line_item_actionable?(order, adjustable)
           promotion_amount = calculator.compute(adjustable)
-          promotion_amount ||= BigDecimal(0)
+          promotion_amount ||= Spree::ZERO
           promotion_amount = promotion_amount.abs
           [adjustable.amount, promotion_amount].min * -1
         end

data/app/models/spree/promotion/actions/create_quantity_adjustments.rb

@@ -6,7 +6,7 @@ module Spree
       class CreateQuantityAdjustments < CreateItemAdjustments
         preference :group_size, :integer, default: 1
 
-        has_many :line_item_actions, foreign_key: :action_id, dependent: :destroy
+        has_many :line_item_actions, foreign_key: :action_id, dependent: :destroy, inverse_of: :action
         has_many :line_items, through: :line_item_actions
 
         ##
@@ -57,7 +57,7 @@ module Spree
         #
         def compute_amount(line_item)
           adjustment_amount = calculator.compute(PartialLineItem.new(line_item))
-          adjustment_amount ||= BigDecimal(0)
+          adjustment_amount ||= Spree::ZERO
           adjustment_amount = adjustment_amount.abs
 
           order = line_item.order

data/app/models/spree/promotion/rules/first_order.rb

@@ -14,7 +14,7 @@ module Spree
           @user = order.try(:user) || options[:user]
           @email = order.email
 
-          if (user || email) && (completed_orders.present? && completed_orders.first != order)
+          if (user || email) && completed_orders.present? && completed_orders.first != order
             eligibility_errors.add(:base, eligibility_error_message(:not_first_order), error_code: :not_first_order)
           end
 

data/app/models/spree/promotion/rules/product.rb

@@ -8,8 +8,11 @@ module Spree
       # either come from assigned product group or are assingned directly to
       # the rule.
       class Product < PromotionRule
-        has_many :product_promotion_rules, dependent: :destroy, foreign_key: :promotion_rule_id,
-                                           class_name: 'Spree::ProductPromotionRule'
+        has_many :product_promotion_rules,
+          dependent: :destroy,
+          foreign_key: :promotion_rule_id,
+          class_name: 'Spree::ProductPromotionRule',
+          inverse_of: :promotion_rule
         has_many :products, class_name: 'Spree::Product', through: :product_promotion_rules
 
         def preload_relations
@@ -18,7 +21,7 @@ module Spree
 
         MATCH_POLICIES = %w(any all none)
 
-        validates_inclusion_of :preferred_match_policy, in: MATCH_POLICIES
+        validates :preferred_match_policy, inclusion: { in: MATCH_POLICIES }
 
         preference :match_policy, :string, default: MATCH_POLICIES.first
 

data/app/models/spree/promotion/rules/store.rb

@@ -4,9 +4,11 @@ module Spree
   class Promotion
     module Rules
       class Store < PromotionRule
-        has_many :promotion_rule_stores, class_name: "Spree::PromotionRuleStore",
-                                         foreign_key: :promotion_rule_id,
-                                         dependent: :destroy
+        has_many :promotion_rule_stores,
+          class_name: "Spree::PromotionRuleStore",
+          foreign_key: :promotion_rule_id,
+          dependent: :destroy,
+          inverse_of: :promotion_rule
         has_many :stores, through: :promotion_rule_stores, class_name: "Spree::Store"
 
         def preload_relations

data/app/models/spree/promotion/rules/taxon.rb

@@ -4,8 +4,11 @@ module Spree
   class Promotion < Spree::Base
     module Rules
       class Taxon < PromotionRule
-        has_many :promotion_rule_taxons, class_name: 'Spree::PromotionRuleTaxon', foreign_key: :promotion_rule_id,
-          dependent: :destroy
+        has_many :promotion_rule_taxons,
+          class_name: 'Spree::PromotionRuleTaxon',
+          foreign_key: :promotion_rule_id,
+          dependent: :destroy,
+          inverse_of: :promotion_rule
         has_many :taxons, through: :promotion_rule_taxons, class_name: 'Spree::Taxon'
 
         def preload_relations
@@ -14,7 +17,7 @@ module Spree
 
         MATCH_POLICIES = %w(any all none)
 
-        validates_inclusion_of :preferred_match_policy, in: MATCH_POLICIES
+        validates :preferred_match_policy, inclusion: { in: MATCH_POLICIES }
 
         preference :match_policy, :string, default: MATCH_POLICIES.first
         def applicable?(promotable)

data/app/models/spree/promotion/rules/user.rb

@@ -4,9 +4,11 @@ module Spree
   class Promotion < Spree::Base
     module Rules
       class User < PromotionRule
-        has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser',
-                                        foreign_key: :promotion_rule_id,
-                                        dependent: :destroy
+        has_many :promotion_rule_users,
+          class_name: 'Spree::PromotionRuleUser',
+          foreign_key: :promotion_rule_id,
+          dependent: :destroy,
+          inverse_of: :promotion_rule
         has_many :users, through: :promotion_rule_users, class_name: Spree::UserClassHandle.new
 
         def preload_relations

data/app/models/spree/promotion.rb

@@ -204,11 +204,7 @@ module Spree
 
       if eligible?(order, promotion_code:)
         rules = eligible_rules(order)
-        if rules.blank?
-          true
-        else
-          rules.all? { |rule| rule.actionable? line_item }
-        end
+        rules.blank? || rules.all? { |rule| rule.actionable? line_item }
       else
         false
       end

data/app/models/spree/promotion_action.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 module Spree
   # Base class for all types of promotion action.
   #

data/app/models/spree/promotion_category.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class PromotionCategory < Spree::Base
-    validates_presence_of :name
-    has_many :promotions
+    validates :name, presence: true
+    has_many :promotions, dependent: :nullify
   end
 end

data/app/models/spree/promotion_chooser.rb

@@ -18,7 +18,7 @@ module Spree
         end
         best_promotion_adjustment.amount
       else
-        BigDecimal('0')
+        Spree::ZERO
       end
     end
 

data/app/models/spree/promotion_code.rb

@@ -3,7 +3,7 @@
 class Spree::PromotionCode < Spree::Base
   belongs_to :promotion, inverse_of: :codes, optional: true
   belongs_to :promotion_code_batch, class_name: "Spree::PromotionCodeBatch", optional: true
-  has_many :adjustments
+  has_many :adjustments, dependent: :restrict_with_error
 
   before_validation :normalize_code
 

data/app/models/spree/promotion_code_batch.rb

@@ -9,7 +9,7 @@ module Spree
     has_many :promotion_codes, class_name: "Spree::PromotionCode", dependent: :destroy
 
     validates :number_of_codes, numericality: { greater_than: 0 }
-    validates_presence_of :base_code, :number_of_codes
+    validates :base_code, :number_of_codes, presence: true
 
     def finished?
       state == "completed"

data/app/models/spree/promotion_rule.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/preferences/persistable'
-
 module Spree
   # Base class for all promotion rules
   class PromotionRule < Spree::Base

data/app/patches/models/solidus_legacy_promotions/spree_order_updater_patch.rb

@@ -17,7 +17,7 @@ module SolidusLegacyPromotions
 
     def update_item_totals
       [*line_items, *shipments].each do |item|
-        Spree::ItemTotal.new(item).recalculate!
+        Spree::Config.item_total_class.new(item).recalculate!
 
         # The cancellation_total isn't persisted anywhere but is included in
         # the adjustment_total.

data/app/patches/models/solidus_legacy_promotions/spree_taxon_patch.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module SolidusLegacyPromotions
+  module SpreeTaxonPatch
+    def self.prepended(base)
+      base.has_many :promotion_rule_taxons, dependent: :destroy
+      base.has_many :promotion_rules, through: :promotion_rule_taxons
+    end
+
+    ::Spree::Taxon.prepend self
+  end
+end

data/db/migrate/20231027084517_add_order_promotions_foreign_key.rb

@@ -8,7 +8,7 @@ class AddOrderPromotionsForeignKey < ActiveRecord::Migration[7.0]
 
   def down
     if foreign_key_exists?(:spree_orders_promotions, :spree_orders, column: :order_id)
-      remove_foreign_key :spree_orders_promotions, :spree_orders_promotions
+      remove_foreign_key :spree_orders_promotions, :spree_orders, column: :order_id
     end
   end
 end

data/lib/components/admin/solidus_admin/promotion_categories/edit/component.html.erb

@@ -1,15 +1,15 @@
-<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
-        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+        <%= f.text_field(:name, class: "required") %>
+        <%= f.text_field(:code, class: "required") %>
       </div>
       <% modal.with_actions do %>
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/lib/components/admin/solidus_admin/promotion_categories/edit/component.yml

@@ -1,4 +1,3 @@
 en:
   title: "Edit Promotion Category"
   cancel: "Cancel"
-  submit: "Update Promotion Category"

data/lib/components/admin/solidus_admin/promotion_categories/index/component.rb

@@ -14,7 +14,7 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
   end
 
   def turbo_frames
-    %w[resource_modal]
+    %w[resource_form]
   end
 
   def page_actions
@@ -22,7 +22,7 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
       tag: :a,
       text: t('.add'),
       href: solidus_admin.new_promotion_category_path(**search_filter_params),
-      data: { turbo_frame: :resource_modal },
+      data: { turbo_frame: :resource_form },
       icon: "add-line",
     )
   end
@@ -50,7 +50,7 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
       header: :name,
       data: ->(record) do
         link_to record.name, edit_path(record),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }
@@ -61,7 +61,7 @@ class SolidusAdmin::PromotionCategories::Index::Component < SolidusAdmin::UI::Pa
       header: :code,
       data: ->(record) do
         link_to record.code, edit_path(record),
-          data: { turbo_frame: :resource_modal },
+          data: { turbo_frame: :resource_form },
           class: 'body-link'
       end
     }

data/lib/components/admin/solidus_admin/promotion_categories/new/component.html.erb

@@ -1,15 +1,15 @@
-<%= turbo_frame_tag :resource_modal, target: "_top" do %>
+<%= turbo_frame_tag :resource_form, target: "_top" do %>
   <%= render component("ui/modal").new(title: t(".title")) do |modal| %>
-    <%= form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
+    <%= solidus_form_for @promotion_category, url: form_url, html: { id: form_id } do |f| %>
       <div class="flex flex-col gap-6 pb-4">
-        <%= render component("ui/forms/field").text_field(f, :name, class: "required") %>
-        <%= render component("ui/forms/field").text_field(f, :code, class: "required") %>
+        <%= f.text_field(:name, class: "required") %>
+        <%= f.text_field(:code, class: "required") %>
       </div>
       <% modal.with_actions do %>
         <form method="dialog">
           <%= render component("ui/button").new(scheme: :secondary, text: t('.cancel')) %>
         </form>
-        <%= render component("ui/button").new(form: form_id, type: :submit, text: t('.submit')) %>
+        <%= f.submit %>
       <% end %>
     <% end %>
   <% end %>

data/lib/components/admin/solidus_admin/promotion_categories/new/component.yml

@@ -1,4 +1,3 @@
 en:
   title: "New Promotion Category"
   cancel: "Cancel"
-  submit: "Add Promotion Category"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_legacy_promotions
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Solidus Team
 bindir: bin
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,7 @@ files:
 - app/patches/models/solidus_legacy_promotions/spree_order_updater_patch.rb
 - app/patches/models/solidus_legacy_promotions/spree_product_patch.rb
 - app/patches/models/solidus_legacy_promotions/spree_shipment_patch.rb
+- app/patches/models/solidus_legacy_promotions/spree_taxon_patch.rb
 - app/subscribers/spree/order_promotion_subscriber.rb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
@@ -278,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Legacy Solidus promotion system
 test_files: []