spree_cm_commissioner 2.0.3.pre.pre4 → 2.0.3.pre.pre5

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

@@ -0,0 +1,14 @@
+module Spree
+  module V2
+    module Storefront
+      class TripQueryResultSerializer < BaseSerializer
+        set_type :trip_query_result
+
+        attributes :quantity_available, :max_capacity
+
+        attribute :direct, &:direct?
+        has_many :trips, serializer: Spree::V2::Storefront::TripResultSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Spree
+  module V2
+    module Storefront
+      class TripResultSerializer < BaseSerializer
+        set_type :trip_result
+
+        attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
+                   :allow_seat_selection, :departure_time
+        attribute :duration_in_hms, &:duration_in_hms
+        belongs_to :vendor, serializer: Spree::V2::Storefront::TripVendorSerializer
+        belongs_to :vehicle, serializer: Spree::V2::Storefront::TripVehicleSerializer
+        has_many :amenities, serializer: Spree::V2::Storefront::AmenitySerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Storefront
+      class TripVehicleSerializer < BaseSerializer
+        set_type :vehicle
+
+        attributes :id, :code
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Storefront
+      class TripVendorSerializer < BaseSerializer
+        set_type :vendor
+
+        attributes :name, :star_rating
+
+        has_one :logo, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+      end
+    end
+  end
+end

data/app/views/spree/admin/inventory_items/show.html.erb

@@ -0,0 +1,72 @@
+<%= turbo_frame_tag "inventory_item" do %>
+  <div>
+    <h5 class="modal-title">Inventory</h5>
+    <p>
+      <% if @inventory_item.inventory_date.present? %>
+        <span><%= @inventory_item.inventory_date %></span><br>
+      <% end %>
+      <%= @inventory_item.variant.options_text %>
+    </p>
+
+    <ul class="list-group 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
+        <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_item) %>
+    </small>
+
+    <%= 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>
+
+  <hr />
+
+  <div class="mt-2">
+    <h6 class="modal-title mb-1 d-flex flex-row justify-content-between">
+      Custom Prices
+      <%= link_to_with_icon('delete.svg', Spree.t(:remove),
+        delete_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
+        method: :delete, remote: false, class: 'icon_link btn btn-sm text-danger', data: { action: :remove, confirm: "Are you sure to remove these prices & use base price?" }, no_text: true
+      ) if @prices.any?(&:persisted?) %>
+    </h6>
+
+    <%= form_with url: update_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id), method: :patch, local: true, html: { class: 'inventory-item-prices-form' } do |form| %>
+      <table class="table">
+        <tbody>
+          <% @prices.each do |price| %>
+            <% currency = price.currency %>
+            <% default_price = @default_prices[currency] || Spree::Price.new %>
+            <tr id="inventory-item_prices_row_<%= currency %>" data-hook="inventory-item_prices_row">
+              <td><%= form.label "price_#{currency}", currency, class: 'form-label' %></td>
+              <td>
+                <%= form.hidden_field "prices[#{currency}][currency]", value: currency %>
+                <%= form.text_field "prices[#{currency}][price]", value: price.amount, placeholder: "Default: #{default_price.amount || 'N/A'}", class: 'form-control' %>
+              </td>
+              <td>
+                <%= form.text_field "prices[#{currency}][compare_at_price]", value: price.compare_at_price, placeholder: "Default: #{default_price.compare_at_price || 'N/A'}", class: 'form-control' %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+
+      <div class="d-flex flex-row justify-content-end mt-2">
+        <div class="form-actions" data-hook="buttons">
+          <%= button Spree.t('actions.save'), 'save.svg', 'submit', { class: 'btn-outline-success', data: { disable_with: "#{ Spree.t(:saving) }...", turbo_frame: "_top" } } %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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) %>
@@ -32,7 +34,10 @@
           <td class="text-center">
             <% if item.persisted? && can?(:update, item) %>
               <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?, class: 'stock_item_backorderable', id: "stock_item_backorderable_#{stock_location.id}" %>
+                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
+                  class: 'stock_item_backorderable',
+                  id: "stock_item_backorderable_#{stock_location.id}",
+                  onclick: "if (!confirm('Are you sure to change backorderable status?')) { this.checked = !this.checked; }" %>
               <% end %>
             <% else %>
               <%= 'N/A' %>

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

@@ -0,0 +1,56 @@
+<%= 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' %>">
+            <%= date.day %>
+            <ul class="p-0 m-0 list-unstyled">
+              <% events = events.sort_by { |e| e.options[:inventory_item]&.variant_id.to_i } %>
+              <% events.each do |event| %>
+                <% inventory_item = event.options[:inventory_item] %>
+                <% synced = inventory_item.quantity_available == @cached_inventory_items[inventory_item.id].quantity_available %>
+
+                <% classes = 'badge ' %>
+                <% classes += synced ? 'badge-primary ' : 'badge-danger ' %>
+                <% classes += 'badge-success ' if inventory_item.prices.any? %>
+
+                <li class="<%= classes %>"
+                    data-toggle="modal"
+                    data-target="#inventoryItemModal"
+                    role="button"
+                    onclick="updateModalTurboFrameSrc('<%= admin_product_variant_inventory_item_path(@product, inventory_item.variant_id, inventory_item.id) %>')">
+                    <%= inventory_item.quantity_available %>
+                    <%= inventory_item.prices.first.display_amount if inventory_item.prices.any? %>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="modal fade" id="inventoryItemModal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-body">
+          <%= turbo_frame_tag "inventory_item" %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    function updateModalTurboFrameSrc(url) {
+      let frame = document.getElementById('inventory_item');
+      frame.src = null;
+      frame.innerHTML = `<div class="spinner-border mt-2" role="status"></div>`;
+      frame.src = url
+    }
+  </script>
+<% end %>

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