spree_cm_commissioner 2.1.3 → 2.1.4.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd8e2ebc1971a88d96c69508d9097178ff724540850ad868b7576ba067cfaa8
-  data.tar.gz: fc379da6272fdcad2c4c0baa626889ad62fd5c9b612a1097673b5803118ea368
+  metadata.gz: 53fa91ddf6ab2cbf7d0fecc25664116e5e8689f212e0db8a1319d6f37ba58f69
+  data.tar.gz: 3b64416fc5ecb2b21578f1a736cbffe887f264e51433d42fb28c009b72b2259c
 SHA512:
-  metadata.gz: d83ea3dc7cc3ae0a5f75dc93e37ac9f21dc6721c0c942807ab936340c28d8de02a0d563e52a94cc1caecf3da32436972c2a48c6e599a4bcd8d42f4dd96eeac67
-  data.tar.gz: e858334e4627f09e87470e9f3a01f36902a709612991971f5defdffd6202888e2fbfbebc162aabd46841cc3ec8105a952a4bbabcc9c412a33d9f44108bdf066d
+  metadata.gz: '029fc4d782f0b7e61af6675999f36905e345d4406f55098728959c05cebd26b32562c29d63af8b472dc2d98f50657b627e6ba1d8880ef81968d1611f115d8c2b'
+  data.tar.gz: ca652af048f6c0a6d2efd16c9a1b59d14eccbb2d7861a8403ffa5822bb32cdc8501c92277bcd894ca58e568ea04df4fd6367cd36992816e580a28e0459b4dcd0

data/Gemfile.lock

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

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

@@ -0,0 +1,36 @@
+# This endpoint is only used for events (via `event.seat_layout_id` to call this API).
+# For transit, seat layouts are included directly in the Trip API (no separate call needed).
+#
+# In both cases, seat availability must always be checked using:
+# (on another API) /api/v2/storefront/inventory_items?includes[]=reserved_blocks
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class SeatLayoutsController < Spree::Api::V2::ResourceController
+          # override
+          def resource
+            SpreeCmCommissioner::SeatLayout.includes(
+              :top_level_blocks,
+              { seat_sections: :blocks }
+            ).find(params[:id])
+          end
+
+          # override
+          def default_resource_includes
+            [
+              'top_level_blocks',
+              'seat_sections',
+              'seat_sections.blocks'
+            ]
+          end
+
+          # override
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::SeatLayoutSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/{models/concerns → interactors}/spree_cm_commissioner/guest_seat_updater.rb

@@ -39,7 +39,7 @@ module SpreeCmCommissioner
     def block_belongs_to_variant?(block_id, variant_id)
       return false unless block_id.present? && variant_id.present?
 
-      SpreeCmCommissioner::VariantBlock.exists?(variant_id: variant_id, block_id: block_id)
+      SpreeCmCommissioner::Block.exists?(variant_id: variant_id, id: block_id)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/trip_clone_creator.rb

@@ -1,3 +1,4 @@
+# TODO: fix this to remove variant block related code as we already drop the table.
 module SpreeCmCommissioner
   class TripCloneCreator < BaseInteractor
     delegate :vendor, :params, :original_trip, :places, :current_store, :current_vendor, to: :context

data/app/interactors/spree_cm_commissioner/variant_block_updater.rb

@@ -1,3 +1,4 @@
+# TODO: remove this class & its UI on our dashboard.
 module SpreeCmCommissioner
   class VariantBlockUpdater < BaseInteractor
     delegate :variant, :data, :stock_location, :current_store, to: :context

data/app/mailers/spree_cm_commissioner/guest_mailer.rb

@@ -0,0 +1,18 @@
+module SpreeCmCommissioner
+  class GuestMailer < Spree::BaseMailer
+    layout 'spree_cm_commissioner/layouts/guest_mailer'
+
+    def send_ticket_to_guest(guest_id, email)
+      @guest = SpreeCmCommissioner::Guest.find_by(id: guest_id)
+      @line_item = @guest.line_item
+      @order = @line_item.order
+      @product_type = @line_item.product_type || 'transit'
+      @trip = SpreeCmCommissioner::Trip.find_by(id: @line_item.trip_id) if @line_item.trip_id.present?
+      @email = email
+      @current_store = @order.store
+      subject = "#{@current_store&.name} Booking Confirmation ##{@order.number}"
+
+      mail(from: from_address, to: @email, subject: subject)
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -18,6 +18,7 @@ module SpreeCmCommissioner
 
       state_machine.around_transition to: :complete, do: :unstock_inventory!
 
+      state_machine.after_transition to: :complete, do: :mark_user_as_has_incomplete_guest_info, if: :has_incomplete_guest_info?
       state_machine.after_transition to: :complete, do: :send_transaction_email_to_user, if: :user_has_email?
       state_machine.after_transition to: :resumed, do: :precalculate_conversion
       state_machine.around_transition to: :resumed, do: :unstock_inventory!
@@ -73,6 +74,19 @@ module SpreeCmCommissioner
       end
     end
 
+    def has_incomplete_guest_info? # rubocop:disable Naming/PredicateName
+      line_items.any? do |line_item|
+        line_item.guests.any? do |guest|
+          !guest.post_registration_completed?
+        end
+      end
+    end
+
+    def mark_user_as_has_incomplete_guest_info
+      user&.public_metadata&.[]=('has_incomplete_guest_info', true)
+      user&.save!
+    end
+
     def unstock_inventory!
       ActiveRecord::Base.transaction do
         yield # Equal to block.call

data/app/models/spree_cm_commissioner/block.rb

@@ -5,17 +5,15 @@ module SpreeCmCommissioner
       sleeping_seat: 2,
       driver: 3,
       bathroom: 4,
+      text: 5,
       other: 0
     }
 
     belongs_to :seat_section, class_name: 'SpreeCmCommissioner::SeatSection', optional: true
     belongs_to :seat_layout, class_name: 'SpreeCmCommissioner::SeatLayout', optional: false
+    belongs_to :variant, class_name: 'Spree::Variant', optional: true
 
     validates :label, presence: true, if: :label_required?
-
-    has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
-    has_many :variants, class_name: 'Spree::Variant', through: :variant_blocks
-
     validates :width, presence: true, numericality: { greater_than: 0 }
     validates :height, presence: true, numericality: { greater_than: 0 }
     validates :x, presence: true, numericality: true
@@ -25,7 +23,7 @@ module SpreeCmCommissioner
     before_validation :assign_layout_from_section, if: -> { seat_layout.nil? && seat_section.present? }
 
     def label_required?
-      seatable? || block_type.to_s == 'other'
+      seatable? || %w[other text].include?(block_type.to_s)
     end
 
     def self.seatable?(block_type)

data/app/models/spree_cm_commissioner/check_in.rb

@@ -12,6 +12,7 @@ module SpreeCmCommissioner
     has_one :line_item, class_name: 'Spree::LineItem', through: :guest
 
     belongs_to :checkinable, polymorphic: true
+    belongs_to :check_in_session, class_name: 'SpreeCmCommissioner::CheckInSession', optional: true
     before_validation :set_entry_type, on: :create
 
     accepts_nested_attributes_for :guest, allow_destroy: true
@@ -20,6 +21,11 @@ module SpreeCmCommissioner
       self.entry_type = guest.entry_type
     end
 
-    validates :guest_id, uniqueness: true
+    validates :guest_id,
+              uniqueness: {
+                scope: :check_in_session_id,
+                message: I18n.t('spree.check_in.already_checked_in')
+              },
+              if: -> { check_in_session_id.present? }
   end
 end

data/app/models/spree_cm_commissioner/check_in_rule.rb

@@ -0,0 +1,6 @@
+module SpreeCmCommissioner
+  class CheckInRule < SpreeCmCommissioner::Base
+    belongs_to :check_in_session, class_name: 'SpreeCmCommissioner::CheckInSession'
+    belongs_to :ruleable, polymorphic: true
+  end
+end

data/app/models/spree_cm_commissioner/check_in_session.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  class CheckInSession < SpreeCmCommissioner::Base
+    belongs_to :event, class_name: 'Spree::Taxon', optional: false
+    has_many :check_in_rules, class_name: 'SpreeCmCommissioner::CheckInRule', dependent: :destroy
+
+    accepts_nested_attributes_for :check_in_rules, allow_destroy: true
+
+    before_create :set_position
+
+    private
+
+    def set_position
+      self.position ||= event.check_in_sessions.count + 1
+    end
+  end
+end

data/app/models/spree_cm_commissioner/guest.rb

@@ -255,7 +255,7 @@ module SpreeCmCommissioner
     def validate_block
       return if block_id.blank?
       return if line_item.blank? || line_item.variant.blank?
-      return if line_item.variant.variant_blocks.exists?(block_id: block_id)
+      return if line_item.variant.blocks.exists?(id: block_id)
 
       errors.add(:block, "does not exist in variant #{line_item.variant_id}")
     end
@@ -356,6 +356,31 @@ module SpreeCmCommissioner
       line_item&.product&.dynamic_fields&.during_check_in&.any?
     end
 
+    def cm_check_in_rules
+      SpreeCmCommissioner::CheckInRule.where(ruleable_id: line_item.product_id)
+    end
+
+    def eligible_check_in_sessions
+      check_in_session_ids = []
+
+      cm_check_in_rules.includes(:check_in_session).find_each do |rule|
+        case rule.ruleable_type
+        when 'Spree::Product'
+          check_in_session_ids << rule.check_in_session_id if line_item.product_id == rule.ruleable_id
+        when 'Spree::Variant'
+          check_in_session_ids << rule.check_in_session_id if line_item.variant_id == rule.ruleable_id
+        when 'Spree::OptionValue'
+          check_in_session_ids << rule.check_in_session_id if line_item.variant.option_value_ids.include?(rule.ruleable_id)
+        end
+      end
+
+      SpreeCmCommissioner::CheckInSession.where(id: check_in_session_ids.uniq)
+    end
+
+    def can_check_in?(session)
+      eligible_check_in_sessions.include?(session)
+    end
+
     private
 
     def product_dynamic_fields

data/app/models/spree_cm_commissioner/import.rb

@@ -2,8 +2,10 @@ module SpreeCmCommissioner
   class Import < Base
     extend FriendlyId
 
-    enum status: { :queue => 0, :progress => 1, :done => 2, :failed => 3 }
+    enum :status, { :queue => 0, :progress => 1, :done => 2, :failed => 3 }
     has_one_attached :imported_file
     friendly_id :name, use: :slugged
+
+    belongs_to :importable, polymorphic: true
   end
 end

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -22,10 +22,11 @@ module SpreeCmCommissioner
       base.has_many :pending_guests, pending_guests_query, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
       base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :product
 
+      base.before_validation -> { self.product_type = variant.product_type || product.product_type }, if: -> { product_type.nil? }
+
       base.before_save :update_vendor_id
 
       base.before_create :add_due_date, if: :subscription?
-      base.before_save -> { self.product_type = variant.product_type }, if: -> { product_type.nil? }
 
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
 

data/app/models/spree_cm_commissioner/seat_layout.rb

@@ -2,8 +2,9 @@ module SpreeCmCommissioner
   class SeatLayout < Base
     has_many :seat_sections, class_name: 'SpreeCmCommissioner::SeatSection', dependent: :destroy
 
+    has_many :blocks, class_name: 'SpreeCmCommissioner::Block'
     has_many :top_level_blocks, -> { where(seat_section_id: nil) }, class_name: 'SpreeCmCommissioner::Block', dependent: :destroy
-    has_many :section_blocks, -> { where.not(seat_section_id: nil) }, class_name: 'SpreeCmCommissioner::Block'
+    has_many :section_blocks, -> { where.not(seat_section_id: nil) }, class_name: 'SpreeCmCommissioner::Block' # destroy is handled by seat_section
 
     belongs_to :layoutable, polymorphic: true
 
@@ -15,6 +16,20 @@ module SpreeCmCommissioner
 
     validates :name, presence: true
 
-    accepts_nested_attributes_for :seat_sections, :top_level_blocks
+    accepts_nested_attributes_for :seat_sections, :top_level_blocks, allow_destroy: true
+
+    after_commit :sync_seat_layout_id_to_layoutable!, if: -> { layoutable.present? }
+
+    private
+
+    # layoutable (taxon, vehicle) must have seat_layout_id attribute,
+    # either as a column or as a key in a JSONB column (e.g., metadata)
+    def sync_seat_layout_id_to_layoutable!
+      if destroyed?
+        layoutable.update!(seat_layout_id: nil)
+      else
+        layoutable.update!(seat_layout_id: id)
+      end
+    end
   end
 end

data/app/models/spree_cm_commissioner/seat_section.rb

@@ -11,6 +11,6 @@ module SpreeCmCommissioner
     validates :y, presence: true, numericality: true
     validates :rotation, presence: true, numericality: { greater_than_or_equal_to: -360, less_than_or_equal_to: 360 }
 
-    accepts_nested_attributes_for :blocks
+    accepts_nested_attributes_for :blocks, allow_destroy: true
   end
 end

data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb

@@ -14,8 +14,8 @@ module SpreeCmCommissioner
 
       def options
         {
-          from_date: line_item.from_date,
-          to_date: line_item.to_date
+          from_date: line_item.date_range.first,
+          to_date: line_item.date_range.last
         }
       end
     end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -8,6 +8,14 @@ module SpreeCmCommissioner
       base.preference :background_color, :string
       base.preference :foreground_color, :string
 
+      # seat_layout_id:
+      #   This model has no seat_layout column (polymorphic association), so we store the seat_layout ID in public_metadata.
+      #   This lets us check if a seat layout exists without triggering a database query.
+      #   The ID is automatically updated whenever the seat_layout is saved.
+      base.store :public_metadata, accessors: %i[
+        seat_layout_id
+      ], coder: JSON
+
       base.has_many :taxon_vendors, class_name: 'SpreeCmCommissioner::TaxonVendor'
       base.has_many :vendors, through: :taxon_vendors
 
@@ -23,6 +31,7 @@ module SpreeCmCommissioner
       base.has_many :check_ins, as: :checkinable, class_name: 'SpreeCmCommissioner::CheckIn', dependent: :nullify
       base.has_many :customer_taxons, class_name: 'SpreeCmCommissioner::CustomerTaxon'
 
+      base.has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
       base.has_one :category_icon, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::TaxonCategoryIcon'
 
       base.has_one :web_banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::TaxonWebBanner'
@@ -64,6 +73,7 @@ module SpreeCmCommissioner
       base.has_many :line_items, through: :products
       base.has_many :event_line_items, class_name: 'Spree::LineItem', foreign_key: :event_id
       base.has_many :event_products, class_name: 'Spree::Product', foreign_key: :event_id
+      base.has_many :event_variants, through: :event_products, class_name: 'Spree::Variant', source: :variants
 
       base.has_many :event_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
       base.has_many :blazer_queries, through: :event_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
@@ -75,6 +85,9 @@ module SpreeCmCommissioner
 
       base.has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
       base.has_many :places, through: :taxon_places
+      base.has_many :check_in_sessions, class_name: 'SpreeCmCommissioner::CheckInSession', foreign_key: :event_id, dependent: :destroy
+
+      base.has_many :import_orders, as: :importable, class_name: 'SpreeCmCommissioner::Imports::ImportOrder', dependent: :destroy
 
       def base.active_homepage_events
         joins(:homepage_section_relatables)

data/app/models/spree_cm_commissioner/trip.rb

@@ -1,15 +1,25 @@
 module SpreeCmCommissioner
   class Trip < Base
+    include ::Spree::Metadata
     include SpreeCmCommissioner::RouteType
 
     attr_accessor :hours, :minutes, :seconds
 
+    # seat_layout_id:
+    #   This model has no seat_layout column (polymorphic association), so we store the seat_layout ID in public_metadata.
+    #   This lets us check if a seat layout exists without triggering a database query.
+    #   The ID is automatically updated whenever the seat_layout is saved.
+    store :public_metadata, accessors: %i[
+      seat_layout_id
+    ], coder: JSON
+
     before_validation :convert_duration_to_seconds
 
     belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
 
     belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: false
+    has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
 
     belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
     belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
@@ -23,14 +33,16 @@ module SpreeCmCommissioner
 
     has_many :variants, through: :product
     has_many :inventory_items, through: :variants
-    has_many :variant_blocks, through: :variants
-    has_many :blocks, through: :variant_blocks
+    has_many :blocks, through: :variants
 
     validates :departure_time, presence: true
     validates :duration, numericality: { greater_than: 0 }
     validate :origin_and_destination_cannot_be_the_same
 
-    accepts_nested_attributes_for :trip_stops, :product, allow_destroy: true
+    # before create, duplicate seat layout from vehicle if present
+    before_validation :duplicate_seat_layout_from_vehicle, if: -> { seat_layout.nil? && vehicle.present? && vehicle.seat_layout.present? }
+
+    accepts_nested_attributes_for :trip_stops, :product, :seat_layout, allow_destroy: true
 
     self.whitelisted_ransackable_associations = %w[product vehicle]
     self.whitelisted_ransackable_attributes = %w[origin_place_id destination_place_id]
@@ -56,12 +68,32 @@ module SpreeCmCommissioner
       departure_time + duration.seconds
     end
 
-    private
-
     def origin_and_destination_cannot_be_the_same
       return unless origin_place_id == destination_place_id
 
       errors.add(:base, 'Origin and destination cannot be the same')
     end
+
+    private
+
+    def duplicate_seat_layout_from_vehicle
+      original = vehicle.seat_layout
+
+      self.seat_layout_attributes =
+        original.attributes.except('id', 'created_at', 'updated_at', 'layoutable_id', 'layoutable_type')
+                .merge(
+                  seat_sections_attributes: original.seat_sections.map do |section|
+                    section.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id')
+                          .merge(
+                            blocks_attributes: section.blocks.map do |block|
+                              block.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id', 'seat_section_id')
+                            end
+                          )
+                  end,
+                  top_level_blocks_attributes: original.top_level_blocks.map do |block|
+                    block.attributes.except('id', 'created_at', 'updated_at', 'seat_layout_id', 'seat_section_id')
+                  end
+                )
+    end
   end
 end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -42,6 +42,9 @@ module SpreeCmCommissioner
       base.attr_accessor :assigned_roles
       base.validates_password_strength :password, if: -> { requires_strong_password? && password.present? }
 
+      # Store has_incomplete_guest_info in public_metadata for easy frontend access
+      base.store :public_metadata, accessors: [:has_incomplete_guest_info], coder: JSON
+
       define_user_places(base)
 
       def base.end_users

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -12,6 +12,8 @@ module SpreeCmCommissioner
 
       base.belongs_to :vendor, class_name: 'Spree::Vendor'
       base.has_one :event, class_name: 'Spree::Taxon', through: :product
+      base.has_one :trip, class_name: 'SpreeCmCommissioner::Trip', through: :product
+      base.has_one :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', through: :trip
 
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :product
       base.has_many :visible_option_values, lambda {
@@ -21,8 +23,7 @@ module SpreeCmCommissioner
       base.has_many :video_on_demands, class_name: 'SpreeCmCommissioner::VideoOnDemand', dependent: :destroy
       base.has_many :complete_line_items, -> { complete }, class_name: 'Spree::LineItem'
 
-      base.has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
-      base.has_many :blocks, class_name: 'SpreeCmCommissioner::Block', through: :variant_blocks
+      base.has_many :blocks, class_name: 'SpreeCmCommissioner::Block', dependent: :nullify
 
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
@@ -35,7 +36,7 @@ module SpreeCmCommissioner
 
       base.accepts_nested_attributes_for :option_values
 
-      base.before_save -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
+      base.before_validation -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
     end
 
     def delivery_required?

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,7 +1,16 @@
 module SpreeCmCommissioner
   class Vehicle < Base
+    include ::Spree::Metadata
     include SpreeCmCommissioner::VehicleType
 
+    # seat_layout_id:
+    #   This model has no seat_layout column (polymorphic association), so we store the seat_layout ID in public_metadata.
+    #   This lets us check if a seat layout exists without triggering a database query.
+    #   The ID is automatically updated whenever the seat_layout is saved.
+    store :public_metadata, accessors: %i[
+      seat_layout_id
+    ], coder: JSON
+
     belongs_to :vendor, class_name: 'Spree::Vendor'
 
     has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
@@ -14,6 +23,8 @@ module SpreeCmCommissioner
     has_many :option_values, through: :option_value_vehicles, class_name: 'Spree::OptionValue'
     has_many :amenities, through: :option_value_vehicles, source: :option_value
 
+    has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :nullify
+
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
     validates :license_plate, uniqueness: true, allow_blank: true
 

data/app/serializers/spree/v2/storefront/product_serializer_decorator.rb

@@ -15,6 +15,11 @@ module Spree
           base.attributes :need_confirmation, :product_type, :kyc, :kyc_fields, :allowed_upload_later, :allow_anonymous_booking, :use_video_as_default
           base.attributes :reveal_description, :discontinue_on, :public_metadata, :purchasable_on
 
+          # Expose only the `event_id` here instead of the full event object.
+          # This lets the client fetch event details separately (usually already cached),
+          # avoids extra DB queries from a `has_one :event` association, and keeps this response lightweight.
+          base.attributes :event_id
+
           base.attribute :purchasable_on_app do |product|
             product.purchasable_on == 'app' || product.purchasable_on == 'both'
           end

data/app/serializers/spree/v2/storefront/taxon_serializer_decorator.rb

@@ -17,6 +17,9 @@ module Spree
                           :background_color, :foreground_color, :show_badge_status,
                           :purchasable_on, :vendor_id, :available_on, :hide_video_banner
 
+          # To get full seat layout details, call the seat_layouts API with this ID.
+          base.attributes :seat_layout_id
+
           base.attribute :purchasable_on_app do |taxon|
             taxon.purchasable_on == 'app' || taxon.purchasable_on == 'both'
           end

data/app/serializers/spree/v2/storefront/user_serializer_decorator.rb

@@ -5,7 +5,7 @@ module Spree
         def self.prepended(base)
           base.attributes :first_name, :last_name, :gender, :phone_number, :intel_phone_number,
                           :country_code, :otp_enabled, :otp_email, :otp_phone_number,
-                          :confirm_pin_code_enabled, :tenant_id
+                          :confirm_pin_code_enabled, :tenant_id, :has_incomplete_guest_info
 
           base.has_one :profile, serializer: ::Spree::V2::Storefront::UserProfileSerializer
           base.has_many :device_tokens, serializer: Spree::V2::Storefront::UserDeviceTokenSerializer

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

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class BlockSerializer < BaseSerializer
-        attributes :label, :width, :height, :x, :y, :rotation, :block_type
+        attributes :label, :width, :height, :x, :y, :rotation, :block_type, :variant_id
 
         attribute :seatable, &:seatable?
       end

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

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
         attributes :departure_time, :arrival_time, :duration_in_hms, :route_type
 
         has_one :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+        has_one :seat_layout, serializer: SpreeCmCommissioner::V2::Storefront::SeatLayoutSerializer
 
         has_one :origin_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
         has_one :destination_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer

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

@@ -4,8 +4,6 @@ module SpreeCmCommissioner
       class TripVariantSerializer < BaseSerializer
         attributes :price, :display_price, :compare_at_price, :display_compare_at_price, :currency,
                    :number_of_guests, :seat_type
-
-        has_many :variant_blocks, serializer: ::SpreeCmCommissioner::V2::Storefront::VariantBlockSerializer
       end
     end
   end

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

@@ -8,8 +8,6 @@ module SpreeCmCommissioner
 
         has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
         has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
-
-        has_one :seat_layout, serializer: SpreeCmCommissioner::V2::Storefront::SeatLayoutSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/imports/create_order_service.rb

@@ -31,18 +31,33 @@ module SpreeCmCommissioner
 
       def build_order_params(order_data)
         guest_attributes = order_data.slice(*SpreeCmCommissioner::Guest.csv_importable_columns)
-        {
-          channel: construct_channel(order_data[:order_channel]),
-          email: order_data[:email],
-          phone_number: order_data[:phone_number],
-          line_items_attributes: [
-            {
-              quantity: order_data[:quantity].to_i,
-              sku: order_data[:variant_sku],
-              guests_attributes: Array.new(order_data[:quantity].to_i, guest_attributes)
-            }
-          ]
-        }
+        if order_data[:variant_id].present?
+          {
+            channel: construct_channel('google_form'),
+            email: order_data[:email],
+            phone_number: order_data[:phone_number],
+            line_items_attributes: [
+              {
+                quantity: 1,
+                variant_id: order_data[:variant_id].to_i,
+                guests_attributes: Array.new(1, guest_attributes)
+              }
+            ]
+          }
+        else
+          {
+            channel: construct_channel(order_data[:order_channel]),
+            email: order_data[:email],
+            phone_number: order_data[:phone_number],
+            line_items_attributes: [
+              {
+                quantity: order_data[:quantity].to_i,
+                sku: order_data[:variant_sku],
+                guests_attributes: Array.new(order_data[:quantity].to_i, guest_attributes)
+              }
+            ]
+          }
+        end
       end
 
       def create_order(params, index)