spree_cm_commissioner 2.0.3.pre.pre4 → 2.0.3.pre.pre5

data/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb

@@ -0,0 +1,5 @@
+class AddLocationReferenceToCmVendorPlaces < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_vendor_places, :location, foreign_key: { to_table: :cm_vendor_places }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb

@@ -0,0 +1,5 @@
+class DropTableCmVendorStops < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :cm_vendor_stops, if_exists: true
+  end
+end

data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb

@@ -0,0 +1,5 @@
+class AddVendorReferenceToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_trips, :vendor, foreign_key: { to_table: :spree_vendors }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb

@@ -0,0 +1,5 @@
+class AddLocationPlaceReferenceToCmTripStops < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_trip_stops, :location_place, foreign_key: { to_table: :cm_places }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb

@@ -0,0 +1,7 @@
+class RenameCmTripStopsStopIdColumnToStopPlaceId < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_trip_stops, :stop_id)
+      rename_column :cm_trip_stops, :stop_id, :stop_place_id
+    end
+  end
+end

data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb

@@ -0,0 +1,11 @@
+class RenameCmTripsOriginAndDestinationToOriginPlaceAndDestinationPlace < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_trips, :origin_id)
+      rename_column :cm_trips, :origin_id, :origin_place_id
+    end
+
+    if column_exists?(:cm_trips, :destination_id)
+      rename_column :cm_trips, :destination_id, :destination_place_id
+    end
+  end
+end

data/db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb

@@ -0,0 +1,7 @@
+class AddVehicleTypeToCmVehicles < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_vehicles, :vehicle_type)
+      add_column :cm_vehicles, :vehicle_type, :integer
+    end
+  end
+end

data/db/migrate/20250725092713_add_block_type_to_cm_blocks.rb

@@ -0,0 +1,5 @@
+class AddBlockTypeToCmBlocks < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_blocks, :block_type, :integer, null: false, default: 1, if_not_exists: true
+  end
+end

data/db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb

@@ -0,0 +1,6 @@
+class AddDepartureTimeAndArrivalTimeToTripStop < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_trip_stops, :departure_time, :datetime, if_not_exists: true
+    add_column :cm_trip_stops, :arrival_time, :datetime, if_not_exists: true
+  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/docker-compose.yml

@@ -20,7 +20,7 @@ services:
 
     volumes:
       - .:/gem
-      - /gem/vendor/bundle
+      - ./vendor/bundle:/gem/vendor/bundle
 
     # depends_on:
     #   - db

data/lib/cm_app_logger.rb

@@ -1,11 +1,18 @@
 # lib/cm_app_logger.rb
 module CmAppLogger
   def self.log(label:, data: nil)
-    message = {
-      label: label,
-      data: data
-    }
+    message = { label: label, data: data }
+    start_time = Time.current
+    Rails.logger.info(message.to_json)
+
+    return unless block_given?
+
+    # Capture the block’s return value and return it to preserve existing behavior for callers expecting that value.
+    block_result = yield
 
+    message[:start_time] = start_time
+    message[:duration_ms] = (Time.current - start_time) * 1000
     Rails.logger.info(message.to_json)
+    block_result
   end
 end

data/lib/generators/spree_cm_commissioner/install/install_generator.rb

@@ -11,14 +11,9 @@ module SpreeCmCommissioner
       end
 
       def add_migrations
-        gems = %i[
-          spree_multi_vendor
-          spree_cm_commissioner
-        ]
-
-        gems.each do |gem|
-          run "bundle exec rake railties:install:migrations FROM=#{gem}"
-        end
+        run 'bundle exec rake railties:install:migrations FROM=spree_multi_vendor'
+        run 'bundle exec rake railties:install:migrations FROM=spree_cm_commissioner'
+        run 'bundle exec rails generate paper_trail:install'
       end
 
       def run_migrations
@@ -40,9 +35,17 @@ module SpreeCmCommissioner
                          after: %r{//= require spree/backend}, verbose: true
 
         # For NPM support
-        template 'app/javascript/spree_cm_commissioner/utilities.js'
-        inject_into_file 'app/javascript/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
-                         after: %r{import "@spree/dashboard"}, verbose: true
+        if File.exist?(File.join(destination_root, 'app/javascript/spree_dashboard'))
+          template 'app/javascript/spree_dashboard/spree_cm_commissioner/utilities.js'
+          inject_into_file 'app/javascript/spree_dashboard/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
+                           after: %r{import "@spree/dashboard"}, verbose: true
+        else
+          Logger.new($stdout).debug <<~MSG
+            SpreeCmCommissioner: JavaScript files for the dashboard are missing.
+            Please move your JavaScript files to the appropriate location in
+            app/javascript/spree_dashboard.
+          MSG
+        end
       end
 
       def install_telegram_web_bot

data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_cm_commissioner → spree_dashboard/spree_cm_commissioner}/utilities.js

@@ -6,3 +6,7 @@ const $ = jquery;
 document.addEventListener("spree:load", function () {
   $('[data-toggle="popover"]').popover();
 });
+
+document.documentElement.addEventListener("turbo:frame-load", (event) => {
+  $('[data-toggle="popover"]').popover();
+});

data/lib/spree_cm_commissioner/cached_inventory_item.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class CachedInventoryItem
+    attr_reader :inventory_key, :active, :quantity_available, :inventory_item_id, :variant_id
+
+    def initialize(inventory_key:, active:, quantity_available:, inventory_item_id:, variant_id:)
+      @inventory_key = inventory_key
+      @active = active
+      @quantity_available = quantity_available
+      @inventory_item_id = inventory_item_id
+      @variant_id = variant_id
+    end
+
+    def active?
+      active
+    end
+
+    def to_h
+      instance_variables.each_with_object({}) do |var, hash|
+        hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
+      end
+    end
+  end
+end

data/lib/spree_cm_commissioner/calendar_event.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class CalendarEvent
     attr_reader :from_date, :to_date, :title, :options
 
-    def initialize(from_date:, to_date:, title:, options:)
+    def initialize(from_date:, to_date:, title: nil, options: nil)
       @from_date = from_date
       @to_date = to_date
       @title = title
@@ -23,5 +23,15 @@ module SpreeCmCommissioner
         )
       end
     end
+
+    def self.from_inventory_items(inventory_items)
+      inventory_items.map do |item|
+        CalendarEvent.new(
+          from_date: item.inventory_date,
+          to_date: item.inventory_date,
+          options: { inventory_item: item }
+        )
+      end
+    end
   end
 end

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

@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :cm_block, class: SpreeCmCommissioner::Block do
+    label { "Block #{rand(1.0..100.0)}" }
+    block_type { :seat }
+
+    association :seat_section, factory: :cm_seat_section
+
+    width { rand(10.0..100.0) }
+    height { rand(10.0..100.0) }
+
+    x { rand(0.0..500.0) }
+    y { rand(0.0..500.0) }
+
+    rotation { rand(-180.0..180.0) }
+  end
+end

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

@@ -1,4 +1,5 @@
 FactoryBot.define do
+  # use cm_guest instead for consistency
   factory :guest, class: SpreeCmCommissioner::Guest do
     line_item { |a| a.association(:line_item) }
     first_name { FFaker::Name.name }
@@ -7,4 +8,13 @@ FactoryBot.define do
     dob { '1986-03-28' }
     token { SecureRandom.hex(32) }
   end
+
+  factory :cm_guest, class: SpreeCmCommissioner::Guest do
+    line_item { |a| a.association(:line_item) }
+    first_name { FFaker::Name.name }
+    last_name { FFaker::Name.name }
+    gender { 1 }
+    dob { '1986-03-28' }
+    token { SecureRandom.hex(32) }
+  end
 end

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

@@ -17,7 +17,7 @@ FactoryBot.define do
     end
 
     factory :cm_product_homepage_section_relatable do
-      relatable { create(:product) }
+      relatable { create(:cm_product) }
     end
 
     factory :cm_taxon_homepage_section_relatable do

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :cm_inventory_item, class: SpreeCmCommissioner::InventoryItem do
+    variant { create(:cm_variant) }
+    max_capacity { 10 }
+    quantity_available { 10 }
+    product_type { 'accommodation' }
+    inventory_date { Date.today }
+  end
+end

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

@@ -16,7 +16,7 @@ FactoryBot.define do
     variant { product.master }
 
     factory :cm_need_confirmation_line_item do
-      product { create(:product, need_confirmation: true) }
+      product { create(:cm_product, need_confirmation: true) }
     end
 
     factory :cm_kyc_line_item do

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

@@ -9,6 +9,12 @@ FactoryBot.define do
       presentation { 'location' }
     end
 
+    trait :vehicle do
+      attr_type { :string }
+      name { 'vehicle' }
+      presentation { 'vehicle' }
+    end
+
     trait :start_date do
       attr_type { :date }
       name { 'start-date' }
@@ -147,36 +153,6 @@ FactoryBot.define do
       presentation { 'seat-number-positions' }
     end
 
-    trait :origin do
-      attr_type { :origin }
-      name { 'origin' }
-      presentation { 'origin' }
-    end
-
-    trait :destination do
-      attr_type { :destination }
-      name { 'destination' }
-      presentation { 'destination' }
-    end
-
-    trait :departure_time do
-      attr_type { :time }
-      name { 'departure-time' }
-      presentation { 'departure-time' }
-    end
-
-    trait :vehicle do
-      attr_type { :vehicle_id }
-      name { 'vehicle' }
-      presentation { 'vehicle' }
-    end
-
-    trait :allow_seat_selection do
-      attr_type { :boolean }
-      name { 'allow-seat-selection' }
-      presentation { 'allow-seat-selection' }
-    end
-
     initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
   end
 end

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

@@ -1,38 +1,2 @@
 FactoryBot.define do
-  factory :transit_order, class: Spree::Order do
-    bill_address
-    ship_address
-    state {'complete'}
-    payment_state {'paid'}
-
-    transient do
-      line_items_count       { 1 }
-      shipment_cost          { 100 }
-      shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
-      seats {}
-      variant {}
-      quantity {}
-      date { Date.today }
-      selected_seats {[]}
-      line_item_seats_attributes{[]}
-    end
-
-    after(:create) do |order, evaluator|
-      if evaluator.quantity.nil? && evaluator.seats.present?
-        @line_item_seats_attributes =  evaluator.seats.map do |seat|
-          {seat_id: seat.id, date: evaluator.date, variant_id: evaluator.variant.id}
-        end
-        create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, line_item_seats_attributes: @line_item_seats_attributes)
-        order.line_items.reload
-      else
-        create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, quantity: evaluator.quantity)
-      end
-
-      stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
-      create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
-      order.shipments.reload
-
-      order.update_with_updater!
-    end
-  end
 end

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

@@ -1,6 +1,19 @@
 FactoryBot.define do
-  factory :cm_product, parent: :base_product do
+  factory :cm_product_in_stock, parent: :product_in_stock do
+    product_type { :ecommerce }
+  end
+
+  factory :cm_product_with_option_types, parent: :product_with_option_types do
+    product_type { :ecommerce }
+  end
+
+  factory :cm_base_product, parent: :base_product do
+    product_type { :ecommerce }
+  end
+
+  factory :cm_product, parent: :product do
     vendor { Spree::Vendor.first || create(:cm_vendor) }
+    product_type { :ecommerce }
 
     before(:create) do |product|
       create(:stock_location) unless Spree::StockLocation.any?
@@ -33,35 +46,6 @@ FactoryBot.define do
       end
     end
 
-    factory :route do
-      route_type {:automobile}
-      product_type { :transit }
-      before(:create) do |route, evaluator|
-        create(:stock_location) unless Spree::StockLocation.any?
-        if route.stores.empty?
-          default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
-          store = default_store || create(:store)
-
-          route.stores << [store]
-        end
-      end
-      after(:create) do |route, evaluator|
-        trip = route.master
-        trip.permanent_stock = 10
-        trip.stock_items = [create(:stock_item, variant: trip, stock_location: route.vendor.stock_locations.first)]
-        trip.stock_items.first.adjust_count_on_hand(10)
-
-        # option types
-        route.option_types << create(:cm_option_type, :origin)
-        route.option_types << create(:cm_option_type, :destination)
-        route.option_types << create(:cm_option_type, :departure_time)
-        route.option_types << create(:cm_option_type, :duration_in_hours)
-        route.option_types << create(:cm_option_type, :duration_in_minutes)
-        route.option_types << create(:cm_option_type, :allow_seat_selection)
-        route.option_types << create(:cm_option_type, :vehicle)
-      end
-    end
-
     factory :cm_subscribable_product do
       option_types { [
         create(:cm_option_type, :month),
@@ -85,7 +69,7 @@ FactoryBot.define do
         option_value2 = create(:cm_option_value, presentation: "#{evaluator.due_date} Days", name: evaluator.due_date.to_s, option_type: product.option_types[1])
         option_value3 = create(:cm_option_value, presentation: "#{evaluator.payment_option}", name: evaluator.payment_option.to_s, option_type: product.option_types[2])
 
-        variant = create(:variant, price: product.price, product: product)
+        variant = create(:cm_variant, price: product.price, product: product)
         variant.option_values = [option_value1, option_value2, option_value3]
         variant.save!
 
@@ -103,7 +87,7 @@ FactoryBot.define do
       end
 
       after(:create) do |product, evaluator|
-        variant = create(:variant, price: product.price, product: product)
+        variant = create(:cm_variant, price: product.price, product: product)
         variant.save!
 
         variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
@@ -136,12 +120,12 @@ FactoryBot.define do
           create(:cm_option_value, presentation: 'Yes', name: '1', option_type: product.option_types.find_by(name: 'bib-pre-generation-on-create'))
         end
 
-        variant1 = create(:variant, price: product.price, product: product)
+        variant1 = create(:cm_variant, price: product.price, product: product)
         variant1.option_values = [option_value1]
         variant1.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant1.save!
 
-        variant2 = create(:variant, price: product.price, product: product)
+        variant2 = create(:cm_variant, price: product.price, product: product)
         variant2.option_values = [option_value2]
         variant2.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant2.save!

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

@@ -0,0 +1,27 @@
+FactoryBot.define do
+  factory :cm_reserved_block, class: SpreeCmCommissioner::ReservedBlock do
+    association :inventory_item, factory: :cm_inventory_item
+    association :block, factory: :cm_block
+    association :guest, factory: :guest
+    association :updated_by, factory: :user
+
+    status { :on_hold }  # or :reserved, :canceled based on enum
+    inventory_date { Time.current }
+    expired_at { 10.minutes.from_now }
+
+    trait :reserved do
+      status { :reserved }
+      expired_at { nil }
+    end
+
+    trait :on_hold do
+      status { :on_hold }
+      expired_at { 8.minutes.from_now }
+    end
+
+    trait :canceled do
+      status { :canceled }
+      expired_at { nil }
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :cm_seat_layout, class: SpreeCmCommissioner::SeatLayout do
+    association :layoutable, factory: :cm_vehicle
+
+    name { "Layout #{rand(1.0..50.0)}" }
+    status { :active }
+
+    width { rand(200.0..1000.0) }
+    height { rand(200.0..1000.0) }
+  end
+end

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

@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :cm_seat_section, class: SpreeCmCommissioner::SeatSection do
+    name { "Section #{rand(1.0..50.0)}" }
+
+    association :seat_layout, factory: :cm_seat_layout
+
+    width { rand(50.0..500.0) }
+    height { rand(50.0..500.0) }
+
+    x { rand(0.0..500.0) }
+    y { rand(0.0..500.0) }
+
+    rotation { rand(-180.0..180.0) }
+    shape_path { "M0,0 L10,0 L10,10 L0,10 Z" }
+  end
+end

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

@@ -24,8 +24,8 @@ FactoryBot.define do
         # variant will add itself to all stock_locations in an after_create
         # creating a product will automatically create a master variant
         store = Spree::Store.first || create(:store)
-        product_1 = create(:product, stores: [store])
-        product_2 = create(:product, stores: [store])
+        product_1 = create(:cm_product, stores: [store])
+        product_2 = create(:cm_product, stores: [store])
 
         stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
         stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cm_trip_connection, class: SpreeCmCommissioner::TripConnection do
+    from_trip_id { create(:cm_trip) }
+    to_trip_id { create(:cm_trip) }
+  end
+end

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

@@ -1,6 +1,14 @@
 FactoryBot.define do
-  factory :trip_connection, class: 'SpreeCmCommissioner::TripConnection' do
-    association :from_trip, factory: :variant
-    association :to_trip, factory: :variant
+  factory :cm_trip, class: SpreeCmCommissioner::Trip do
+    departure_time { Time.zone.now.change(hour: 8, min: 0) } # example 8:00 AM
+    duration { 3600 } # 1 hour in seconds
+    allow_seat_selection { true }
+
+    product { create(:cm_product, product_type: :transit) }
+
+    association :vendor, factory: :cm_transit_vendor
+    association :vehicle, factory: :cm_vehicle
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
   end
 end

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

@@ -0,0 +1,13 @@
+FactoryBot.define do
+  factory :cm_trip_stop, class: SpreeCmCommissioner::TripStop do
+    association :trip, factory: :cm_trip
+    association :stop_place, factory: :cm_place
+    association :location_place, factory: :cm_place
+
+    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/test_helper/factories/variant_block_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_variant_block, class: SpreeCmCommissioner::VariantBlock do
+    association :variant, factory: :cm_variant
+    association :trip, factory: :cm_trip
+    association :block, factory: :cm_block
+  end
+end