spree_cm_commissioner 1.21.0 → 2.0.0.pre.pre

data/config/routes.rb

@@ -138,7 +138,21 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements
+      resources :stock_managements do
+        collection do
+          get :calendar
+        end
+      end
+
+      resources :variants do
+        resources :inventory_items, only: %i[show create] do
+          member do
+            patch :reset
+            patch :update_prices
+            delete :delete_prices
+          end
+        end
+      end
 
       resources :product_completion_steps do
         collection do
@@ -274,7 +288,6 @@ Spree::Core::Engine.add_routes do
       resources :vendors, controller: :tenant_vendors
     end
     resources :event_blazer_queries
-    resources :trip_blazer_queries
   end
 
   resources :events, controller: 'events/base' do
@@ -451,7 +464,6 @@ Spree::Core::Engine.add_routes do
         resources :images
         resource :s3_signed_urls
         resources :invites
-        resources :invite_crews, only: %i[show update]
         resources :invite_guests, only: %i[show update]
       end
 
@@ -531,6 +543,8 @@ Spree::Core::Engine.add_routes do
       end
 
       namespace :storefront do
+        resources :inventory_item
+
         resources :waiting_room_sessions, only: :create
         resources :vattanac_banks, only: %i[create]
         resource :cart, controller: :cart, only: %i[show create destroy] do
@@ -556,7 +570,10 @@ Spree::Core::Engine.add_routes do
         resource :cart_guests, only: %i[create destroy]
         resources :cart_payment_method_groups, only: %i[index]
 
-        resources :accommodations, only: %i[index show]
+        resources :accommodations, only: %i[index show] do
+          resources :variants, only: %i[index show], module: :accommodations
+        end
+
         resources :line_items, only: %i[index show]
         resources :account_checker
         resource :account_recovers, only: [:update]
@@ -671,6 +688,5 @@ Rails.application.routes.draw do
   get 'o/:id', to: 'spree_cm_commissioner/orders#show', as: 'order'
   get 'li/:id', to: 'spree_cm_commissioner/line_item_qr_images#show', as: 'line_item_qr_image'
   get 'g/:id', to: 'spree_cm_commissioner/guest_cards#show', as: 'guest_cards'
-  get '.well-known/assetlinks.json', to: 'spree_cm_commissioner/well_known#assetlinks_json'
-  get '.well-known/apple-app-site-association', to: 'spree_cm_commissioner/well_known#apple_app_site_association'
+  get '.well-known/:id', to: 'spree_cm_commissioner/well_known#show', constraints: { id: /(assetlinks\.json|apple-app-site-association)/ }
 end

data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb

@@ -1,5 +1,7 @@
 class UpdateCounterCacheOfVehicleType < ActiveRecord::Migration[7.0]
-    def up
+  def up
+    if defined?(SpreeCmCommissioner::VehicleSeat) && SpreeCmCommissioner::VehicleSeat.respond_to?(:counter_culture_fix_counts)
       SpreeCmCommissioner::VehicleSeat.counter_culture_fix_counts
     end
+  end
 end

data/db/migrate/20250304293518_create_cm_inventory_items.rb

@@ -0,0 +1,21 @@
+class CreateCmInventoryItems < ActiveRecord::Migration[7.0]
+  def up
+    create_table :cm_inventory_items, if_not_exists: true do |t|
+      t.integer :variant_id
+      t.date :inventory_date
+      t.integer :max_capacity, default: 0, null: false
+      t.integer :quantity_available, default: 0, null: false
+      t.integer :product_type, default: 0, null: false
+
+      t.timestamps
+    end
+
+    add_index :cm_inventory_items, :variant_id, if_not_exists: true
+    add_index :cm_inventory_items, :inventory_date, if_not_exists: true
+    add_index :cm_inventory_items, [:variant_id, :inventory_date], unique: true, if_not_exists: true
+  end
+
+  def down
+    drop_table :cm_inventory_items
+  end
+end

data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb

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

data/db/migrate/20250502025848_add_index_to_spree_products.rb

@@ -0,0 +1,5 @@
+class AddIndexToSpreeProducts < ActiveRecord::Migration[7.0]
+  def change
+    add_index :spree_products, :product_type unless index_exists?(:spree_products, :product_type)
+  end
+end

data/db/migrate/20250502030001_add_product_type_to_spree_variants.rb

@@ -0,0 +1,5 @@
+class AddProductTypeToSpreeVariants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_variants, :product_type, :integer, if_not_exists: true
+  end
+end

data/db/migrate/20250502030002_add_product_type_to_spree_line_items.rb

@@ -0,0 +1,5 @@
+class AddProductTypeToSpreeLineItems < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_line_items, :product_type, :integer, if_not_exists: true
+  end
+end

data/db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb

@@ -0,0 +1,7 @@
+class AddInventoryItemToSpreePrices < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:spree_prices, :inventory_item_id)
+      add_reference :spree_prices, :inventory_item, foreign_key: { to_table: :cm_inventory_items }
+    end
+  end
+end

data/db/migrate/20250619073724_drop_table_cm_line_item_seats.rb

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

data/db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb

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

data/db/migrate/20250619073844_drop_table_cm_vehicle_types.rb

@@ -0,0 +1,9 @@
+class DropTableCmVehicleTypes < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_vehicles, :vehicle_type_id)
+      remove_reference :cm_vehicles, :vehicle_type, foreign_key: { to_table: :cm_vehicle_types }
+    end
+
+    drop_table :cm_vehicle_types, if_exists: true
+  end
+end

data/db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb

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

data/db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb

@@ -0,0 +1,9 @@
+class RemoveUnnecessaryFieldsFromCmPlaces < ActiveRecord::Migration[7.0]
+  def change
+    # It is for single table inheritance (branch, stop)
+    # Remove it as we no longer need.
+    remove_column :cm_places, :type if column_exists?(:cm_places, :type)
+    remove_column :cm_places, :vendor_id if column_exists?(:cm_places, :vendor_id)
+    remove_column :cm_places, :branch_id if column_exists?(:cm_places, :branch_id)
+  end
+end

data/db/migrate/20250619082736_remove_route_type_from_spree_products.rb

@@ -0,0 +1,5 @@
+class RemoveRouteTypeFromSpreeProducts < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :spree_products, :route_type if column_exists?(:spree_products, :route_type)
+  end
+end

data/db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb

@@ -0,0 +1,5 @@
+class RemoveUnnecessaryFieldsFromSpreeTaxons < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :spree_taxons, :data_type if column_exists?(:spree_taxons, :data_type)
+  end
+end

data/db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb

@@ -0,0 +1,5 @@
+class RemoveVariantIdFromCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :cm_trips, :variant_id if column_exists?(:cm_trips, :variant_id)
+  end
+end

data/db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb

@@ -0,0 +1,6 @@
+class UpdateCmTripConnectionsToUseCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    remove_foreign_key :cm_trip_connections, column: :from_trip_id if foreign_key_exists?(:cm_trip_connections, column: :from_trip_id)
+    remove_foreign_key :cm_trip_connections, column: :to_trip_id if foreign_key_exists?(:cm_trip_connections, column: :to_trip_id)
+  end
+end

data/db/migrate/20250620090001_create_cm_seat_layouts.rb

@@ -0,0 +1,17 @@
+class CreateCmSeatLayouts < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_seat_layouts, if_not_exists: true do |t|
+      t.string :name
+      t.integer :total_seats
+      t.integer :total_sections
+      t.integer :status, default: 0
+
+      t.float :width
+      t.float :height
+
+      t.references :layoutable, polymorphic: true, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250620090002_create_cm_seat_sections.rb

@@ -0,0 +1,18 @@
+class CreateCmSeatSections < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_seat_sections, if_not_exists: true do |t|
+      t.string :name
+      t.references :seat_layout, foreign_key: { to_table: :cm_seat_layouts }, null: false
+      t.integer :total_seats
+
+      t.float :width
+      t.float :height
+      t.float :x
+      t.float :y
+      t.float :rotation
+      t.string :shape_path
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250620090003_create_cm_blocks.rb

@@ -0,0 +1,18 @@
+class CreateCmBlocks < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_blocks, if_not_exists: true do |t|
+      t.string :label
+
+      t.references :seat_layout, foreign_key: { to_table: :cm_seat_layouts }, null: false
+      t.references :seat_section, foreign_key: { to_table: :cm_seat_sections }, null: true
+
+      t.float :width
+      t.float :height
+      t.float :x
+      t.float :y
+      t.float :rotation
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250624091005_create_cm_reserved_blocks.rb

@@ -0,0 +1,29 @@
+class CreateCmReservedBlocks < ActiveRecord::Migration[7.0]
+  def up
+    create_table :cm_reserved_blocks, if_not_exists: true do |t|
+      t.references :updated_by, foreign_key: { to_table: :spree_users }, null: true
+      t.references :guest, foreign_key: { to_table: :cm_guests }, null: true
+      t.references :inventory_item, foreign_key: { to_table: :cm_inventory_items }, null: false
+      t.references :block, null: false, foreign_key: { to_table: :cm_blocks }
+
+      t.integer :status, null: false
+
+      t.datetime :inventory_date
+      t.datetime :expired_at
+
+      t.timestamps
+    end
+
+    unless index_exists?(:cm_reserved_blocks, [:block_id, :inventory_item_id], unique: true)
+      add_index :cm_reserved_blocks, [:block_id, :inventory_item_id], unique: true, name: 'index_reserved_blocks_on_block_and_inventory_item'
+    end
+  end
+
+  def down
+    if index_exists?(:cm_reserved_blocks, [:block_id, :inventory_item_id], name: 'index_reserved_blocks_on_block_and_inventory_item')
+      remove_index :cm_reserved_blocks, name: 'index_reserved_blocks_on_block_and_inventory_item'
+    end
+
+    drop_table :cm_reserved_blocks, if_exists: true
+  end
+end

data/db/migrate/20250626083642_create_cm_variant_blocks.rb

@@ -0,0 +1,24 @@
+
+class CreateCmVariantBlocks < ActiveRecord::Migration[7.0]
+  def up
+    create_table :cm_variant_blocks, if_not_exists: true do |t|
+      t.references :variant, null: false, foreign_key: { to_table: :spree_variants }
+      t.references :trip, null: false, foreign_key: { to_table: :cm_trips }
+      t.references :block, null: false, foreign_key: { to_table: :cm_blocks }
+
+      t.timestamps
+    end
+
+    unless index_exists?(:cm_variant_blocks, [:variant_id, :trip_id, :block_id], unique: true, name: 'index_variant_blocks_on_variant_trip_block')
+      add_index :cm_variant_blocks, [:variant_id, :trip_id, :block_id], unique: true, name: 'index_variant_blocks_on_variant_trip_block'
+    end
+  end
+
+  def down
+    if index_exists?(:cm_variant_blocks, [:variant_id, :trip_id, :block_id], name: 'index_variant_blocks_on_variant_trip_block')
+      remove_index :cm_variant_blocks, name: 'index_variant_blocks_on_variant_trip_block'
+    end
+
+    drop_table :cm_variant_blocks, if_exists: true
+  end
+end

data/db/migrate/20250627023314_add_block_id_to_cm_guests.rb

@@ -0,0 +1,13 @@
+class AddBlockIdToCmGuests < ActiveRecord::Migration[7.0]
+  def up
+    unless column_exists?(:cm_guests, :block_id)
+      add_reference :cm_guests, :block, foreign_key: { to_table: :cm_blocks }
+    end
+  end
+
+  def down
+    if column_exists?(:cm_guests, :block_id)
+      remove_column :cm_guests, :block_id
+    end
+  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,9 @@
+FactoryBot.define do
+  factory :cm_block, class: SpreeCmCommissioner::Block do
+    association :seat_section, factory: :cm_seat_section
+
+    label { "A1" }
+    row_index { 1 }
+    column_index { 1 }
+  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