spree_cm_commissioner 2.7.1.pre.pre7 → 2.7.1.pre.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d5c165b63ae28d6c85cc90a61791e4c358329c04ee7fc1d3e096c595a4998df
-  data.tar.gz: ac2ad57bca6d10b9fdab2de0cb4ed71fb642f566140f6fbde62e146bb6ece18d
+  metadata.gz: 185d0800fe2226d15f68f7bac984f9c4ba88b084a3669351f8cde12154b12707
+  data.tar.gz: 6d9ca32ab0abf773108964da4955281cb88c9490c671c8ddb36056343d2db8a4
 SHA512:
-  metadata.gz: 59c576a6399bb685a3c9af3df233ec99b58dadfc94abfccdfe1fd82c8adf635b78e7d1e682b65671ce66298bad1a3f76bb6c44186c1ef3f502ac614416f84e34
-  data.tar.gz: 154bcdb685ff2f61f50370b4dad38fba5a9f60914edecd5c55da28824c4f009e0563bf10e8f65632a758b2158558e77175a9a593c9bbc2158ed4407d210e6b33
+  metadata.gz: 5826bd3e8bcc01930818656e09b6ed5b2358d369f1a6bbbe89f0d6365889fd033db7e3a176fbbfda075d59460d5e23c2bc34450c20aec0477e6ce614ae21a3cc
+  data.tar.gz: 251e572fe4b88c535c90a3b87b21a557a07e232eed3551dd8679d16f14cbd8d0e517f2a8c3c1e1b0a34f4fdeff0db4570df9b6990d5eb9305c27add3d85deee1

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.7.1.pre.pre7)
+    spree_cm_commissioner (2.7.1.pre.pre9)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/spree/api/v2/storefront/pricing_previews_controller.rb

@@ -38,8 +38,12 @@ module Spree
             render_error_payload(e.message, 422)
           end
 
-          private
+          # override
+          def default_resource_includes
+            ['pricing_adjustments']
+          end
 
+          # override
           def resource_serializer
             SpreeCmCommissioner::V2::Storefront::PricingPreviewSerializer
           end

data/app/controllers/spree/api/v2/tenant/pricing_previews_controller.rb

@@ -7,8 +7,7 @@ module Spree
           def index
             permitted_preview_params = params.permit(SpreeCmCommissioner::PricingModels::OrderContext::PREVIEW_PERMITTED_PARAMS)
             order_context = SpreeCmCommissioner::PricingModels::OrderContext.load!(
-              permitted_preview_params[:order_context],
-              tenant_id: current_tenant.id
+              permitted_preview_params[:order_context]&.merge(tenant_id: current_tenant.id)
             )
 
             pricing_models_updated_at = SpreeCmCommissioner::PricingModel.joins(:vendor)
@@ -20,6 +19,7 @@ module Spree
 
             cached_result = Rails.cache.fetch(cache_key, expires_in: 60.seconds) do
               result = SpreeCmCommissioner::PricingModels::Preview.call(order_context: order_context)
+
               if result.success?
                 {
                   success: true,
@@ -44,6 +44,12 @@ module Spree
 
           private
 
+          # override
+          def default_resource_includes
+            ['pricing_adjustments']
+          end
+
+          # override
           def resource_serializer
             Spree::V2::Tenant::PricingPreviewSerializer
           end

data/app/serializers/spree/v2/tenant/preview_adjustment_serializer.rb

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Tenant
+      class PreviewAdjustmentSerializer < BaseSerializer
+        attributes :label, :amount, :action_type, :pricing_action,
+                   :adjustable_type, :adjustable_id, :line_item_id, :guest_ids
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/pricing_preview_serializer.rb

@@ -6,9 +6,7 @@ module Spree
 
         attributes :item_total, :total, :pricing_adjustment_total
 
-        attribute :pricing_adjustments do |object|
-          object.pricing_adjustments.map(&:to_h)
-        end
+        has_many :pricing_adjustments, serializer: Spree::V2::Tenant::PreviewAdjustmentSerializer
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/preview_adjustment_serializer.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class PreviewAdjustmentSerializer < BaseSerializer
+        attributes :label, :amount, :action_type, :pricing_action,
+                   :adjustable_type, :adjustable_id, :line_item_id, :guest_ids
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/pricing_preview_serializer.rb

@@ -6,9 +6,7 @@ module SpreeCmCommissioner
 
         attributes :item_total, :total, :pricing_adjustment_total
 
-        attribute :pricing_adjustments do |object|
-          object.pricing_adjustments.map(&:to_h)
-        end
+        has_many :pricing_adjustments, serializer: SpreeCmCommissioner::V2::Storefront::PreviewAdjustmentSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/pricing_models/activate.rb

@@ -4,9 +4,6 @@ module SpreeCmCommissioner
       prepend ::Spree::ServiceModule::Base
 
       def call(order:)
-        return failure(:order_is_not_persisted) unless order.persisted?
-        return failure(:order_not_completed) unless order.completed?
-
         order_context = OrderContext.build_from_context(fallback_order: order)
 
         preview_result = Preview.call(order_context: order_context)

data/lib/spree_cm_commissioner/pricing_models/order_context.rb

@@ -19,12 +19,11 @@ module SpreeCmCommissioner
         @line_item_contexts = options[:line_item_contexts] || []
       end
 
-      def self.load!(params, tenant_id: nil)
-        raise ArgumentError, 'order_context is required' if params.nil?
-
+      def self.load!(params)
         params = params.to_h.deep_symbolize_keys
         number = params[:number].presence
         token  = params[:token].presence
+        tenant_id = params[:tenant_id].presence
 
         raise ArgumentError, 'order_context.number is required' if number.blank?
         raise ArgumentError, 'order_context.token is required' if token.blank?

data/lib/spree_cm_commissioner/pricing_models/preview_adjustment.rb

@@ -1,10 +1,11 @@
 module SpreeCmCommissioner
   module PricingModels
     class PreviewAdjustment
-      attr_reader :label, :amount, :action_type, :pricing_action,
+      attr_reader :id, :label, :amount, :action_type, :pricing_action,
                   :adjustable_type, :adjustable_id, :line_item_id, :guest_ids
 
       def initialize(options = {})
+        @id = SecureRandom.uuid
         @label = options[:label]
         @amount = options[:amount]
         @action_type = options[:action_type]
@@ -14,17 +15,6 @@ module SpreeCmCommissioner
         @line_item_id = options[:line_item_id]
         @guest_ids = Array(options[:guest_ids])
       end
-
-      def to_h
-        {
-          label: label,
-          amount: amount,
-          action_type: action_type,
-          pricing_action_id: pricing_action&.id,
-          line_item_id: line_item_id,
-          guest_ids: guest_ids.presence
-        }.compact
-      end
     end
   end
 end

data/lib/spree_cm_commissioner/pricing_models/pricing_preview.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   module PricingModels
     class PricingPreview
-      attr_reader :id, :item_total, :total, :pricing_adjustment_total, :pricing_adjustments
+      attr_reader :id, :item_total, :total, :pricing_adjustment_total, :pricing_adjustments, :pricing_adjustment_ids
 
       def initialize(id:, item_total:, total:, pricing_adjustment_total:, pricing_adjustments:)
         @id = id
@@ -9,6 +9,7 @@ module SpreeCmCommissioner
         @total = total
         @pricing_adjustment_total = pricing_adjustment_total
         @pricing_adjustments = pricing_adjustments
+        @pricing_adjustment_ids = pricing_adjustments.map(&:id)
       end
     end
   end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.7.1-pre7'.freeze
+  VERSION = '2.7.1-pre9'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.7.1.pre.pre7
+  version: 2.7.1.pre.pre9
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1923,6 +1923,7 @@ files:
 - app/serializers/spree/v2/tenant/order_serializer.rb
 - app/serializers/spree/v2/tenant/payment_method_group_serializer.rb
 - app/serializers/spree/v2/tenant/payment_method_serializer.rb
+- app/serializers/spree/v2/tenant/preview_adjustment_serializer.rb
 - app/serializers/spree/v2/tenant/pricing_preview_serializer.rb
 - app/serializers/spree/v2/tenant/product_dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/product_serializer.rb
@@ -2001,6 +2002,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/menu_serializer_decorator.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/payment_method_group_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/pin_code_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/preview_adjustment_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/price_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/pricing_preview_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/product_dynamic_field_serializer.rb