spree_cm_commissioner 2.0.0 → 2.0.1.pre.pre

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/app/views/spree/admin/tenant_vendors/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_tenants_url %>
-  <%= link_to Spree.t('tenants'), spree.admin_tenants_url %> / <%= link_to @tenant.name, spree.admin_tenants_url%> / <%= Spree.t('vendors') %>
+  <%= link_to @tenant.name, spree.admin_tenants_url %> / <%= Spree.t('vendors') %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -24,20 +24,13 @@
       <tbody>
         <% @vendors.each do |vendor| %>
           <tr id="<%= spree_dom_id vendor %>" data-hook="admin_vendors_index_rows">
-            <td>
-              <% if can?(:edit, vendor) %>
-                <%= link_to vendor.name, edit_admin_vendor_path(vendor.slug) %>
-              <% else %>
-                  <td><%= vendor.name %></td>
-              <% end %>
-            </td>
+            <td><%= vendor.name %></td>
             <td><%= vendor.slug %></td>
             <td><%= vendor.created_at %></td>
             <td><%= vendor.updated_at %></td>
             <td><%= vendor.tenant.name %></td>
             <td data-hook="admin_tenants_index_row_actions" class="actions">
               <span class="d-flex justify-content-end">
-                <%= link_to_edit vendor, url: edit_admin_vendor_path(vendor.slug), no_text: true if can?(:edit, vendor) %>
                 <%= link_to_delete vendor, url: admin_tenant_vendor_path(@tenant, vendor.id), no_text: true if can?(:delete, vendor) %>
               </span>
             </td>

data/app/views/spree/admin/tenants/_form.html.erb

@@ -101,15 +101,6 @@
     <% end %>
   </div>
 
-  <!-- Brand Primary Color Field -->
-  <div class="col-md-6">
-    <%= f.label :preferred_brand_primary_color, Spree.t(:brand_primary_color), class: 'form-label' %>
-    <%= f.text_field :preferred_brand_primary_color, class: 'form-control color-picker', placeholder: '#FF5733', value: @object.preferred_brand_primary_color %>
-    <div class="color-preview" style="margin-top: 10px;">
-      <%= content_tag :div, nil, style: "background-color: #{@object.preferred_brand_primary_color}; width: 60px; height: 60px; border: 1px solid #ccc; box-sizing: border-box; display: block;" %>
-    </div>
-  </div>
-
   <!-- State Field -->
   <div class="col-6">
     <%= f.field_container :state do %>

data/app/views/spree/admin/tenants/edit.html.erb

@@ -1,7 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_tenants_url %>
-   <%= link_to Spree.t('tenants'), spree.admin_tenants_url %> /
-  <%= @object.name %>
+  <%= link_to @object.name, spree.admin_tenants_url %>
 <% end %>
 
 <%= render partial: 'tabs', locals: { current: :edit } %>

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

@@ -40,13 +40,7 @@
       <tbody>
         <% @collection.each do |tenant| %>
           <tr id="<%= spree_dom_id tenant %>" data-hook="admin_tenants_index_rows">
-            <td>
-              <% if can?(:edit, tenant) %>
-                <%= link_to tenant.name, edit_admin_tenant_path(tenant.slug) %>
-              <% else %>
-                <%= tenant.name %>
-              <% end %>
-            </td>
+            <td><%= tenant.name %></td>
             <td><%= tenant.slug %></td>
             <td><%= tenant.description %></td>
             <td><%= tenant.created_at %></td>

data/app/views/spree/admin/vendors/_form.html.erb

@@ -60,18 +60,4 @@
     <%= f.label :notification_email %>
     <%= f.email_field :notification_email, class: 'form-control' %>
   <% end %>
-   <%= f.field_container :from_email do %>
-    <%= f.label :from_email, Spree.t(:from_email)%>
-    <%= f.email_field :from_email, class: 'form-control' %>
-    <small class="form-text text-muted">
-        This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)
-    </small>
-  <% end %>
-  <%= f.field_container :support_email do %>
-    <%= f.label :support_email, Spree.t(:support_email)  %>
-    <%= f.email_field :support_email, class: 'form-control' %>
-    <small class="form-text text-muted">
-    This email is visible to your Store visitors in the Footer section
-    </small>
-  <% end %>
 </div>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -1,33 +1,22 @@
 <tr>
-  <td class="email-body" width="570" cellpadding="0" cellspacing="0">
-    <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+   <td class="email-body" width="570" cellpadding="0" cellspacing="0">
+      <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+      <!-- Body content -->
       <tbody>
-        <tr>
-          <td>
-            <% if @order.tenant.nil? %>
-              <div class="f-fallback">
-                <%= render 'spree_cm_commissioner/order_mailer/greeting', order: @order %>
-                <div class="content">
+      <tr>
+         <td>
+            <div class="f-fallback">
+               <%= render 'spree_cm_commissioner/order_mailer/greeting', order: @order %>
+               <div class="content">
                   <%= render 'spree_cm_commissioner/order_mailer/order_total', order: @order %>
                   <%= render 'spree_cm_commissioner/order_mailer/your_booking', order: @order, show_booking_header: true %>
                   <%= render 'spree_cm_commissioner/order_mailer/customer_info', order: @order %>
-                  <%= render 'spree_cm_commissioner/order_mailer/support_contact' %>
-                </div>
-              </div>
-            <% else %>
-              <div class="f-fallback">
-                <%= render 'spree_cm_commissioner/order_mailer/tenant/greeting', order: @order %>
-                <div class="content">
-                  <%= render 'spree_cm_commissioner/order_mailer/order_total', order: @order %>
-                  <%= render 'spree_cm_commissioner/order_mailer/your_booking', order: @order, show_booking_header: true %>
-                  <%= render 'spree_cm_commissioner/order_mailer/tenant/customer_info', order: @order %>
-                  <%= render 'spree_cm_commissioner/order_mailer/tenant/support_contact' %>
-                </div>
-              </div>
-            <% end %>
-          </td>
-        </tr>
+                  <%= render 'spree_cm_commissioner/order_mailer/support_contact'%>
+               </div>
+            </div>
+         </td>
+      </tr>
       </tbody>
-    </table>
-  </td>
-</tr>
+      </table>
+   </td>
+</tr>

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

@@ -23,11 +23,7 @@
           <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
             <tr>
               <td>
-                <% if @order.tenant.nil? %>
-                  <%= render 'spree_cm_commissioner/order_mailer/footer', store: @order.store %>
-                <% else %>
-                  <%= render 'spree_cm_commissioner/order_mailer/tenant/footer', store: @order.store %>
-                <% end %>
+                  <%= render 'spree_cm_commissioner/order_mailer/footer', store: @order.store%>
               </td>
             </tr>
           </table>

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,24 +66,6 @@
   #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;
   }
@@ -92,15 +74,6 @@
     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;
@@ -110,15 +83,6 @@
     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;
@@ -269,7 +233,6 @@
   }
   #confirm-email .notice-info .description {
     padding-left: 0.75rem;
-    color: #939393;
   }
   #confirm-email .notice-info a {
     color: #6444D8;

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/locales/en.yml

@@ -54,11 +54,7 @@ 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."

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,6 +545,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
@@ -556,7 +572,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/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