solidus_promotions 4.6.3 → 4.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f0d673a8fd62d82e0efd7cf970a65d91e580c234933414e8a21e9f7d4e94851
-  data.tar.gz: fafb075b7983e18e6b026a06f17873d835e8218d79a3304d988d010d846208bb
+  metadata.gz: fd3c69859107feca6becf3bc1749cd8643b5ad2ae8f299938f788c3aaa2d0700
+  data.tar.gz: 652083d2d5f614adc091d5939943309d277a31316bddebf0e55642b9dc52ad90
 SHA512:
-  metadata.gz: 245250786e0a04e6137ffbedd7f21b36447b19974c0f636ca1f6d19ce13763505adb5c802f456c0db4fbfaa1cb60a8fc84722e668c32a8c0bec579370cadd245
-  data.tar.gz: e22b24de21453c50f17eb794a530da1bb361883f6597a86c5fdfcc78f9ea3530522f267a7c62f8493316b91231f5f82438d729b1285d3f8c50b576eeb4164eb4
+  metadata.gz: 803178ee5a8e3830b07b8d6521e936f20f28ec2ce5630af05f456140c97970e1e2cfdcceff0dac17b7f35faeda43528463c6929854b85575f67fc988d4428239
+  data.tar.gz: 81e15dc5e098cf775cfff74898983d5006acc4b165c8d5496abd6098c2ea999def63287c56a43df46d476f7052d2e9b9887ff6b31a7dd1b41ffe7fe4c0665c2a

data/app/models/solidus_promotions/benefit.rb

@@ -12,7 +12,13 @@ module SolidusPromotions
     before_destroy :remove_adjustments_from_incomplete_orders
     before_destroy :raise_for_adjustments_for_completed_orders
 
-    belongs_to :promotion, inverse_of: :benefits
+    # @!attribute [rw] promotion
+    #   The owning promotion.
+    #   @return [SolidusPromotions::Promotion]
+    belongs_to :promotion, -> { with_discarded }, inverse_of: :benefits
+    # @!attribute [rw] original_promotion_action
+    #   Back-reference to the original Solidus (Spree) promotion action, when migrated.
+    #   @return [Spree::PromotionAction, nil]
     belongs_to :original_promotion_action, class_name: "Spree::PromotionAction", optional: true
     has_many :adjustments, class_name: "Spree::Adjustment", as: :source, dependent: :restrict_with_error
     has_many :shipping_rate_discounts, class_name: "SolidusPromotions::ShippingRateDiscount", inverse_of: :benefit, dependent: :restrict_with_error

data/app/models/solidus_promotions/promotion.rb

@@ -12,7 +12,7 @@ module SolidusPromotions
       optional: true,
       inverse_of: :promotions
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
-    has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy
+    has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy, inverse_of: :promotion
     has_many :conditions, through: :benefits
     has_many :codes, class_name: "SolidusPromotions::PromotionCode", dependent: :destroy, inverse_of: :promotion
     has_many :code_batches, class_name: "SolidusPromotions::PromotionCodeBatch", dependent: :destroy
@@ -171,6 +171,7 @@ module SolidusPromotions
 
     def delete_cart_connections
       order_promotions.where(order: Spree::Order.incomplete).destroy_all
+      benefits.each(&:remove_adjustments_from_incomplete_orders)
     end
   end
 end

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

@@ -5,6 +5,10 @@ module SolidusPromotions
     class PromotionCategoriesController < BaseController
       private
 
+      def permitted_resource_params
+        params.require(:promotion_category).permit(:name, :code)
+      end
+
       def model_class
         SolidusPromotions::PromotionCategory
       end

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

@@ -22,6 +22,10 @@ module SolidusPromotions
 
       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/solidus_promotions/admin/promotions_controller.rb

@@ -29,6 +29,13 @@ module SolidusPromotions
 
       private
 
+      def permitted_resource_params
+        params.require(:promotion).permit(
+          :name, :customer_label, :description, :promotion_category_id, :usage_limit,
+          :per_code_usage_limit, :starts_at, :expires_at, :lane, :apply_automatically, :path
+        )
+      end
+
       def collection
         return @collection if @collection
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.6.5
 platform: ruby
 authors:
 - Martin Meyerhoff