spree_cm_commissioner 1.10.0 → 1.11.0.pre.pre

data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb

@@ -0,0 +1,54 @@
+module SpreeCmCommissioner
+  class VendorStopPlaceQuery
+    attr_reader :query, :vendor_id, :stop_type, :reference_stop_id
+
+    def initialize(query:, vendor_id:, stop_type: :boarding, reference_stop_id: nil)
+      @query = query.to_s.strip
+      @vendor_id = vendor_id
+      @stop_type = stop_type
+      @reference_stop_id = reference_stop_id
+    end
+
+    def call
+      results = vendor_stops
+      return [] if results.empty?
+
+      places = results.includes(:stop).map(&:stop).compact.uniq
+
+      format_places(places)
+    end
+
+    private
+
+    def vendor_stops
+      scope = base_scope
+      return scope if query.blank?
+
+      scope = scope.where.not(stop_id: reference_stop_id) if reference_stop_id.present?
+      scope.where('cm_places.name ILIKE ?', "%#{query}%")
+    end
+
+    def base_scope
+      SpreeCmCommissioner::VendorStop
+        .joins(:stop)
+        .where(vendor_id: vendor_id)
+        .where(stop_type: stop_type)
+        .order(trip_count: :desc)
+        .where.not(trip_count: 0)
+    end
+
+    def format_places(places)
+      places
+        .sort_by { |p| [-p.depth, -p.lft] }
+        .filter_map do |place|
+          next if place.depth.zero?
+
+          {
+            id: place.id,
+            parent_id: place.parent_id,
+            name: place.self_and_ancestors.map(&:name).reverse.join(', ')
+          }
+        end
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,6 +3,9 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
+      required(:state_id).value(:integer)
+      required(:number_of_adults).value(:integer)
+      required(:number_of_kids).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map(&:text).join(', ')
+      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
     end
 
     private

data/app/request_schemas/spree_cm_commissioner/variant_request_schema.rb

@@ -0,0 +1,19 @@
+module SpreeCmCommissioner
+  class VariantRequestSchema < ApplicationRequestSchema
+    params do
+      required(:from_date).value(:date)
+      required(:to_date).value(:date)
+      required(:number_of_adults).value(:integer)
+      required(:number_of_kids).value(:integer)
+    end
+
+    rule(:from_date, :to_date) do
+      from_date = values[:from_date]
+      to_date   = values[:to_date]
+
+      key.failure(:must_be_in_future) if from_date < Time.zone.today
+      key.failure(:must_be_later_than_start_date) if from_date > to_date
+      key.failure(:stay_is_too_long) if (to_date - from_date).to_i > ENV.fetch('ACCOMMODATION_MAX_STAY_DAYS', 10).to_i
+    end
+  end
+end

data/app/serializers/spree/v2/storefront/accommodation_serializer.rb

@@ -9,10 +9,12 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
+        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
+        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

data/app/serializers/spree/v2/tenant/guest_serializer.rb

@@ -13,6 +13,7 @@ module Spree
 
         belongs_to :occupation, serializer: Spree::V2::Tenant::TaxonSerializer
         belongs_to :nationality, serializer: Spree::V2::Tenant::TaxonSerializer
+        has_one :id_card, serializer: Spree::V2::Tenant::IdCardSerializer
 
         # allowed_checkout updates frequently
         cache_options store: nil

data/app/services/spree_cm_commissioner/aes_encryption_service.rb

@@ -8,12 +8,13 @@ module SpreeCmCommissioner
     IV_LENGTH = 12
     TAG_LENGTH = 16
 
-    def self.encrypt(plaintext, key)
+    def self.encrypt(plaintext, base64_key)
+      key = Base64.decode64(base64_key)
       validate_key!(key)
 
       cipher = OpenSSL::Cipher.new(ALGORITHM)
       cipher.encrypt
-      cipher.key = key.b[0, KEY_LENGTH]
+      cipher.key = key[0, KEY_LENGTH]
       iv = cipher.random_iv
       cipher.iv = iv
 
@@ -24,7 +25,8 @@ module SpreeCmCommissioner
       Base64.strict_encode64(combined)
     end
 
-    def self.decrypt(encrypted_text, key)
+    def self.decrypt(encrypted_text, base64_key)
+      key = Base64.decode64(base64_key)
       validate_key!(key)
 
       combined = Base64.decode64(encrypted_text)
@@ -34,7 +36,7 @@ module SpreeCmCommissioner
 
       cipher = OpenSSL::Cipher.new(ALGORITHM)
       cipher.decrypt
-      cipher.key = key.b[0, KEY_LENGTH]
+      cipher.key = key[0, KEY_LENGTH]
       cipher.iv = iv
       cipher.auth_tag = tag
 

data/app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb

@@ -48,6 +48,8 @@ module SpreeCmCommissioner
       end
 
       def fetch_option_value(guest, option_type_name)
+        return guest.formatted_bib_number if option_type_name == 'bib-prefix'
+
         guest.line_item&.variant&.find_option_value_name_for(option_type_name: option_type_name)
       end
 

data/app/views/spree/admin/stock_managements/_events_popover.html.erb

@@ -0,0 +1,23 @@
+<div>
+  <% events.each do |event| %>
+    <% inventory_item = event.options[:inventory_item] %>
+
+    <div class="mb-3">
+      <h6><%= inventory_item.variant.options_text %></h6>
+      <ul class="list-group mt-1 mb-1">
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          Max capacity
+          <span class="badge badge-primary badge-pill"><%= inventory_item.max_capacity %></span>
+        </li>
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          Quantity available in DB
+          <span class="badge badge-primary badge-pill"><%= inventory_item.quantity_available %></span>
+        </li>
+      </ul>
+
+      <small class="text-muted">
+        <%= inventory_item_message(inventory_item, @cached_inventory_items[inventory_item.id]) %>
+      </small>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb

@@ -17,9 +17,11 @@
           </td>
           <td class="text-center d-flex flex-column align-items-center justify-content-center">
             <div style="width: 90px;">
-              <%= form_tag admin_stock_items_path(variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
+              <%= form_tag admin_product_stock_managements_path(product_id: params[:product_id], variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
                 <div class="input-group input-group-sm">
                   <%= number_field_tag 'stock_movement[quantity]', 0, class: 'form-control text-center p-0' %>
+                  <%= hidden_field_tag 'stock_movement[originator_id]', spree_current_user.id %>
+                  <%= hidden_field_tag 'stock_movement[originator_type]', spree_current_user.class.name %>
                   <div class="input-group-append">
                     <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
                       <%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>

data/app/views/spree/admin/stock_managements/calendar.html.erb

@@ -0,0 +1,35 @@
+<%= turbo_frame_tag "calendar" do %>
+  <%= form_with url: admin_product_stock_managements_path, method: :get, class: "mt-4" do %>
+    <%= select_year(params[:year]&.to_i || @year, { start_year: 2025, end_year: @year + 3 }, { name: "year", onchange: "this.form.submit()" }) %>
+  <% end %>
+
+  <div class="c-annual-calendar-container mt-2">
+    <div class="c-annual-calendar">
+      <% (1..12).each do |month| %>
+        <%= month_calendar(start_date: Date.new(@year, month, 1), attribute: :from_date, end_attribute: :to_date, events: @events) do |date, events| %>
+          <div class="c-annual-day"
+            data-date="<%= date.strftime '%Y-%m-%d' %>"
+            type="button"
+            tabindex="0"
+            data-toggle="popover"
+            data-trigger="hover"
+            data-placement="right"
+            data-html="true"
+            data-content="<%= raw render_escape_html partial: "events_popover", locals: { events: events } if events.any? %>">
+            <%= date.day %>
+            <ul class="p-0 m-0 list-unstyled">
+              <% events.each do |event| %>
+                <% inventory_item = event.options[:inventory_item] %>
+                <% synced = inventory_item.quantity_available == @cached_inventory_items[inventory_item.id].quantity_available %>
+
+                <li class="badge <%= synced ? "badge-warning" : "badge-danger" %>">
+                  <%= inventory_item.quantity_available %>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/stock_managements/index.html.erb

@@ -19,10 +19,7 @@
       <% @variants.each do |variant| %>
         <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
           <td class="image text-center">
-              <%= small_image(variant) %>
-              <div class="mt-4">
-                Reserved Stock: <%= @reserved_stocks[variant.id] || 0 %></strong>
-              </div>
+            <%= small_image(variant) %>
           </td>
           <td>
             <%= variant.sku_and_options_text %>
@@ -35,14 +32,46 @@
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
+
+            <% if defined?(@reserved_stocks) %>
+              <div>
+                <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
+                  <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
+                </span>
+                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
+              </div>
+            <% end %>
+
             <% if variant.permanent_stock? %>
               <div>
                 <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
                     <%= svg_icon name: "info-circle-fill.svg", width: '14', height: '14' %>
                 </span>
-                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock) %>
+                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock), class: "m-0" %>
               </div>
             <% end %>
+
+            <% if defined?(@inventory_items) %>
+              <% @inventory_items[variant.id]&.each do |inventory_item| %>
+                <div>
+                  <%= svg_icon name: "handbag.svg", width: '14', height: '14' %>
+                  <%= label_tag "max_capacity_#{ inventory_item.id }", "Max capacity: #{inventory_item.max_capacity}", class: "m-0" %>
+                </div>
+                <div>
+                  <%= svg_icon name: "approve.svg", width: '14', height: '14' %>
+                  <%= label_tag "quantity_available_#{ inventory_item.id }", "Quantity available: #{inventory_item.quantity_available}", class: "m-0" %>
+
+                  <% synced = inventory_item.quantity_available == @cached_inventory_items[inventory_item.id].quantity_available %>
+                  <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="<%= inventory_item_message(inventory_item, @cached_inventory_items[inventory_item.id]) %>">
+                    <% if synced %>
+                      <%= svg_icon name: "cloud-check.svg", width: '14', height: '14', classes: 'text-success' %>
+                    <% else %>
+                      <%= svg_icon name: "cloud-slash.svg", width: '14', height: '14', classes: 'text-danger' %>
+                    <% end %>
+                  </span>
+                </div>
+              <% end %>
+            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -53,3 +82,9 @@
     </tbody>
   </table>
 </div>
+
+<%= turbo_frame_tag "calendar", src: calendar_admin_product_stock_managements_path(year: params[:year]) do %>
+  <div class="spinner-border mt-2" role="status">
+    <span class="sr-only">Loading...</span>
+  </div>
+<% end if @product.permanent_stock? %>

data/config/initializers/spree_permitted_attributes.rb

@@ -55,5 +55,10 @@ module Spree
       age
       gender
     ]
+
+    @@stock_movement_attributes += %i[
+      originator_type
+      originator_id
+    ]
   end
 end

data/config/routes.rb

@@ -138,7 +138,11 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements
+      resources :stock_managements do
+        collection do
+          get :calendar
+        end
+      end
 
       resources :product_completion_steps do
         collection do
@@ -519,6 +523,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
@@ -544,7 +550,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]

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/20250418072528_add_nested_set_columns_to_places.rb

@@ -0,0 +1,10 @@
+class AddNestedSetColumnsToPlaces < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_places, :parent_id, :integer if !column_exists?(:cm_places, :parent_id)
+    add_column :cm_places, :lft,       :integer if !column_exists?(:cm_places, :lft)
+    add_column :cm_places, :rgt,       :integer if !column_exists?(:cm_places, :rgt)
+
+    add_column :cm_places, :depth,          :integer if !column_exists?(:cm_places, :depth)
+    add_column :cm_places, :children_count, :integer if !column_exists?(:cm_places, :children_count)
+  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
+  end
+end

data/db/migrate/20250430091742_create_cm_taxon_option_types.rb

@@ -0,0 +1,9 @@
+class CreateCmTaxonOptionTypes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_taxon_option_types do |t|
+      t.references :taxon, null: false, if_not_exists: true
+      t.references :option_type, null: false, if_not_exists: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250430092928_create_cm_taxon_option_values.rb

@@ -0,0 +1,9 @@
+class CreateCmTaxonOptionValues < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_taxon_option_values do |t|
+      t.references :taxon, null: false, if_not_exists: true
+      t.references :option_value, null: false, if_not_exists: true
+      t.timestamps
+    end
+  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/20250506092929_add_trip_count_to_cm_vendor_stops.rb

@@ -0,0 +1,5 @@
+class AddTripCountToCmVendorStops < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_vendor_stops, :trip_count, :integer, default: 0, 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/generators/spree_cm_commissioner/install/install_generator.rb

@@ -40,9 +40,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/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/place_factory.rb

@@ -10,5 +10,15 @@ FactoryBot.define do
     address_components    { FFaker::Address.street_address }
     lat                   { FFaker::Geolocation.lat }
     lon                   { FFaker::Geolocation.lng }
+    trait :with_parent do
+      association :parent, factory: :cm_place
+    end
+    transient do
+      children_count { 0 }
+    end
+
+    after(:create) do |place, evaluator|
+      create_list(:cm_place, evaluator.children_count, parent: place)
+    end
   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?
@@ -85,7 +98,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 +116,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 +149,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/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)