spree_cm_commissioner 2.7.1.pre.pre8 → 2.8.0.pre.patch1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aead7dbe0a1723c8c08996fe74ba64198a19134aeac915fb77f45b96979ce9a8
-  data.tar.gz: c591f41addd0555cd853de9cd10a3326a72a23e1069429f20f4564582b5a4b6f
+  metadata.gz: 624d077988823212d28d3809a7fb549cea92fd6f057f92d160d3eac8acfd6af5
+  data.tar.gz: 19203d0d9a970fc41900bf4cb2c37c9c6441f3c08a9445300d4f76d5fbf3a6bd
 SHA512:
-  metadata.gz: 608c9766931ce6858cacd8118d1c9c384f3a013724136226ef24d3b796b0bfd7890c72541c8716d500814226daedbe762bac6d2e20ca8c158b4e53c112fb9346
-  data.tar.gz: 3ca15cc172c6c7219eb56309fc7665fd8775692770e37dfec4325fdfe3c605fa7e2eca80dd5f6e8efcb6bb7ec2dcd02396a3ba629b776a38aafd7240267769c6
+  metadata.gz: 62f6d0064ceb620aa87db423ffcfba07d7cbdd15e9184174562fdb4c4ba4e0a563830f5f4dfbfc5ad70f623af48a0f8e2948111ff4cc429605d7ddaa1c7c8f47
+  data.tar.gz: 736b84fb19babcba6a9e25074c8616cb4a12921f758e00c4d7c683b9550117a014543e75d47c8e8b83a50268bc83e71228d7aad04d0f24da7736f8b5ae0fa169

data/.env.example

@@ -34,6 +34,7 @@ DISTANCE_SIGNING_KEY=hei********************VY
 
 # Cache durations (in seconds) for different content types
 # See: app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
+CACHE_AUTO_INVALIDATION_DISABLED="" # Set to yes to disable CDN cache invalidation entirely (kill switch)
 CACHE_CDN_MAX_AGE=86400 # CDN/server-side cache duration for all responses
 CACHE_STATIC_MAX_AGE=86400 # Static content (countries, provinces, seat layouts, CMS pages) - 1 day
 CACHE_SEMI_STATIC_MAX_AGE=3600 # Semi-static content (menus, homepage backgrounds, routes) - 1 hour

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.7.1.pre.pre8)
+    spree_cm_commissioner (2.8.0.pre.patch1)
       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

@@ -19,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,
@@ -43,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/models/concerns/spree_cm_commissioner/store_metadata.rb

@@ -10,6 +10,7 @@
 # Supported types:
 # - boolean
 # - string
+# - text
 # - integer
 # - array
 # - datetime
@@ -105,7 +106,7 @@ module SpreeCmCommissioner
             ActiveModel::Type::Boolean.new.cast(raw_value)
           when :integer
             raw_value.to_i
-          when :string
+          when :string, :text
             raw_value.to_s
           when :array
             Array(raw_value)
@@ -136,6 +137,14 @@ module SpreeCmCommissioner
           end
         when :string
           validates key, length: { maximum: 255 }, allow_nil: true
+        when :text
+          validate do
+            metadata = send(column_name) || {}
+            raw_value = metadata[key.to_s]
+            next if raw_value.nil?
+
+            errors.add(key, 'must be a string') unless raw_value.is_a?(String)
+          end
         when :array
           validate do
             metadata = send(column_name) || {}

data/app/models/spree_cm_commissioner/inventory_item.rb

@@ -23,9 +23,6 @@ module SpreeCmCommissioner
 
     before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
-    # Create maintaining task to purge product related caches
-    after_commit { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product) }
-
     def public_quantity_available
       [quantity_available, MAX_DISPLAY_STOCK].min
     end

data/app/models/spree_cm_commissioner/maintenance_tasks/cache_invalidation.rb

@@ -3,6 +3,8 @@ module SpreeCmCommissioner
   module MaintenanceTasks
     class CacheInvalidation < MaintenanceTask
       def maintain
+        return if ENV['CACHE_AUTO_INVALIDATION_DISABLED'] == 'yes'
+
         if maintainable.is_a?(SpreeCmCommissioner::HomepageBackground) || maintainable.is_a?(Spree::Menu)
           SpreeCmCommissioner::HomepageDataLoader.clear_cache
         end

data/app/models/spree_cm_commissioner/route.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   class Route < Base
     include SpreeCmCommissioner::RouteType
+    include SpreeCmCommissioner::StoreMetadata
 
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant', optional: true
@@ -29,6 +30,8 @@ module SpreeCmCommissioner
 
     delegate :multi_leg?, to: :route_stops
 
+    store_public_metadata :terms_and_conditions, :text
+
     def prices_for(currency)
       route_prices.for_currency(currency)
     end

data/app/models/spree_cm_commissioner/stock_item_decorator.rb

@@ -8,7 +8,20 @@ module SpreeCmCommissioner
       base.after_commit :adjust_inventory_items_async, on: :destroy
 
       # Create maintaining task to purge product related caches
-      base.after_commit { SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product) }
+      base.after_commit :schedule_product_cache_invalidation
+    end
+
+    def schedule_product_cache_invalidation
+      return unless saved_change_to_count_on_hand?
+
+      # Only invalidate when transitioning between in-stock and out-of-stock:
+      # - out-of-stock → in-stock (0 → N): invalidate
+      # - in-stock → out-of-stock (N → 0): invalidate
+      # - non-zero to non-zero (5 → 3): skip — cached in_stock value is unchanged
+      old_val, new_val = saved_change_to_count_on_hand
+      return if old_val.to_i.positive? && new_val.to_i.positive?
+
+      SpreeCmCommissioner::MaintenanceTasks::CacheInvalidation.pending.create_or_find_by(maintainable: variant.product)
     end
 
     def update_vendor_total_inventory

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/config/initializers/spree_permitted_attributes.rb

@@ -100,6 +100,7 @@ module Spree
       vendor_id
       route_type
       route_stops
+      terms_and_conditions
     ]
   end
 end

data/db/migrate/20260504100000_add_public_and_private_metadata_to_cm_routes.rb

@@ -0,0 +1,6 @@
+class AddPublicAndPrivateMetadataToCmRoutes < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_routes, :public_metadata, :jsonb, default: {}, if_not_exists: true
+    add_column :cm_routes, :private_metadata, :jsonb, default: {}, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/pricing_models/order_context.rb

@@ -20,8 +20,6 @@ module SpreeCmCommissioner
       end
 
       def self.load!(params)
-        raise ArgumentError, 'order_context is required' if params.nil?
-
         params = params.to_h.deep_symbolize_keys
         number = params[:number].presence
         token  = params[:token].presence

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-pre8'.freeze
+  VERSION = '2.8.0-patch1'.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.pre8
+  version: 2.8.0.pre.patch1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-05-25 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
@@ -3157,6 +3159,7 @@ files:
 - db/migrate/20260330032108_add_vendor_id_to_spree_taxonomies.rb
 - db/migrate/20260401080000_create_cm_route_prices.rb
 - db/migrate/20260410080000_add_payment_locked_at_to_cm_reserved_blocks.rb
+- db/migrate/20260504100000_add_public_and_private_metadata_to_cm_routes.rb
 - db/migrate/20260506090000_remove_default_from_cm_guests_nationality_group.rb
 - docker-compose.yml
 - docs/api/scoped-access-token-endpoints.md