spree_cm_commissioner 2.0.3.pre.pre4 → 2.0.3.pre.pre6

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

@@ -19,30 +19,73 @@
       <% @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 %>
             <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory mt-2' do %>
               <div class="checkbox">
                 <%= label_tag "track_inventory_#{ variant.id }", class: 'm-0' do %>
-                  <%= check_box_tag 'track_inventory', 1, variant.track_inventory?, class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
+                  <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
+                    class: 'track_inventory_checkbox',
+                    id: "track_inventory_#{ variant.id }",
+                    onclick: "if (!confirm('Are you sure to change track inventory status?')) { this.checked = !this.checked; }" %>
                   <%= Spree.t(:track_inventory) %>
                   <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?, class: 'variant_track_inventory', id: "variant_track_inventory_#{variant.id}" %>
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
+
+            <% if defined?(@reserved_stocks) %>
+              <div>
+                <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
+                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
+                <%= link_to_with_icon('capture.svg', "Create Inventory Item", admin_product_stock_management_variant_inventory_items(@product, variant.id),
+                  method: :post,
+                  remote: false,
+                  class: 'icon_link btn btn-sm btn-outline-primary ml-2',
+                  no_text: true
+                ) unless @inventory_items[variant.id].present? %>
+              </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>
+
+                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_variant_inventory_item_path(@product, inventory_item.variant_id, inventory_item.id),
+                    method: :patch,
+                    remote: false,
+                    class: 'icon_link btn btn-sm outline text-dark',
+                    data: { confirm: "Only reset if stock is incorrect. Are you sure?" }, no_text: true
+                  ) %>
+                </div>
+              <% end %>
+            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -53,3 +96,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/paper_trail.rb

@@ -0,0 +1 @@
+PaperTrail.enabled = true

data/config/initializers/spree_permitted_attributes.rb

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

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
@@ -531,12 +545,17 @@ 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
           patch :restart_checkout_flow
         end
 
+        resources :trip_places
+        resources :trip_search, only: [:index]
+
         namespace :queue_cart do
           resources :line_items, only: [:create]
         end
@@ -556,7 +575,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/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/20250122000000_move_route_type_from_vehicles_to_trips.rb

@@ -0,0 +1,7 @@
+class MoveRouteTypeFromVehiclesToTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_trips, :route_type, :integer, if_not_exists: true
+    add_column :cm_trips, :distance, :decimal, precision: 10, scale: 2, if_not_exists: true
+    remove_column :cm_vehicles, :route_type, :integer, if_exists: true
+  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/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb

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

data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb

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

data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb

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

data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb

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

data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb

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

data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb

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

data/db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb

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

data/db/migrate/20250725092713_add_block_type_to_cm_blocks.rb

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

data/db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb

@@ -0,0 +1,6 @@
+class AddDepartureTimeAndArrivalTimeToTripStop < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_trip_stops, :departure_time, :datetime, if_not_exists: true
+    add_column :cm_trip_stops, :arrival_time, :datetime, if_not_exists: true
+  end
+end

data/db/migrate/20250807033035_create_spree_cm_commissioner_saved_guests.rb

@@ -0,0 +1,23 @@
+class CreateSpreeCmCommissionerSavedGuests < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_saved_guests, if_not_exists: true do |t|
+      t.string :first_name
+      t.string :last_name
+
+      t.date :dob
+      t.integer :age
+      t.integer :gender
+
+      t.string :email
+      t.string :country_code, limit: 5
+      t.string :phone_number, limit: 50
+      t.string :intel_phone_number
+
+      t.references :user, foreign_key: { to_table: :spree_users }, null: true
+      t.references :nationality, foreign_key: { to_table: :spree_taxons }, null: true
+      t.references :occupation, foreign_key: { to_table: :spree_taxons }, null: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250808054835_add_saved_guest_reference_to_cm_blocks.rb

@@ -0,0 +1,5 @@
+class AddSavedGuestReferenceToCmBlocks < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_guests, :saved_guest, foreign_key: { to_table: :cm_saved_guests }, null: true, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb

@@ -0,0 +1,8 @@
+class RemoveUniqueIndexesFromCmUserIdentityProviders < ActiveRecord::Migration[7.0]
+  def change
+    if index_exists?(:cm_user_identity_providers, [:identity_type, :sub], name: "index_cm_user_identity_providers_on_identity_type_and_sub")
+      remove_index :cm_user_identity_providers,
+                   name: "index_cm_user_identity_providers_on_identity_type_and_sub"
+    end
+  end
+end

data/db/migrate/20250814073854_add_call_to_action_to_spree_products.rb

@@ -0,0 +1,5 @@
+class AddCallToActionToSpreeProducts < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_products, :call_to_action, :integer, null: true, if_not_exists: true
+  end
+end

data/docker-compose.yml

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

data/lib/cm_app_logger.rb

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

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

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

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

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