spree_cm_commissioner 2.0.0.pre.pre → 2.0.0

data/db/migrate/20250630103536_create_cm_telegram_chats.rb

@@ -0,0 +1,13 @@
+class CreateCmTelegramChats < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_telegram_chats, if_not_exists: true do |t|
+      t.bigint :chat_id, null: false
+      t.string :chat_title
+      t.string :chat_type
+      t.boolean :active, default: false
+      t.references :vendor, foreign_key: { to_table: :spree_vendors }
+      t.timestamps
+    end
+    add_index :cm_telegram_chats, :chat_id, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb

@@ -0,0 +1,6 @@
+class AddConfigurationsToCmDynamicField < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_fields, :configurations, :jsonb, default: {}, null: false, if_not_exists: true
+    add_index :cm_dynamic_fields, :configurations, if_not_exists: true
+  end
+end

data/db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb

@@ -0,0 +1,5 @@
+class AddDynamicFieldOptionToGuestDynamicField < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_guest_dynamic_fields, :dynamic_field_option, index: true, foreign_key: { to_table: :cm_dynamic_field_options }, if_not_exists: true
+  end
+end

data/db/migrate/20250702091935_add_status_to_dynamic_field_option.rb

@@ -0,0 +1,5 @@
+class AddStatusToDynamicFieldOption < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_field_options, :status, :integer, default: 0, if_not_exists: true
+  end
+end

data/db/migrate/20250707032008_add_vendor_id_to_spree_category.rb

@@ -0,0 +1,7 @@
+class AddVendorIdToSpreeCategory < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:spree_promotion_categories, :vendor_id)
+      add_reference :spree_promotion_categories, :vendor, index: true, foreign_key: { to_table: :spree_vendors }
+    end
+  end
+end

data/db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb

@@ -0,0 +1,6 @@
+class AddEmailFieldsToSpreeVendors < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_vendors, :from_email, :string, if_not_exists: true
+    add_column :spree_vendors, :support_email, :string, if_not_exists: true
+  end
+end

data/db/migrate/20250711092937_add_position_to_cm_dynamic_fields.rb

@@ -0,0 +1,11 @@
+class AddPositionToCmDynamicFields < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_dynamic_fields, :position)
+      add_column :cm_dynamic_fields, :position, :integer, default: 0, null: false
+    end
+
+    unless index_exists?(:cm_dynamic_fields, :position, name: 'index_dynamic_fields_on_position')
+      add_index :cm_dynamic_fields, :position, name: 'index_dynamic_fields_on_position'
+    end
+  end
+end

data/db/migrate/20250711093045_add_position_to_cm_dynamic_field_options.rb

@@ -0,0 +1,11 @@
+class AddPositionToCmDynamicFieldOptions < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_dynamic_field_options, :position)
+      add_column :cm_dynamic_field_options, :position, :integer, default: 0, null: false
+    end
+
+    unless index_exists?(:cm_dynamic_field_options, :position, name: 'index_dynamic_field_options_on_position')
+      add_index :cm_dynamic_field_options, :position, name: 'index_dynamic_field_options_on_position'
+    end
+  end
+end

data/db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb

@@ -0,0 +1,7 @@
+class RenameCmTaxonBlazerQueryToBlazerQueryables < ActiveRecord::Migration[7.0]
+  def change
+    if table_exists?(:cm_taxon_blazer_queries)
+      rename_table :cm_taxon_blazer_queries, :cm_blazer_queryables
+    end
+  end
+end

data/db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb

@@ -0,0 +1,19 @@
+class MakeCmBlazerQueryablesPolymorphic < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_blazer_queryables, :taxon_id) && !column_exists?(:cm_blazer_queryables, :queryable_id)
+      rename_column :cm_blazer_queryables, :taxon_id, :queryable_id
+    end
+
+    unless column_exists?(:cm_blazer_queryables, :queryable_type)
+      add_column :cm_blazer_queryables, :queryable_type, :string, default: 'Spree::Taxon'
+    end
+
+    if foreign_key_exists?(:cm_blazer_queryables, column: :queryable_id)
+      remove_foreign_key :cm_blazer_queryables, column: :queryable_id
+    end
+
+    unless index_exists?(:cm_blazer_queryables, [:queryable_type, :queryable_id], name: 'index_cm_blazer_queryables_on_queryable_type_and_id')
+      add_index :cm_blazer_queryables, [:queryable_type, :queryable_id], name: 'index_cm_blazer_queryables_on_queryable_type_and_id'
+    end
+  end
+end

data/db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb

@@ -0,0 +1,13 @@
+class RemoveIndexesFromCmUserIdentityProviders < ActiveRecord::Migration[7.0]
+  def change
+    execute <<-SQL
+      ALTER TABLE cm_user_identity_providers
+      DROP CONSTRAINT IF EXISTS index_cm_user_identity_providers_on_identity_type_and_sub;
+    SQL
+
+    execute <<-SQL
+      ALTER TABLE cm_user_identity_providers
+      DROP CONSTRAINT IF EXISTS index_cm_user_identity_providers_on_user_id_and_identity_type;
+    SQL
+  end
+end

data/db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb

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

data/docker-compose.yml

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

data/lib/cm_app_logger.rb

@@ -1,18 +1,11 @@
 # lib/cm_app_logger.rb
 module CmAppLogger
   def self.log(label:, data: nil)
-    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 = {
+      label: label,
+      data: data
+    }
 
-    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,9 +11,14 @@ module SpreeCmCommissioner
       end
 
       def add_migrations
-        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'
+        gems = %i[
+          spree_multi_vendor
+          spree_cm_commissioner
+        ]
+
+        gems.each do |gem|
+          run "bundle exec rake railties:install:migrations FROM=#{gem}"
+        end
       end
 
       def run_migrations
@@ -35,17 +40,9 @@ module SpreeCmCommissioner
                          after: %r{//= require spree/backend}, verbose: true
 
         # For NPM support
-        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
+        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
       end
 
       def install_telegram_web_bot

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

@@ -6,7 +6,3 @@ 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/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: nil, options: nil)
+    def initialize(from_date:, to_date:, title:, options:)
       @from_date = from_date
       @to_date = to_date
       @title = title
@@ -23,15 +23,5 @@ 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/branch_factory.rb

@@ -0,0 +1,12 @@
+FactoryBot.define do
+
+  factory :cm_branch , class: SpreeCmCommissioner::Branch do
+    name { 'testBranch'}
+    lat { 11.11 }
+    lon { 11.11}
+    formatted_phone_number { generate(:phone_number) }
+    formatted_address { "test_address" }
+    state
+    vendor
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :departure_time, class: Spree::OptionType do
+    name { 'departure_time' }
+    attr_type { 'departure_time' }
+    kind {'variant'}
+    presentation { '' }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :duration, class: Spree::OptionType do
+    name { 'duration' }
+    attr_type { 'duration' }
+    kind {'variant'}
+    presentation { '' }
+  end
+end

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

@@ -1,5 +1,4 @@
 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 }
@@ -8,13 +7,4 @@ 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(:cm_product) }
+      relatable { create(:product) }
     end
 
     factory :cm_taxon_homepage_section_relatable do

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(:cm_product, need_confirmation: true) }
+      product { create(:product, need_confirmation: true) }
     end
 
     factory :cm_kyc_line_item do

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :line_item_seat, class: SpreeCmCommissioner::LineItemSeat do
+    line_item_id {}
+    seat_id {}
+    date { Date.today }
+  end
+end

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

@@ -9,12 +9,6 @@ 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' }
@@ -153,6 +147,36 @@ 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,2 +1,38 @@
 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,19 +1,6 @@
 FactoryBot.define 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
+  factory :cm_product, parent: :base_product do
     vendor { Spree::Vendor.first || create(:cm_vendor) }
-    product_type { :ecommerce }
 
     before(:create) do |product|
       create(:stock_location) unless Spree::StockLocation.any?
@@ -46,6 +33,35 @@ 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),
@@ -69,7 +85,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(:cm_variant, price: product.price, product: product)
+        variant = create(:variant, price: product.price, product: product)
         variant.option_values = [option_value1, option_value2, option_value3]
         variant.save!
 
@@ -87,7 +103,7 @@ FactoryBot.define do
       end
 
       after(:create) do |product, evaluator|
-        variant = create(:cm_variant, price: product.price, product: product)
+        variant = create(:variant, price: product.price, product: product)
         variant.save!
 
         variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
@@ -120,12 +136,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(:cm_variant, price: product.price, product: product)
+        variant1 = create(: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(:cm_variant, price: product.price, product: product)
+        variant2 = create(: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/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(:cm_product, stores: [store])
-        product_2 = create(:cm_product, stores: [store])
+        product_1 = create(:product, stores: [store])
+        product_2 = create(: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/stop_factory.rb

@@ -0,0 +1,14 @@
+FactoryBot.define do
+
+  factory :cm_stop , class: SpreeCmCommissioner::Stop do
+    code { 'TS'}
+    name { 'testStop'}
+    formatted_phone_number { generate(:phone_number) }
+    formatted_address { "test_address" }
+    lat { 11.11 }
+    lon { 11.11}
+    branch { create(:cm_branch) }
+    state
+    vendor
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :transit_place, class: Spree::Taxon do
+    transient do
+      taxonomy  { Spree::Taxonomy.place}
+    end
+    parent{ taxonomy.root }
+  end
+end

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

@@ -1,13 +1,6 @@
 FactoryBot.define do
-  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 :vehicle, factory: :cm_vehicle
-    association :origin, factory: :cm_place
-    association :destination, factory: :cm_place
+  factory :trip_connection, class: 'SpreeCmCommissioner::TripConnection' do
+    association :from_trip, factory: :variant
+    association :to_trip, factory: :variant
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :user_identity_provider, class: SpreeCmCommissioner::UserIdentityProvider do
+  factory :cm_user_identity_provider, class: SpreeCmCommissioner::UserIdentityProvider do
     sequence(:sub) { |n| "sub-#{n}" }
     identity_type { SpreeCmCommissioner::UserIdentityProvider.identity_types[:google] }
     email { 'fake@example.com' }

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

@@ -1,60 +1,38 @@
 FactoryBot.define do
   factory :cm_base_variant, parent: :base_variant do
-    is_master { false }
-    product { create(:cm_product) }
-
     transient do
       total_inventory { 10 }
-      backorderable { false }
-      pregenerate_inventory_items { true }
-      pre_inventory_days { nil } # optional for permanent only
     end
 
     after :create do |variant, evaluator|
       variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
-      variant.stock_items.update_all(backorderable: evaluator.backorderable)
-
-      # stock_items is created then enqueue create inventory items job
-      # but we want to create inventory items directly in this factory without waiting for job
-      if evaluator.pregenerate_inventory_items
-        if variant.permanent_stock?
-          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id], pre_inventory_days: evaluator.pre_inventory_days || 3)
-        else
-          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
-        end
-      end
     end
   end
 
-  factory :cm_variant, parent: :cm_base_variant do
-    product { create(:cm_product) }
+  factory :cm_variant, parent: :variant do
+    product do
+      stock_locations = [create(:stock_location)]
+      product = create(:product, vendor: create(:active_vendor, stock_locations: stock_locations))
+      product
+    end
+  end
 
+  factory :trip, class: Spree::Variant do
+    permanent_stock { 5 }
     transient do
-      number_of_adults { nil }
-      number_of_kids { nil }
-      delivery_required { nil }
+      departure_time { "10:00" }
+      duration { "1" }
+      route { }
     end
+    before(:create) do |trip, evaluator|
+      trip.product = evaluator.route
 
-    after(:create) do |variant, evaluator|
-      if evaluator.number_of_adults.present?
-        number_of_adults = create(:cm_option_type, :number_of_adults)
-        variant.product.option_types << number_of_adults
-        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_adults, name: evaluator.number_of_adults, option_type: number_of_adults)
-      end
+      trip.option_values = [evaluator.departure_time, evaluator.duration]
 
-      if evaluator.number_of_kids.present?
-        number_of_kids = create(:cm_option_type, :number_of_kids)
-        variant.product.option_types << number_of_kids
-        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_kids, name: evaluator.number_of_kids, option_type: number_of_kids)
-      end
-
-      if evaluator.delivery_required == true
-        delivery_option = create(:cm_option_type, :delivery_option)
-        variant.product.option_types << delivery_option
-        variant.option_values << create(:cm_option_value, presentation: 'Delivery', name: 'delivery', option_type: delivery_option)
-      end
-
-      variant.save!
+    end
+    after(:create) do |trip, evaluator|
+      trip.stock_items = [create(:stock_item, variant: trip, stock_location: evaluator.product.vendor.stock_locations.first)]
+      trip.stock_items.first.adjust_count_on_hand(10)
     end
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :cm_vehicle, class: SpreeCmCommissioner::Vehicle do
+  factory :vehicle, class: SpreeCmCommissioner::Vehicle do
     sequence(:code) { |n| "vehicle_#{n}" }
     sequence(:license_plate) { |n| "2KH-#{'%04d' % (n % 10000)}" }
   end