solidus_legacy_promotions 4.6.4 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9e1f319df5d90294698e4340b1ccbebeb9211accb65f14e53bae58e116501d2
-  data.tar.gz: 8f923a1d8643d521db0c933cbb01e2e727b4d6db4fa7e919197d21dc33b6a1b9
+  metadata.gz: 1a1f3d45ecedafba24cc02e42d5ad8a6edf69d65c582f73176405811c3d1adaa
+  data.tar.gz: 3d7e32c4fd736d62478216c34d1a370b64ae5e187bc3aaf06990da07ce4b0517
 SHA512:
-  metadata.gz: 19e69fb73619b740655465133ef49b0bc7d72691458f53c2299c128e83806b24c7b90f321c1b34dba52f938ade84d6871c548e4e4a249ca7b5eda32841914335
-  data.tar.gz: bdb0dea08feb1ecac391281d670b321f03aa8ad136c9678e2da18a2b0cf6fe455eaecade8aac5a9e55a916c84c8d3a44b9fd6a35c5dbf34198b20370000ac46a
+  metadata.gz: 8329b1b42c15c8af828192ba407f1da24c9f593dc48bf4e7c763928ca311f3fa7ac1291e8145ed71f95b1185edcf8f5682951b5ba453db18c4b6c769c156c507
+  data.tar.gz: f1c4960b918ccc033be6451daecced317b1f733aa97886ccb78fc9b9df8389d7983e138936b55fc99766f417d06035cb3865861ffbad6628ae3665761eccec4d

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

@@ -3,6 +3,11 @@
 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,6 +22,10 @@ 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,6 +31,45 @@ 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
@@ -55,7 +94,7 @@ module Spree
       end
 
       def promotion_code_batch_params
-        params.require(:promotion_code_batch).permit!
+        params.require(:promotion_code_batch).permit(:base_code, :number_of_codes, :join_characters, :email)
       end
 
       def promotion_includes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_legacy_promotions
 version: !ruby/object:Gem::Version
-  version: 4.6.4
+  version: 4.6.5
 platform: ruby
 authors:
 - Solidus Team
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 4.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 4.6.5
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 4.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: 4.6.5
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement