solidus_promotions 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6349051a6426b230165c4ddb9d0f3e3dc90ea2c27ed9e80b5968757135fe67
-  data.tar.gz: d51b5804b5bcdcfed387a4508bc4cbd7593ee311284b51886cde909423fab6e6
+  metadata.gz: 6c806b16cf91750622bd6577afe715ac790b156131f78111827f6fd357cd3fcb
+  data.tar.gz: 35a5c2ec0bbf7d6edb53b1322da77c4128336ae805d94c4579e9e40e25ad574b
 SHA512:
-  metadata.gz: 014bfa7ca43f1c7033656d059e26dd7822188b3c024e5e8ca80ef88c981d6569b5abba6712a230ecb15129baf9f94757af9c6bb2b98b5450d63a18c5c2ce1434
-  data.tar.gz: b5e9de86e525f26598e37514f2314e3ee47d5ce9c03cfcfae618f92e18f75ef540da6aa43d36e31dd5a4eafc0491c1003b6a6dff82878eec40a4916962bcdee4
+  metadata.gz: 8a470f82057f41699defd90c694caba8c525ff7d54b0672c0f1ea27b5bf9786512b6b2f87b4d0f4f9c326c7e0a8b2bf6c6a4660589285f58509ff67c2d6e7030
+  data.tar.gz: 74f76a2e69d156e4104dd80934867fa96fac155df112c5799309e715475f9be5a6f4ca92d2aac49d4aecc6acd0fd06eaacc3cf9113ab103be8225a7e666c74e2

data/app/models/solidus_promotions/order_adjuster.rb

@@ -13,7 +13,7 @@ module SolidusPromotions
     def call
       order.reset_current_discounts
 
-      return order if (!SolidusPromotions.config.recalculate_complete_orders && order.complete?) || order.shipped?
+      return order unless SolidusPromotions::Promotion.order_activatable?(order)
 
       discounted_order = DiscountOrder.new(order, promotions, dry_run: dry_run).call
 

data/app/models/solidus_promotions/promotion.rb

@@ -2,6 +2,8 @@
 
 module SolidusPromotions
   class Promotion < Spree::Base
+    UNACTIVATABLE_ORDER_STATES = ["awaiting_return", "returned", "canceled"]
+
     include Spree::SoftDeletable
 
     belongs_to :category, class_name: "SolidusPromotions::PromotionCategory",
@@ -9,7 +11,7 @@ module SolidusPromotions
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
     has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy
     has_many :conditions, through: :benefits
-    has_many :codes, class_name: "SolidusPromotions::PromotionCode", dependent: :destroy
+    has_many :codes, class_name: "SolidusPromotions::PromotionCode", dependent: :destroy, inverse_of: :promotion
     has_many :code_batches, class_name: "SolidusPromotions::PromotionCodeBatch", dependent: :destroy
     has_many :order_promotions, class_name: "SolidusPromotions::OrderPromotion", dependent: :destroy
 
@@ -59,6 +61,14 @@ module SolidusPromotions
       lanes.sort_by(&:last).to_h
     end
 
+    def self.order_activatable?(order)
+      return false if UNACTIVATABLE_ORDER_STATES.include?(order.state)
+      return false if order.shipped?
+      return false if order.complete? && !SolidusPromotions.config.recalculate_complete_orders
+
+      true
+    end
+
     self.allowed_ransackable_associations = ["codes"]
     self.allowed_ransackable_attributes = %w[name customer_label path promotion_category_id lane updated_at]
     self.allowed_ransackable_scopes = %i[active with_discarded]

data/app/models/solidus_promotions/promotion_handler/coupon.rb

@@ -26,6 +26,10 @@ module SolidusPromotions
         self
       end
 
+      def can_apply?
+        SolidusPromotions::Promotion.order_activatable?(order)
+      end
+
       def remove
         if promotion.blank?
           set_error_code :coupon_code_not_found

data/lib/components/admin/solidus_promotions/promotions/index/component.rb

@@ -14,7 +14,7 @@ class SolidusPromotions::Promotions::Index::Component < SolidusAdmin::UI::Pages:
   end
 
   def row_url(promotion)
-    solidus_promotions.admin_promotion_path(promotion)
+    solidus_promotions.edit_admin_promotion_path(promotion)
   end
 
   def page_actions
@@ -63,14 +63,16 @@ class SolidusPromotions::Promotions::Index::Component < SolidusAdmin::UI::Pages:
       {
         header: :name,
         data: ->(promotion) do
-          content_tag :div, promotion.name
+          link_to promotion.name, row_url(promotion)
         end
       },
       {
         header: :code,
         data: ->(promotion) do
-          count = promotion.codes.count
-          (count == 1) ? promotion.codes.pick(:value) : t("spree.number_of_codes", count: count)
+          link_to solidus_promotions.admin_promotion_promotion_codes_path(promotion), title: t(".codes") do
+            count = promotion.codes.count
+            (count == 1) ? promotion.codes.pick(:value) : t("spree.number_of_codes", count: count)
+          end
         end
       },
       {

data/lib/components/admin/solidus_promotions/promotions/index/component.yml

@@ -8,3 +8,4 @@ en:
   status:
     active: Active
     inactive: Inactive
+  codes: Codes

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

@@ -25,5 +25,11 @@ module SolidusPromotions
       flash[:notice] = t(".success")
       redirect_back_or_to solidus_promotions.promotion_categories_path, status: :see_other
     end
+
+    private
+
+    def authorization_subject
+      SolidusPromotions::PromotionCategory
+    end
   end
 end

data/lib/controllers/admin/solidus_promotions/promotions_controller.rb

@@ -42,5 +42,9 @@ module SolidusPromotions
     def promotion_params
       params.require(:promotion).permit(:user_id, permitted_promotion_attributes)
     end
+
+    def authorization_subject
+      SolidusPromotions::Promotion
+    end
   end
 end

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

@@ -14,12 +14,12 @@ module SolidusPromotions
       def create
         @benefit = @benefit_type.new(benefit_params)
         @benefit.promotion = @promotion
-        if @benefit.save(validate: false)
+        if @benefit.save
           flash[:success] =
             t("spree.successfully_created", resource: SolidusPromotions::Benefit.model_name.human)
           redirect_to location_after_save, format: :html
         else
-          render :new, layout: false
+          render :new, layout: false, status: :unprocessable_entity
         end
       end
 
@@ -28,7 +28,7 @@ module SolidusPromotions
         if params.dig(:benefit, :calculator_type)
           @benefit.calculator_type = params[:benefit][:calculator_type]
         end
-        render layout: false
+        render layout: false, status: :unprocessable_entity
       end
 
       def update
@@ -39,7 +39,7 @@ module SolidusPromotions
             t("spree.successfully_updated", resource: SolidusPromotions::Benefit.model_name.human)
           redirect_to location_after_save, format: :html
         else
-          render :edit
+          render :edit, status: :unprocessable_entity
         end
       end
 

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

@@ -48,6 +48,10 @@ module SolidusPromotions
 
       private
 
+      def model_class
+        SolidusPromotions::PromotionCode
+      end
+
       def load_promotion
         @promotion = SolidusPromotions::Promotion
           .accessible_by(current_ability, :show)

data/solidus_promotions.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
   spec.files = files.grep_v(%r{^(spec|bin)/})
 
+  spec.add_development_dependency "solidus_legacy_promotions"
+
   spec.add_dependency "importmap-rails", "~> 1.2"
   spec.add_dependency "ransack-enum", "~> 1.0"
   spec.add_dependency "solidus_core", [">= 4.0.0", "< 5"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_promotions
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Martin Meyerhoff
@@ -9,8 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: solidus_legacy_promotions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: importmap-rails
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: New promotion system for Solidus