spree_cm_commissioner 2.0.3.pre.pre3 → 2.0.3.pre.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5002e62ca5423aa0f8f048cc8c1f5aa1d5e6ad8cfa432a0db2c0f7d4ef5aabde
-  data.tar.gz: d640c0e1e081b49f5317491c4bfb1a0a66903db15c22d97354f274d3fa4200b8
+  metadata.gz: de104e725d2f24613de706e3246bdc7d316520fac6eb9b21789a6b2f2c45ab06
+  data.tar.gz: df640f714603d5d38bb33ad1b7ded9f66ca5126610bf2d8bdeba79890e7ac090
 SHA512:
-  metadata.gz: 71efbcfc0e5960c3a8a80eb18791c0095d52f476c5a69a068df695524e5352372070dca03279df3961536ba0de88ffca48bff6c5b53597b29be2b513cf9d9ce3
-  data.tar.gz: 5c5632425f155a19970e0ea0d61d9e3d492fc56986bef12802158fc808099d4f8e71f2749116712bcbce87f6dc79ef500922fceff5c68d99177cf83a393d2c2f
+  metadata.gz: 782d5091a568ece086d739de4c0e8b9e1a00a97302b68d1cc982b8f9a5718fb5c4cfa928f9310427e69e11fd34211c54893104fbacbc8293d8033bf4d2213ad0
+  data.tar.gz: 8aeca4178f0bf6ce687b9cd2dffd5d648db14f1c2a5537964e6e728a73801362495d370d32509029408ec7d9d5d8fe88094fbd3da392b61e68446f4ad58b5e68

data/Gemfile.lock

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

data/app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb

@@ -0,0 +1,119 @@
+# DraftOrderCreator creates a new order for a entire journey, including outbound and (if present) inbound directions.
+#
+# Attributes:
+# - outbound_date: [Date] The date of outbound transit
+# - inbound_date:  [Date] The date of inbound transit
+# - outbound_legs: [Array<SpreeCmCommissioner::Transit::Leg>] Outbound transit legs (one for direct, multiple for connecting)
+# - inbound_legs:  [Array<SpreeCmCommissioner::Transit::Leg>] Inbound transit legs (one for direct, multiple for connecting)
+# - user:          [User] The user for whom the order is being created
+#
+# Each line item is built with precise from_date and to_date based on legs and trip stop times.
+# Each line item has guests built corresponding to seat selection blocks.
+#
+# Note: inbound_legs and inbound_date are optional; the order may represent a one-way (outbound only) journey.
+module SpreeCmCommissioner
+  module Transit
+    class DraftOrderCreator < BaseInteractor
+      delegate :outbound_date,
+               :inbound_date,
+               :outbound_legs,
+               :inbound_legs,
+               :user, to: :context
+
+      def call
+        return context.fail!(message: 'Outbound legs are missing') if outbound_legs.blank?
+
+        begin
+          context.order = create_order!
+        rescue StandardError => e
+          context.fail!(message: e.message)
+        end
+      end
+
+      def create_order!
+        order = Spree::Order.new(state: 'cart', use_billing: true, user: user)
+
+        outbound_line_items = build_line_items_for_legs!(order: order, legs: outbound_legs, initial_date: outbound_date)
+        inbound_line_items = inbound_legs.blank? ? [] : build_line_items_for_legs!(order: order, legs: inbound_legs, initial_date: inbound_date)
+
+        outbound_qty = outbound_line_items.sum(&:quantity)
+        inbound_qty = inbound_line_items.sum(&:quantity)
+
+        raise StandardError, 'Outbound & inbound line item quantities do not match' if inbound_line_items.any? && outbound_qty != inbound_qty
+        raise StandardError, order.errors.full_messages.to_sentence unless order.save
+
+        order
+      end
+
+      # Build line items for each leg, using the previous leg's to_date as the next leg's date,
+      # or the initial date for the first leg.
+      def build_line_items_for_legs!(order:, legs:, initial_date:)
+        all_line_items = []
+        current_leg_date = initial_date
+
+        legs.each do |leg|
+          leg_line_items = build_line_items_for!(leg, order, current_leg_date)
+          all_line_items.concat(leg_line_items)
+          current_leg_date = leg_line_items.last.to_date.to_date if leg_line_items.any?
+        end
+
+        all_line_items
+      end
+
+      def build_line_items_for!(leg, order, date)
+        trip = SpreeCmCommissioner::Trip.find(leg.trip_id)
+        trip_stops = trip.trip_stops.where(id: [leg.boarding_trip_stop_id, leg.drop_off_trip_stop_id]).index_by(&:id)
+
+        from_date, to_date = calculate_line_item_duration!(
+          date: date,
+          departure_time: trip_stops[leg.boarding_trip_stop_id].departure_time,
+          arrival_time: trip_stops[leg.drop_off_trip_stop_id].arrival_time
+        )
+
+        leg.seat_selections.group_by(&:variant_id).map do |variant_id, seat_selections|
+          line_item = order.line_items.new(
+            product_type: :transit,
+            from_date: from_date,
+            to_date: to_date,
+            variant_id: variant_id,
+            quantity: seat_selections.sum(&:quantity),
+            private_metadata: {
+              direction: leg.direction,
+              trip_id: leg.trip_id.to_s,
+              boarding_trip_stop_id: leg.boarding_trip_stop_id.to_s,
+              drop_off_trip_stop_id: leg.drop_off_trip_stop_id.to_s
+            }
+          )
+
+          build_guests!(line_item, seat_selections)
+
+          line_item
+        end
+      end
+
+      def build_guests!(line_item, seat_selections)
+        block_ids = seat_selections.flat_map(&:block_ids)
+
+        if block_ids.any? && block_ids.size != line_item.quantity
+          raise StandardError, "Number of blocks (#{block_ids.size}) does not match quantity (#{line_item.quantity})"
+        end
+
+        Array.new(line_item.quantity) do |index|
+          line_item.guests.new(block_id: block_ids[index])
+        end
+      end
+
+      def calculate_line_item_duration!(date:, departure_time:, arrival_time:)
+        raise StandardError, 'Departure or arrival time in trip stop is missing' if departure_time.blank? || arrival_time.blank?
+        raise StandardError, 'Arrival time cannot be before departure time' if arrival_time < departure_time
+
+        trip_duration_in_seconds = arrival_time - departure_time
+
+        from_date = date.to_datetime.change(hour: departure_time.hour, min: departure_time.min, sec: departure_time.sec)
+        to_date = from_date + trip_duration_in_seconds.seconds
+
+        [from_date, to_date]
+      end
+    end
+  end
+end

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

@@ -23,18 +23,27 @@ module SpreeCmCommissioner
 
     def date_range
       return [] unless date_present?
+      return [] unless permanent_stock?
 
-      (from_date.to_date..to_date.to_date).to_a
+      # For transit products (e.g., bus, train), only return the departure day,
+      # as the booking represents a single trip rather than a duration.
+      return [from_date.to_date] if transit?
+
+      # For products with a stay or usage period (e.g., hotel, car rental, activities),
+      # return the full date range from start to end, inclusive.
+      return (from_date.to_date..to_date.to_date).to_a if service? || accommodation?
+
+      []
     end
 
     def checkin_date
-      from_date&.to_date
+      from_date&.to_datetime
     end
 
     def checkout_date
-      return to_date ? to_date.to_date - 1.day : nil if accommodation?
+      return to_date ? to_date.to_datetime + 1.day : nil if accommodation?
 
-      to_date&.to_date
+      to_date&.to_datetime
     end
 
     private

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

@@ -1,13 +1,21 @@
+# Number of guests are depend on the variant, but user is allowed to input custom number of guests
+# which will be stored in public_metadata.
+#
+# metadata {
+#   'number_of_adults': 2,
+#   'number_of_kids': 1,
+# }
 module SpreeCmCommissioner
   module LineItemGuestsConcern
     extend ActiveSupport::Concern
 
     included do
-      validate :validate_total_adults, if: -> { public_metadata[:number_of_adults].present? }
-      validate :validate_total_kids, if: -> { public_metadata[:number_of_kids].present? }
+      validate :validate_total_adults, if: -> { valid_integer_metadata?('number_of_adults') }
+      validate :validate_total_kids, if: -> { valid_integer_metadata?('number_of_kids') }
     end
 
-    def remaining_total_guests = [number_of_guests - guests.size, 0].max
+    def number_of_adults = public_metadata['number_of_adults']&.to_i || (variant.number_of_adults * quantity)
+    def number_of_kids = public_metadata['number_of_kids']&.to_i || (variant.number_of_kids * quantity)
     def number_of_guests = number_of_adults + number_of_kids
 
     def allowed_extra_adults = variant.allowed_extra_adults * quantity
@@ -16,8 +24,7 @@ module SpreeCmCommissioner
     def allowed_total_adults = (variant.number_of_adults * quantity) + allowed_extra_adults
     def allowed_total_kids = (variant.number_of_kids * quantity) + allowed_extra_kids
 
-    def number_of_adults = public_metadata[:number_of_adults] || (variant.number_of_adults * quantity)
-    def number_of_kids = public_metadata[:number_of_kids] || (variant.number_of_kids * quantity)
+    def remaining_total_guests = [number_of_guests - guests.size, 0].max
 
     def generate_remaining_guests
       return if remaining_total_guests.zero?
@@ -28,15 +35,17 @@ module SpreeCmCommissioner
     end
 
     def extra_adults
+      return 0 unless valid_integer_metadata?('number_of_adults')
       return 0 unless extra_adults?
 
-      public_metadata[:number_of_adults] - (variant.number_of_adults * quantity)
+      public_metadata['number_of_adults'].to_i - (variant.number_of_adults * quantity)
     end
 
     def extra_kids
+      return 0 unless valid_integer_metadata?('number_of_kids')
       return 0 unless extra_kids?
 
-      public_metadata[:number_of_kids] - (variant.number_of_kids * quantity)
+      public_metadata['number_of_kids'].to_i - (variant.number_of_kids * quantity)
     end
 
     def guest_options
@@ -55,25 +64,30 @@ module SpreeCmCommissioner
     end
 
     def extra_adults?
-      public_metadata[:number_of_adults].present? && public_metadata[:number_of_adults] > variant.number_of_adults * quantity
+      return false unless valid_integer_metadata?('number_of_adults')
+
+      public_metadata['number_of_adults'].to_i > variant.number_of_adults * quantity
     end
 
     def extra_kids?
-      public_metadata[:number_of_kids].present? && public_metadata[:number_of_kids] > variant.number_of_kids * quantity
+      return false unless valid_integer_metadata?('number_of_kids')
+
+      public_metadata['number_of_kids'].to_i > variant.number_of_kids * quantity
     end
 
     private
 
-    def validate_total_adults
-      return if public_metadata[:number_of_adults] <= allowed_total_adults
+    def valid_integer_metadata?(key)
+      value = public_metadata[key.to_s]
+      value.present? && value.to_s.match?(/\A-?\d+\z/)
+    end
 
-      errors.add(:quantity, 'exceed_total_adults')
+    def validate_total_adults
+      errors.add(:quantity, 'exceed_total_adults') if public_metadata['number_of_adults'].to_i > allowed_total_adults
     end
 
     def validate_total_kids
-      return if public_metadata[:number_of_kids] <= allowed_total_kids
-
-      errors.add(:quantity, 'exceed_total_kids')
+      errors.add(:quantity, 'exceed_total_kids') if public_metadata['number_of_kids'].to_i > allowed_total_kids
     end
   end
 end

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

@@ -0,0 +1,89 @@
+# This concern allow line item to have trip-related metadata.
+#
+# Metadata structure:
+# {
+#   'direction': 'outbound' or 'inbound',
+#   'trip_id': 123,
+#   'boarding_trip_stop_id': 456,
+#   'drop_off_trip_stop_id': 789
+# }
+#
+# Direction:
+# - "outbound": The trip is moving away from the origin (e.g., A → B → C → D).
+#   This term is more flexible than "departure" and applies to both direct and connected trips.
+# - "inbound": The trip is returning toward the origin (e.g., D → C → B → A).
+#   This term is more flexible than "return" and applies to both direct and connected trips.
+module SpreeCmCommissioner
+  module LineItemTransitable
+    extend ActiveSupport::Concern
+
+    DIRECTION = %w[outbound inbound].freeze
+
+    TripKey = Struct.new(:trip_id, :direction, :boarding_trip_stop_id, :drop_off_trip_stop_id)
+
+    included do
+      validates :direction, inclusion: { in: DIRECTION }, allow_nil: true
+      validates :trip_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+      validates :boarding_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+      validates :drop_off_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+
+      # Groups LineItems by trip fields. Some fields can be null,
+      # so use it with caution. Output:
+      # {
+      #   $<TripKey:> => [<LineItem id:1>]
+      #   $<TripKey:> => [<LineItem id:2>]
+      #   $<TripKey:> => [<LineItem id:3>, <LineItem id:4>]
+      # }
+      def self.group_by_trip_key
+        all.group_by do |line_item|
+          TripKey.new(
+            line_item.trip_id,
+            line_item.direction,
+            line_item.boarding_trip_stop_id,
+            line_item.drop_off_trip_stop_id
+          )
+        end
+      end
+    end
+
+    def outbound? = direction == 'outbound'
+    def inbound? = direction == 'inbound'
+
+    def direction = private_metadata['direction']
+    def trip_id = private_metadata['trip_id']&.to_i
+    def boarding_trip_stop_id = private_metadata['boarding_trip_stop_id']&.to_i
+    def drop_off_trip_stop_id = private_metadata['drop_off_trip_stop_id']&.to_i
+
+    def direction=(value)
+      if value.nil?
+        private_metadata.delete('direction')
+      else
+        private_metadata['direction'] = value.to_s
+      end
+    end
+
+    def trip_id=(value)
+      if value.nil?
+        private_metadata.delete('trip_id')
+      else
+        private_metadata['trip_id'] = value.to_s
+      end
+    end
+
+    def boarding_trip_stop_id=(value)
+      if value.nil?
+        private_metadata.delete('boarding_trip_stop_id')
+      else
+        private_metadata['boarding_trip_stop_id'] = value.to_s
+      end
+    end
+
+    def drop_off_trip_stop_id=(value)
+      if value.nil?
+        private_metadata.delete('drop_off_trip_stop_id')
+      else
+        private_metadata['drop_off_trip_stop_id'] = value.to_s
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/address_decorator.rb

@@ -1,10 +1,30 @@
 module SpreeCmCommissioner
   module AddressDecorator
     def self.prepended(base)
-      # Field is not mandatory
       base.enum gender: { :not_selected => 0, :male => 1, :female => 2, :other => 3 }
+
+      base.validates :address1, presence: true, if: :require_address1?
+      base.validates :city, presence: true, if: :require_city?
+      base.validates :country, presence: true, if: :require_country?
+    end
+
+    def require_address1?
+      false
+    end
+
+    def require_city?
+      false
+    end
+
+    def require_country?
+      false
     end
   end
 end
 
-Spree::Address.prepend(SpreeCmCommissioner::AddressDecorator) unless Spree::Address.included_modules.include?(SpreeCmCommissioner::AddressDecorator)
+unless Spree::Address.included_modules.include?(SpreeCmCommissioner::AddressDecorator)
+  # remove validators for the specified attributes
+  %i[address1 city country].each { |attr| Spree::Address._validators.delete(attr) }
+
+  Spree::Address.prepend(SpreeCmCommissioner::AddressDecorator)
+end

data/app/models/spree_cm_commissioner/guest.rb

@@ -31,6 +31,7 @@ module SpreeCmCommissioner
     belongs_to :occupation, class_name: 'Spree::Taxon'
     belongs_to :nationality, class_name: 'Spree::Taxon'
     belongs_to :block, class_name: 'SpreeCmCommissioner::Block', optional: true
+    belongs_to :saved_guest, class_name: 'SpreeCmCommissioner::SavedGuest', optional: true
 
     has_one :reserved_block, class_name: 'SpreeCmCommissioner::ReservedBlock'
 
@@ -61,6 +62,8 @@ module SpreeCmCommissioner
     validates :seat_number, uniqueness: { scope: :event_id }, allow_nil: true, if: -> { event_id.present? }
     validates :bib_index, uniqueness: true, allow_nil: true
 
+    validate :validate_block, if: :should_validate_block?
+
     self.whitelisted_ransackable_associations = %w[id_card event line_item]
     self.whitelisted_ransackable_attributes = %w[first_name last_name phone_number gender contact occupation_id card_type created_at check_in_status]
 
@@ -294,6 +297,20 @@ module SpreeCmCommissioner
       end
     end
 
+    # validate only if block_id is present AND (new record OR block_id is changing)
+    # goal: don't bother re-validating when block_id stays the same
+    def should_validate_block?
+      block_id.present? && (new_record? || will_save_change_to_block_id?)
+    end
+
+    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)
+
+      errors.add(:block, "does not exist in variant #{line_item.variant_id}")
+    end
+
     def preload_order_block_ids
       return if line_item.blank?
       return if line_item.order.blank?

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -65,6 +65,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::LineItemDurationable
       base.include SpreeCmCommissioner::LineItemsFilterScope
       base.include SpreeCmCommissioner::LineItemGuestsConcern
+      base.include SpreeCmCommissioner::LineItemTransitable
       base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::KycBitwise
@@ -88,8 +89,8 @@ module SpreeCmCommissioner
       # these fields can be null during this process below.
       # it is needed for permanent_stock?, date_range to work.
       self.product_type = variant.product_type
-      self.from_date = opts.delete(:from_date)&.to_date
-      self.to_date = opts.delete(:to_date)&.to_date
+      self.from_date = opts.delete(:from_date)&.to_datetime
+      self.to_date = opts.delete(:to_date)&.to_datetime
 
       base_price = variant.price_in(currency)
 

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -43,6 +43,7 @@ module SpreeCmCommissioner
       base.has_many :vendors, through: :products, class_name: 'Spree::Vendor'
       base.has_many :taxons, through: :products, class_name: 'Spree::Taxon'
       base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
+      base.has_many :saved_guests, -> { distinct }, through: :guests, class_name: 'SpreeCmCommissioner::SavedGuest'
       base.has_many :blocks, through: :guests, class_name: 'SpreeCmCommissioner::Block', source: :block
       base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants

data/app/models/spree_cm_commissioner/saved_guest.rb

@@ -0,0 +1,13 @@
+# Reusable guest profile, can be linked to a user or be nil for anonymous checkouts.
+# Orders associate to saved_guest through guests. If an order later associates to a user, the saved_guest is assigned to that user.
+module SpreeCmCommissioner
+  class SavedGuest < Base
+    enum gender: { :other => 0, :male => 1, :female => 2 }
+
+    belongs_to :user, class_name: 'Spree::User', optional: true
+    belongs_to :occupation, class_name: 'Spree::Taxon', optional: true
+    belongs_to :nationality, class_name: 'Spree::Taxon', optional: true
+
+    has_many :guests, class_name: 'SpreeCmCommissioner::Guest', dependent: :nullify
+  end
+end

data/app/models/spree_cm_commissioner/trip.rb

@@ -17,8 +17,13 @@ module SpreeCmCommissioner
     has_many :blazer_queries, through: :trip_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
 
     has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy
+    has_many :boarding_trip_stops, -> { boarding }, class_name: 'SpreeCmCommissioner::TripStop'
+    has_many :drop_off_trip_stops, -> { drop_off }, class_name: 'SpreeCmCommissioner::TripStop'
+
     has_many :variants, through: :product
     has_many :inventory_items, through: :variants
+    has_many :variant_blocks, through: :variants
+    has_many :blocks, through: :variant_blocks
 
     validates :departure_time, presence: true
     validates :duration, numericality: { greater_than: 0 }

data/app/models/spree_cm_commissioner/variant_block.rb

@@ -5,5 +5,13 @@ module SpreeCmCommissioner
     belongs_to :block, class_name: 'SpreeCmCommissioner::Block', optional: false
 
     validates :block_id, uniqueness: { scope: %i[variant_id trip_id] }
+
+    before_validation :set_trip, if: -> { trip_id.blank? }
+
+    private
+
+    def set_trip
+      self.trip = variant&.product&.trip
+    end
   end
 end

data/db/migrate/20250807033035_create_spree_cm_commissioner_saved_guests.rb

@@ -0,0 +1,23 @@
+class CreateSpreeCmCommissionerSavedGuests < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_saved_guests, if_not_exists: true do |t|
+      t.string :first_name
+      t.string :last_name
+
+      t.date :dob
+      t.integer :age
+      t.integer :gender
+
+      t.string :email
+      t.string :country_code, limit: 5
+      t.string :phone_number, limit: 50
+      t.string :intel_phone_number
+
+      t.references :user, foreign_key: { to_table: :spree_users }, null: true
+      t.references :nationality, foreign_key: { to_table: :spree_taxons }, null: true
+      t.references :occupation, foreign_key: { to_table: :spree_taxons }, null: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250808054835_add_saved_guest_reference_to_cm_blocks.rb

@@ -0,0 +1,5 @@
+class AddSavedGuestReferenceToCmBlocks < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_guests, :saved_guest, foreign_key: { to_table: :cm_saved_guests }, null: true, index: true, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb

@@ -6,5 +6,8 @@ FactoryBot.define do
 
     stop_type { :boarding }
     stop_name { stop_place.name }
+
+    arrival_time { Time.current }
+    departure_time { Time.current + 10.minutes }
   end
 end

data/lib/spree_cm_commissioner/transit/leg.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner::Transit
+  class Leg
+    attr_accessor :direction, :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id, :seat_selections
+
+    def initialize(options = {})
+      @direction = options[:direction]
+      @trip_id = options[:trip_id]
+      @boarding_trip_stop_id = options[:boarding_trip_stop_id]
+      @drop_off_trip_stop_id = options[:drop_off_trip_stop_id]
+      @seat_selections = options[:seat_selections] || []
+    end
+
+    def self.from_hash(hash)
+      new(
+        direction: hash[:direction], # outbound / inbound
+        trip_id: hash[:trip_id],
+        boarding_trip_stop_id: hash[:boarding_trip_stop_id],
+        drop_off_trip_stop_id: hash[:drop_off_trip_stop_id],
+        seat_selections: (hash[:seat_selections] || []).map { |seat_selection| SeatSelection.from_hash(seat_selection) }
+      )
+    end
+  end
+end

data/lib/spree_cm_commissioner/transit/seat_selection.rb

@@ -0,0 +1,19 @@
+module SpreeCmCommissioner::Transit
+  class SeatSelection
+    attr_accessor :variant_id, :quantity, :block_ids
+
+    def initialize(options = {})
+      @variant_id = options[:variant_id]
+      @quantity = options[:quantity]
+      @block_ids = options[:block_ids] || []
+    end
+
+    def self.from_hash(hash)
+      new(
+        variant_id: hash[:variant_id],
+        quantity: hash[:quantity],
+        block_ids: hash[:block_ids] || [] # empty when no seat selection.
+      )
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.3-pre3'.freeze
+  VERSION = '2.0.3-pre5'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -20,6 +20,8 @@ require 'spree_cm_commissioner/user_session_jwt_token'
 require 'spree_cm_commissioner/trip_result'
 require 'spree_cm_commissioner/trip_query_result'
 require 'spree_cm_commissioner/cached_inventory_item'
+require 'spree_cm_commissioner/transit/leg'
+require 'spree_cm_commissioner/transit/seat_selection'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.0.3.pre.pre3
+  version: 2.0.3.pre.pre5
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1195,6 +1195,7 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_authorizer.rb
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
+- app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
@@ -1279,6 +1280,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/kyc_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/line_item_durationable.rb
 - app/models/concerns/spree_cm_commissioner/line_item_guests_concern.rb
+- app/models/concerns/spree_cm_commissioner/line_item_transitable.rb
 - app/models/concerns/spree_cm_commissioner/line_items_filter_scope.rb
 - app/models/concerns/spree_cm_commissioner/metafield.rb
 - app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb
@@ -1427,6 +1429,7 @@ files:
 - app/models/spree_cm_commissioner/role_permission.rb
 - app/models/spree_cm_commissioner/s3_presigned_url.rb
 - app/models/spree_cm_commissioner/s3_presigned_url_builder.rb
+- app/models/spree_cm_commissioner/saved_guest.rb
 - app/models/spree_cm_commissioner/seat_layout.rb
 - app/models/spree_cm_commissioner/seat_section.rb
 - app/models/spree_cm_commissioner/seats/blocks_canceler.rb
@@ -2681,6 +2684,8 @@ files:
 - db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb
 - db/migrate/20250725092713_add_block_type_to_cm_blocks.rb
 - db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb
+- db/migrate/20250807033035_create_spree_cm_commissioner_saved_guests.rb
+- db/migrate/20250808054835_add_saved_guest_reference_to_cm_blocks.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2790,6 +2795,8 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/video_on_demand_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_rule_factory.rb
+- lib/spree_cm_commissioner/transit/leg.rb
+- lib/spree_cm_commissioner/transit/seat_selection.rb
 - lib/spree_cm_commissioner/trip_query_result.rb
 - lib/spree_cm_commissioner/trip_result.rb
 - lib/spree_cm_commissioner/user_session_jwt_token.rb