spree_cm_commissioner 2.6.2.pre.pre.7 → 2.6.2.pre.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f0592a019e7d6b4f456672d1387061b7f37b1e1aa43e0361a649ef9ca5f91ff
-  data.tar.gz: 5f3cc2b5819b9c3ec36bdade66d27b44952598c46733edcceb8be6bb0ddc1cbe
+  metadata.gz: 7f74e8768a3d439e0ba1fafc54d0869563663241901b103738920a58fbfe87fa
+  data.tar.gz: 0bbf916627713c6ff981241743592aa300a99890e3a04b83fb52cdd65491f96c
 SHA512:
-  metadata.gz: f9ba23db491fe1dc398f296848b0e252138aa3f8f2455b1ec4dcbfcdbd37be8dda2a33f1040083966c78440e803ebee399ea3ffaa43d3d4cfeab14d0d2373d6c
-  data.tar.gz: 5ccc151b675a2516212e98dbe6e445f6e87a3e6061054daeacac64ba15148c9d28a8a2976771197bd4c31615069b9e67fb44372d3420e6a7a9c4cf4e7391abc0
+  metadata.gz: 96d16699a56539c8b28eb7209a5fa27f286221d12cd70ef1ad370b21ad83c8286b5e3e632086f02001f96f997f38eb6e5ade8210d6a19bfd35717dc8bb5c3d04
+  data.tar.gz: 3af96b60312dfc64680a12dbf38af9133dc3bbc7c9de675a21bf52ef0685fc2296c741f971d566bfdeeab10e9fed6339ac448252e88176fe9f21d1d79e7d9103

data/Gemfile.lock

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

data/app/queries/spree_cm_commissioner/multi_leg_trips_query.rb

@@ -111,7 +111,7 @@ module SpreeCmCommissioner
               .where(parent: { origin_place_id: origin_id, destination_place_id: destination_id })
 
       # Apply filters
-      scope = scope.where(parent: { route_type: route_type }) if route_type.present?
+      scope = scope.where(parent: { route_type: SpreeCmCommissioner::Trip.route_types[route_type] }) if route_type.present?
       scope = scope.where(parent: { vendor_id: vendor_id }) if vendor_id.present?
       if tenant_id.present?
         scope = scope.joins('INNER JOIN spree_vendors v ON v.id = parent.vendor_id')

data/app/services/spree_cm_commissioner/guests/update_seat.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  module Guests
+    class UpdateSeat
+      prepend ::Spree::ServiceModule::Base
+
+      def call(line_item:, guest:, block_id:, updated_by:)
+        validate_params(line_item, guest, block_id, updated_by)
+
+        ApplicationRecord.transaction do
+          old_block_id = guest.block_id
+          update_reserved_block(guest, block_id, updated_by)
+          guest.update!(block_id: block_id) if old_block_id != block_id && block_id.present?
+          update_order_preload_blocks(line_item.order, old_block_id, block_id)
+
+          success(guest: guest, line_item: line_item)
+        end
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def validate_params(line_item, guest, block_id, updated_by)
+        raise 'Updated user is required' if updated_by.blank?
+        raise 'Line item not found' unless line_item
+        raise 'Guest not found' unless guest
+        raise 'Block ID is required' if block_id.blank?
+        return if block_belongs_to_variant?(block_id, line_item.variant_id)
+
+        raise "Variant change is not allowed — seat can only be updated for the same variant #{line_item.variant_id}"
+      end
+
+      def update_reserved_block(guest, block_id, updated_by)
+        reserve_block = SpreeCmCommissioner::ReservedBlock.find_by(
+          guest_id: guest.id,
+          block_id: guest.block_id
+        )
+        reserve_block.update!(block_id: block_id, updated_by_id: updated_by.id) if reserve_block && reserve_block.block_id != block_id
+      end
+
+      def update_order_preload_blocks(order, old_block_id, new_block_id)
+        preload_block_ids = Array(order.preload_block_ids).map(&:to_i)
+        preload_block_ids.delete(old_block_id.to_i)
+        preload_block_ids << new_block_id.to_i
+        order.update!(preload_block_ids: preload_block_ids.uniq)
+      end
+
+      def block_belongs_to_variant?(block_id, variant_id)
+        return false unless block_id.present? && variant_id.present?
+
+        SpreeCmCommissioner::Block.exists?(variant_id: variant_id, id: block_id)
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/vendor_places/base.rb

@@ -8,14 +8,9 @@ module SpreeCmCommissioner
       private
 
       def validate_place_type!(place_type)
-        return I18n.t('controller.vendor_places.place_type_required', default: 'Place type is required') if place_type.nil?
+        return I18n.t('vendor_places.place_type_required') if place_type.nil?
 
-        unless ALLOWED_PLACE_TYPES.include?(place_type.to_s)
-          return I18n.t(
-            'controller.vendor_places.invalid_place_type',
-            default: "Place type must be one of: #{ALLOWED_PLACE_TYPES.join(', ')}"
-          )
-        end
+        return I18n.t('vendor_places.invalid_place_type', types: ALLOWED_PLACE_TYPES.join(', ')) unless ALLOWED_PLACE_TYPES.include?(place_type.to_s)
 
         nil
       end

data/app/services/spree_cm_commissioner/vendor_places/bulk_create.rb

@@ -51,9 +51,9 @@ module SpreeCmCommissioner
 
       def validate_inputs!(place_ids:, place_type:, max_count:, location: nil)
         validate_place_type!(place_type) ||
-          (place_ids.blank? && I18n.t('controller.vendor_places.place_ids_blank')) ||
-          (place_ids.size > max_count && I18n.t('controller.vendor_places.selection_limit', count: max_count)) ||
-          (requires_location?(place_type: place_type) && location.blank? && I18n.t('controller.vendor_places.location_required'))
+          (place_ids.blank? && I18n.t('vendor_places.place_ids_blank')) ||
+          (place_ids.size > max_count && I18n.t('vendor_places.selection_limit', count: max_count)) ||
+          (requires_location?(place_type: place_type) && location.blank? && I18n.t('vendor_places.location_required'))
       end
 
       def build_vendor_place(vendor:, place_id:, place_type:, description:, location: nil)

data/config/locales/en.yml

@@ -634,6 +634,13 @@ en:
       otp_code: "OTP code"
       telegram_verification: "telegram code"
 
+  vendor_places:
+    place_ids_blank: "Please select at least one place"
+    selection_limit: "Cannot select more than %{count} places"
+    location_required: "Location is required for this place type"
+    place_type_required: "Place type is required"
+    invalid_place_type: "Place type must be one of: %{types}"
+
   notifications:
     spree_cm_commissioner:
       order_complete_notification:

data/config/locales/km.yml

@@ -461,6 +461,13 @@ km:
       update_user_login: "ធ្វើបច្ចុប្បន្នភាពលេខកូដអ្នកប្រើប្រាស់"
       otp_code: "លេខកូដ OTP"
 
+  vendor_places:
+    place_ids_blank: "សូមជ្រើសរើសយ៉ាងហោចណាស់ពេលមួយកន្លែង"
+    selection_limit: "មិនអាចជ្រើសរើសលើសពី %{count} កន្លែងបានទេ"
+    location_required: "ទីតាំងគឺចាំបាច់សម្រាប់ប្រភេទកន្លែងនេះ"
+    place_type_required: "ប្រភេទកន្លែងគឺចាំបាច់"
+    invalid_place_type: "ប្រភេទកន្លែងត្រូវតែជាមួយក្នុងចំណោម: %{types}"
+
   notifications:
     spree_cm_commissioner:
       order_complete_notification:

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.6.2.pre.pre.7'.freeze
+  VERSION = '2.6.2.pre.pre.8'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.6.2.pre.pre.7
+  version: 2.6.2.pre.pre.8
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-08 00:00:00.000000000 Z
+date: 2026-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1215,7 +1215,6 @@ files:
 - app/interactors/spree_cm_commissioner/guest_dynamic_field_notification_sender.rb
 - app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb
 - app/interactors/spree_cm_commissioner/guest_id_card_manager.rb
-- app/interactors/spree_cm_commissioner/guest_seat_updater.rb
 - app/interactors/spree_cm_commissioner/host_matcher.rb
 - app/interactors/spree_cm_commissioner/id_card_image_updater.rb
 - app/interactors/spree_cm_commissioner/image_saver.rb
@@ -2066,6 +2065,7 @@ files:
 - app/services/spree_cm_commissioner/guests/claim_invite_guest_service.rb
 - app/services/spree_cm_commissioner/guests/finalize.rb
 - app/services/spree_cm_commissioner/guests/preload_check_in_session_ids.rb
+- app/services/spree_cm_commissioner/guests/update_seat.rb
 - app/services/spree_cm_commissioner/homepage_data.rb
 - app/services/spree_cm_commissioner/homepage_data_loader.rb
 - app/services/spree_cm_commissioner/imports/orders/base.rb

data/app/interactors/spree_cm_commissioner/guest_seat_updater.rb

@@ -1,45 +0,0 @@
-module SpreeCmCommissioner
-  class GuestSeatUpdater < BaseInteractor
-    delegate :line_item,
-             :guest,
-             :block_id,
-             :updated_by, to: :context
-
-    def call
-      context.fail!(errors: 'Updated user is required') if updated_by.blank?
-      context.fail!(errors: 'Line item not found') unless line_item
-      context.fail!(errors: 'Guest not found') unless guest
-      context.fail!(errors: 'Block ID is required') if block_id.blank?
-
-      if block_id.present? && !block_belongs_to_variant?(block_id, line_item.variant_id)
-        context.fail!(errors: "Variant change is not allowed — seat can only be updated for the same variant #{line_item.variant_id}")
-      end
-
-      ActiveRecord::Base.transaction do
-        update_seat_for_guest
-      end
-    rescue StandardError => e
-      raise if defined?(Interactor::Failure) && e.is_a?(Interactor::Failure)
-
-      context.fail!(errors: e.message)
-    end
-
-    def update_seat_for_guest
-      reserve_block = SpreeCmCommissioner::ReservedBlock.find_by(
-        guest_id: guest.id,
-        block_id: guest.block_id
-      )
-      reserve_block.update!(block_id: block_id, updated_by_id: updated_by.id) if reserve_block && reserve_block.block_id != block_id
-
-      guest.update!(block_id: block_id) if guest.block_id != block_id && block_id.present?
-
-      line_item
-    end
-
-    def block_belongs_to_variant?(block_id, variant_id)
-      return false unless block_id.present? && variant_id.present?
-
-      SpreeCmCommissioner::Block.exists?(variant_id: variant_id, id: block_id)
-    end
-  end
-end