solidus_legacy_promotions 4.7.3 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2437799e27ac497bdf921ac3a8d044dfc166a072d9f368fd9cabc3a8d2a71518
-  data.tar.gz: bae186981e43abf5ca0424b75bb22ffe9119dc2d3033549d81b3a62158096010
+  metadata.gz: d28523b306aa0d6c03ffca454a927ac78b6336281ae1685e80c075de3f8ee2c4
+  data.tar.gz: 96aaeea2e3e7c7184b05e895b304e8d1d30286fe7bfba2208b58b603c8d1f8f8
 SHA512:
-  metadata.gz: d1e90fbf03bff5160dbe85165ce8c557a6440189f9f2c01caaa48789ae76d32050e281b6dd127ee400874725ca2c4f3f5657cb1676a489e1e5e005c73a46746c
-  data.tar.gz: bd39cf56788617f06c38e354bc90e8c2265a2d58998eb9e1a24e56cda4ea8f1460fe27c5b8048c9a3a69865ad241c69c0524a81c6ef78554536116251685ea15
+  metadata.gz: df7189a2c2dfd7c74da927efb2a3bad812cad398cd8b76fddfab0a6e4f3d3b9e1bae82468acfde23de7bb3ec72c4cf9dc89dcd2690f3638183c69250add15015
+  data.tar.gz: 739d1ff72a82ff639d6f8a9aaef799b7793ab8ab49afa029c4d5587e761cb04da102f8f276c2fbf8f9b348747e0b46bb317df7ef1f1221c6ca2be8ac66c3e70d

data/LICENSE

@@ -0,0 +1,29 @@
+Copyright (c) 2007-2014, Spree Commerce, Inc. and other contributors
+All rights reserved.
+
+Copyright (c) 2015-2026, 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 Spree 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/app/models/spree/calculator/distributed_amount.rb

@@ -10,7 +10,7 @@ require_dependency "spree/calculator"
 module Spree
   class Calculator::DistributedAmount < Calculator
     preference :amount, :decimal, default: 0
-    preference :currency, :string, default: -> { Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Config.currency }
 
     def compute_line_item(line_item)
       return 0 unless line_item

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

@@ -7,7 +7,7 @@ module Spree
     preference :first_item, :decimal, default: 0
     preference :additional_item, :decimal, default: 0
     preference :max_items, :integer, default: 0
-    preference :currency, :string, default: -> { Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Config.currency }
 
     def compute(object)
       items_count = object.quantity

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

@@ -6,7 +6,7 @@ module Spree
   class Calculator::TieredFlatRate < Calculator
     preference :base_amount, :decimal, default: 0
     preference :tiers, :hash, default: {}
-    preference :currency, :string, default: -> { Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Config.currency }
 
     before_validation do
       # Convert tier values to decimals. Strings don't do us much good.

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

@@ -6,7 +6,7 @@ module Spree
   class Calculator::TieredPercent < Calculator
     preference :base_percent, :decimal, default: 0
     preference :tiers, :hash, default: {}
-    preference :currency, :string, default: -> { Spree::Config[:currency] }
+    preference :currency, :string, default: -> { Spree::Config.currency }
 
     before_validation do
       # Convert tier values to decimals. Strings don't do us much good.

data/app/models/spree/promotion/order_adjustments_recalculator.rb

@@ -15,6 +15,7 @@ module Spree
 
       def call(persist: true)
         all_items = line_items + shipments
+        ActiveRecord::Associations::Preloader.new(records: all_items, associations: :adjustments).call
         all_items.each do |item|
           promotion_adjustments = item.adjustments.select(&:promotion?)
 

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

@@ -10,7 +10,7 @@ module Spree
       # To customize the error message you can also override `ineligible_message`.
       class ItemTotal < PromotionRule
         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/spree/promotion.rb

@@ -240,6 +240,7 @@ module Spree
       when Spree::LineItem
         !promotable.variant.product.promotionable?
       when Spree::Order
+        ActiveRecord::Associations::Preloader.new(records: promotable.line_items, associations: {variant: :product}).call
         promotable.line_items.any? { |line_item| !line_item.variant.product.promotionable? }
       end
     end

data/lib/controllers/backend/spree/admin/promotion_categories_controller.rb

@@ -3,11 +3,6 @@
 module Spree
   module Admin
     class PromotionCategoriesController < ResourceController
-      private
-
-      def permitted_resource_params
-        params.require(:promotion_category).permit(:name, :code)
-      end
     end
   end
 end

data/lib/controllers/backend/spree/admin/promotion_code_batches_controller.rb

@@ -22,10 +22,6 @@ module Spree
 
       private
 
-      def permitted_resource_params
-        params.require(:promotion_code_batch).permit(:base_code, :number_of_codes, :join_characters, :email)
-      end
-
       def build_promotion_code_batch
         @promotion_code_batch.process
       end

data/lib/controllers/backend/spree/admin/promotions_controller.rb

@@ -31,45 +31,6 @@ module Spree
 
       private
 
-      def permitted_resource_params
-        params.fetch(:promotion, {}).permit(
-          :name, :description, :promotion_category_id, :usage_limit, :per_code_usage_limit,
-          :starts_at, :expires_at, :apply_automatically, :path,
-          promotion_rules_attributes: [
-            :id, :product_ids_string, :taxon_ids_string, :user_ids_string,
-            *preference_attributes(Spree::Config.promotions.rules),
-            store_ids: []
-          ],
-          promotion_actions_attributes: [
-            :id, :calculator_type,
-            *preference_attributes(Spree::Config.promotions.actions),
-            calculator_attributes: preference_attributes(promotion_calculators)
-          ]
-        )
-      end
-
-      def promotion_calculators
-        Spree::Config.promotions.actions.flat_map do |action|
-          Spree::Config.promotions.calculators[action].to_a
-        end
-      end
-
-      # Permits the preferences declared by the given rule, action or calculator classes,
-      # matching each preference's shape (array and hash preferences may hold multiple values).
-      def preference_attributes(klasses)
-        klasses.uniq.flat_map do |klass|
-          instance = klass.new
-          instance.defined_preferences.map do |name|
-            attribute = :"preferred_#{name}"
-            case instance.preference_type(name)
-            when :array then [attribute, {attribute => []}]
-            when :hash then {attribute => {}}
-            else attribute
-            end
-          end
-        end.flatten.uniq
-      end
-
       def location_after_save
         spree.edit_admin_promotion_url(@promotion)
       end
@@ -94,7 +55,7 @@ module Spree
       end
 
       def promotion_code_batch_params
-        params.require(:promotion_code_batch).permit(:base_code, :number_of_codes, :join_characters, :email)
+        params.require(:promotion_code_batch).permit!
       end
 
       def promotion_includes

data/lib/solidus_legacy_promotions/engine.rb

@@ -13,7 +13,6 @@ module SolidusLegacyPromotions
         promotions_menu_item = Spree::BackendConfiguration::MenuItem.new(
           label: :legacy_promotions,
           icon: Spree::Backend::Config.admin_updated_navbar ? "ri-megaphone-line" : "bullhorn",
-          partial: "spree/admin/shared/promotion_sub_menu",
           condition: -> { can?(:admin, Spree::Promotion) },
           url: :admin_promotions_path,
           data_hook: :admin_promotion_sub_tabs,

data/lib/views/backend/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -11,7 +11,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
     ),
     { class: 'custom-select fullwidth' }
   ) %>

data/lib/views/backend/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -11,7 +11,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
     ),
     { class: 'custom-select fullwidth' }
   ) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_legacy_promotions
 version: !ruby/object:Gem::Version
-  version: 4.7.3
+  version: 4.8.0
 platform: ruby
 authors:
 - Solidus Team
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/config/solidus_legacy_promotions/manifest.js
@@ -280,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Legacy Solidus promotion system
 test_files: []