spree_cm_commissioner 2.0.0.pre.pre → 2.0.0.pre.pre1

data/app/views/spree_cm_commissioner/order_mailer/_mailer_stylesheets.html.erb

@@ -55,10 +55,10 @@
     border-radius: 1.5625rem 1.5625rem 0 0;
     background: #653ed7;
     background: url(<%= image_path("mailer/event-mailer-bg.png") %>) center center / cover,
-                linear-gradient(45deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
-                linear-gradient(225deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
-                linear-gradient(330deg, #35ace0, rgba(0, 0, 255, 0) 70.71%),
-                linear-gradient(150deg, #35ace0, rgba(0, 0, 255, 0) 70.71%);
+        linear-gradient(45deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
+        linear-gradient(225deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
+        linear-gradient(330deg, #35ace0, rgba(0, 0, 255, 0) 70.71%),
+        linear-gradient(150deg, #35ace0, rgba(0, 0, 255, 0) 70.71%);
   }
   #confirm-email #greeting-card p,
   #confirm-email #greeting-card .booking-confirmm,
@@ -66,6 +66,24 @@
   #confirm-email #greeting-card .description {
     color: #fff;
   }
+
+  #confirm-email #greeting-card-1 {
+    color: #fff;
+    padding: 1.5rem;
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    border-radius: 1.5625rem 1.5625rem 0 0;
+    background: #<%= @brand_color %>;
+  }
+  #confirm-email #greeting-card-1 p,
+  #confirm-email #greeting-card-1 .header,
+  #confirm-email #greeting-card-1 .booking-confirm,
+  #confirm-email #greeting-card-1 .hello,
+  #confirm-email #greeting-card-1 .description {
+    color: #fff;
+  }
+
   #confirm-email .align-right {
     vertical-align: top;
   }
@@ -74,6 +92,15 @@
     margin-top: 1.25rem;
     margin-bottom: 0.625rem;
   }
+  #confirm-email .icon-hang-meas {
+    width: 6.25rem;
+  }
+  #confirm-email .header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
   #confirm-email #greeting-card .hello,
   .booking-confirm {
     font-size: 1.375rem;
@@ -83,6 +110,15 @@
     margin-bottom: 0.25rem;
     margin-top: 1.25rem;
   }
+  #confirm-email #greeting-card-1 .booking-confirm {
+    font-size: 1.375rem;
+    font-style: normal;
+    font-weight: 700;
+    line-height: 1.75rem;
+    margin-bottom: 0.25rem;
+    margin-top: 1.25rem;
+    color: #fff;
+  }
   #confirm-email #greeting-card .booking-confirm {
     font-size: 1.5rem;
     padding: 0.625rem 0;
@@ -233,6 +269,7 @@
   }
   #confirm-email .notice-info .description {
     padding-left: 0.75rem;
+    color: #939393;
   }
   #confirm-email .notice-info a {
     color: #6444D8;

data/app/views/spree_cm_commissioner/order_mailer/tenant/_customer_info.html.erb

@@ -0,0 +1,42 @@
+<div class="content-cell">
+<div class="container">
+  <h2><%= I18n.t('mail.order_mailer.customer_info') %></h2>
+  <div class="flex two-columns">
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/tenant_user.png", class: "mail-icon" %></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Name</p>
+          <p class="two-columns_description"><%= user_full_name(order) %></p>
+        </div>
+      </div>
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon" %></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Email</p>
+          <% if order.email.present? %>
+            <p class="two-columns_description"><%= link_to order.email, "mailto:#{order.email}" %></p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="vertical-separater"></div>
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon" %></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Contact</p>
+          <% if order.phone_number.present? || order.intel_phone_number.present? %>
+            <p class="two-columns_description">
+              <%= link_to(
+                    order.phone_number || order.intel_phone_number,
+                    "tel:#{order.phone_number || order.intel_phone_number}") %>
+            </p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <hr>
+</div>
+</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb

@@ -0,0 +1,25 @@
+<div class="email-footer_inner">
+  <div class="mb-24"><%= store.description%></div>
+  <div class="mb-24 f-14"><%= store.address%></div>
+  <h2 class="mb-24">Connect with us</h2>
+  <table class="mb-24 social_icons">
+    <tbody>
+      <tr>
+        <% if store.facebook? %>
+          <td class="social_icon">
+            <%= link_to store.facebook, target: :_blank do %>
+              <%= image_tag "mailer/facebook.png", class: "mail-icon"%>
+            <% end %>
+          </td>
+        <% end %>
+        <% if store.instagram?%>
+          <td class="social_icon">
+            <%= link_to store.instagram, target: :_blank do %>
+              <%= image_tag "mailer/instagram.png", class: "mail-icon"%>
+            <% end %>
+          </td>
+        <% end %>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb

@@ -0,0 +1,19 @@
+<div id="greeting-card-1">
+  <div>
+    <div class="header">
+      <h1><%=@order.store.name %></h1>
+      <% if @vendor_logo_url.present? %>
+        <img src="<%= @vendor_logo_url %>" alt="Vendor Logo" class="icon-hang-meas">
+      <% end %>
+    </div>
+    <div class="booking-confirm">
+      <%= I18n.t('mail.order_mailer.booking_confirm') %>
+    </div>
+    <div class="hello">
+      <%= I18n.t('mail.order_mailer.hello', full_name: user_full_name(order)) %>
+    </div>
+    <div class="description">
+      <%= I18n.t('mail.order_mailer.booking_event', order_number: @order.number || 'NA') %>
+    </div>
+  </div>
+</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb

@@ -0,0 +1,33 @@
+<div class="content-cell">
+<div class="container">
+  <h2><%= I18n.t('mail.order_mailer.bookmeplus_support')%></h2>
+  <div class="flex two-columns">
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon"%></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Contact</p>
+          <% if current_store.contact_phone.present? %>
+            <p class="two-columns_description">
+              <%= link_to current_store.contact_phone, "tel:#{current_store.contact_phone}" %>
+            </p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="vertical-separater"></div>
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon"%></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Email</p>
+            <p class="two-columns_description">
+          <%= @vendor&.support_email.present? ? link_to(@vendor.support_email, "mailto:#{@vendor.support_email}") : "N/A" %>
+          </p>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</div>

data/config/initializers/spree_permitted_attributes.rb

@@ -31,6 +31,8 @@ module Spree
       subtitle
       preferred_background_color
       preferred_foreground_color
+      preferred_group_check_in_enabled
+      preferred_individual_check_in_enabled
       show_badge_status
       purchasable_on
       available_on
@@ -58,10 +60,5 @@ module Spree
       age
       gender
     ]
-
-    @@stock_movement_attributes += %i[
-      originator_type
-      originator_id
-    ]
   end
 end

data/config/locales/en.yml

@@ -54,7 +54,11 @@ en:
   guest_card_classes:
     empty_info: "No guest card classes information available."
     background_image: "Background Image"
-
+  guest_dynamic_field:
+      errors:
+        pre_registration_required: "is required before ticket issuance"
+        post_registration_required: "must be completed after purchase"
+        during_check_in_required: "is required during check-in"
   google_wallet:
     note: "Click <b>Create</b> or <b> Update</b> to connect to Google Wallet after filled all information "
     google_wallet_class_created: "Google Wallet class created successfully."
@@ -459,6 +463,10 @@ en:
               businesses_cant_be_blank: "Businesses can't be blank"
               phone_number_cant_be_blank: "Phone number can't be blank"
               quantity_cant_be_less_than_or_equal_to_zero: "Quantity can't be less or equal than 0"
+        spree_cm_commissioner/vendor_place:
+          attributes:
+            place_id:
+              taken: "has already existed with this place type"
 
   mail:
     order_mailer:
@@ -543,6 +551,7 @@ en:
       update_user_login: "update user code"
       contact_update: "update contact code"
       otp_code: "OTP code"
+      telegram_verification: "telegram code"
 
   notifications:
     spree_cm_commissioner:

data/config/routes.rb

@@ -138,21 +138,7 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      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 :stock_managements
 
       resources :product_completion_steps do
         collection do
@@ -288,6 +274,7 @@ 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
@@ -464,6 +451,7 @@ 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
 
@@ -543,8 +531,6 @@ 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
@@ -570,10 +556,7 @@ 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] do
-          resources :variants, only: %i[index show], module: :accommodations
-        end
-
+        resources :accommodations, only: %i[index show]
         resources :line_items, only: %i[index show]
         resources :account_checker
         resource :account_recovers, only: [:update]
@@ -661,6 +644,7 @@ Spree::Core::Engine.add_routes do
         resources :taxons, only: %i[show] do
           resource :event_ticket_aggregators, only: %i[show]
           resource :pie_chart_event_aggregators, only: %i[show]
+          resources :pie_chart_events, only: %i[index show]
         end
       end
     end
@@ -688,5 +672,6 @@ 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/:id', to: 'spree_cm_commissioner/well_known#show', constraints: { id: /(assetlinks\.json|apple-app-site-association)/ }
+  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'
 end

data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb

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

data/db/migrate/20250616084219_add_description_to_cm_vendor_place.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToCmVendorPlace < ActiveRecord::Migration[7.0]
+  def change
+      add_column :cm_vendor_places, :description, :string, if_not_exists: true
+  end
+end

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