solidus_legacy_promotions 4.7.2 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573dbbdb176c9028730bfdbca79f31bbf9d98de7cd7ffee14f617421cb2000b4
-  data.tar.gz: d76bad24645c68b02b6635a6522004f6eb637829806298f6fc715fd0311a8612
+  metadata.gz: 2437799e27ac497bdf921ac3a8d044dfc166a072d9f368fd9cabc3a8d2a71518
+  data.tar.gz: bae186981e43abf5ca0424b75bb22ffe9119dc2d3033549d81b3a62158096010
 SHA512:
-  metadata.gz: 89219386b890e2cbefed1b8b42b55a91b9fc6fead7f5c5ba9b9138e62a9150301f4ea9d6454b7b311f240e6fdd3e7cd31863f77abdcca6d5dd493314edb9d1fa
-  data.tar.gz: 6b8a1d6c7483d78135faac5bc957cd3a604901d449afb20a181c4b0c5226ec30b22f9ff43630414235dcb2ae7f3024fe7c4ec3899d7326f17c8bee1f747c39e9
+  metadata.gz: d1e90fbf03bff5160dbe85165ce8c557a6440189f9f2c01caaa48789ae76d32050e281b6dd127ee400874725ca2c4f3f5657cb1676a489e1e5e005c73a46746c
+  data.tar.gz: bd39cf56788617f06c38e354bc90e8c2265a2d58998eb9e1a24e56cda4ea8f1460fe27c5b8048c9a3a69865ad241c69c0524a81c6ef78554536116251685ea15

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.7.2
+  version: 4.7.3
 platform: ruby
 authors:
 - Solidus Team
@@ -29,28 +29,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.2
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.2
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.2
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.7.2
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement