spree_cm_commissioner 1.21.0 → 2.0.1.pre.pre

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -2,54 +2,57 @@ module SpreeCmCommissioner
   class TripQuery
     include SpreeCmCommissioner::Transit::TripHelper
 
-    attr_reader :origin_id, :destination_id, :travel_date, :params
+    attr_reader :origin_id, :destination_id, :date, :params
 
-    def initialize(origin_id:, destination_id:, travel_date:, params: {})
+    def initialize(origin_id:, destination_id:, date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
-      @travel_date = travel_date
-      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
+      @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
       @params = params
     end
 
     def call
-      return [] if travel_date.to_date < Date.current
+      return [] if date.to_date < Date.current
 
       direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
       connected_results = connected_trips || []
       direct_results + connected_results
     end
 
-    def direct_trips
-      result = Spree::Variant
-               .select('spree_variants.id AS variant_id,
+    def direct_trips # rubocop:disable Metrics/MethodLength
+      result = Spree::Product
+               .select('
                         vendors.id AS vendor_id,
                         vendors.name AS vendor_name,
-                        routes.name AS route_name,
-                        routes.short_name AS short_name,
+                        spree_products.name AS route_name,
+                        spree_products.short_name AS short_name,
                         boarding.stop_id AS origin_id,
                         drop_off.stop_id AS destination_id,
                         boarding.stop_name AS origin,
                         drop_off.stop_name AS destination,
+                        spree_products.id AS trip_id,
                         trips.departure_time AS departure_time,
                         trips.duration AS duration,
-                        trips.vehicle_id AS vehicle_id'
+                        trips.vehicle_id AS vehicle_id,
+                        COALESCE(iv.quantity_available, 0) AS quantity_available,
+                        COALESCE(iv.max_capacity, 0) AS max_capacity'
                       )
-               .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.id')
-               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = spree_variants.id AND boarding.stop_type = 0')
-               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
-               .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
-               .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
+               .joins('INNER JOIN cm_trips AS trips ON trips.product_id = spree_products.id')
+               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = trips.id AND boarding.stop_type = 0')
+               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = trips.id AND drop_off.stop_type = 1')
+               .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_products.vendor_id')
+               .joins("LEFT JOIN (#{product_inventory_totals.to_sql}) iv ON spree_products.id = iv.product_id")
+
       result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
       result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
                      .where('trips.departure_time > ? AND trips.departure_time <= ?',
-                            travel_date.strftime('%H:%M:%S'),
-                            travel_date.end_of_day.strftime('%H:%M:%S')
+                            date.strftime('%H:%M:%S'),
+                            date.end_of_day.strftime('%H:%M:%S')
                            )
 
       result.map do |trip|
         trip_result_options = {
-          trip_id: trip[:variant_id],
+          trip_id: trip[:trip_id],
           vendor_id: trip[:vendor_id],
           vendor_name: trip[:vendor_name],
           route_name: trip[:route_name],
@@ -61,7 +64,9 @@ module SpreeCmCommissioner
           destination: trip[:destination],
           vehicle_id: trip[:vehicle_id],
           departure_time: parse_time(trip[:departure_time]),
-          duration: trip[:duration]
+          duration: trip[:duration],
+          quantity_available: trip[:quantity_available].to_i,
+          max_capacity: trip[:max_capacity].to_i
         }
         SpreeCmCommissioner::TripResult.new(trip_result_options)
       end
@@ -69,52 +74,69 @@ module SpreeCmCommissioner
 
     def connected_trips # rubocop:disable Metrics/MethodLength
       result = SpreeCmCommissioner::TripConnection
-               .joins('
-                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
-                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
-                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
-                INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
-                INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
-                INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
-                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
-                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
-                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
-                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
+               .joins("
+                INNER JOIN cm_trips trip1 ON trip1.id = cm_trip_connections.from_trip_id
+                INNER JOIN cm_trips trip2 ON trip2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS product1 ON product1.id = trip1.product_id
+                INNER JOIN spree_products AS product2 ON product2.id = trip2.product_id
+                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = trip1.id AND trip1_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = trip2.id AND trip2_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = trip2.id AND trip2_destination.stop_type = 1
+                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = product1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = product2.vendor_id
+                LEFT JOIN (#{product_inventory_totals.to_sql}) AS iv1 ON iv1.product_id = product1.id
+                LEFT JOIN (#{product_inventory_totals.to_sql}) AS iv2 ON iv2.product_id = product2.id"
                      )
                .select('cm_trip_connections.id AS id,
-                        trip1.variant_id AS trip1_id,
+                        trip1.id AS trip1_id,
                         trip1.origin_id AS trip1_origin_id,
                         trip1.destination_id AS trip1_destination_id,
                         trip1.departure_time AS trip1_departure_time,
                         trip1.duration AS trip1_duration,
-                        routes1.short_name AS route1_short_name,
-                        routes1.name AS route1_name,
+                        product1.id AS trip1_id,
+                        product1.short_name AS route1_short_name,
+                        product1.name AS route1_name,
                         trip1.vehicle_id AS trip1_vehicle,
                         vendor1.name AS trip1_vendor_name,
-                        trip2.variant_id AS trip2_id,
+                        trip2.id AS trip2_id,
                         trip2.origin_id AS trip2_origin_id,
                         trip2.destination_id AS trip2_destination_id,
                         trip2.departure_time AS trip2_departure_time,
                         trip2.duration AS trip2_duration,
                         trip2.vehicle_id AS trip2_vehicle,
-                        routes2.short_name AS route2_short_name,
-                        routes2.name AS route2_name,
+                        product2.id AS trip2_id,
+                        product2.short_name AS route2_short_name,
+                        product2.name AS route2_name,
                         trip1_origin.stop_name AS trip1_origin,
                         trip2_origin.stop_name AS trip2_origin,
                         trip2_destination.stop_name AS trip2_destination,
-                        vendor2.name AS trip2_vendor_name'
+                        vendor2.name AS trip2_vendor_name,
+                        COALESCE(iv1.quantity_available, 0) as trip1_quantity_available,
+                        COALESCE(iv2.quantity_available, 0) as trip2_quantity_available,
+                        COALESCE(iv1.max_capacity, 0) as trip1_max_capacity,
+                        COALESCE(iv2.max_capacity, 0) as trip2_max_capacity'
                       ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
       result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
-      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
-                            travel_date.end_of_day.strftime('%H:%M:%S')
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', date.strftime('%H:%M:%S'),
+                            date.end_of_day.strftime('%H:%M:%S')
       ).uniq
-
       return [] if result.blank?
 
       build_trip_query_result(result)
     end
 
+    def product_inventory_totals
+      Spree::Product
+        .select(
+          'spree_products.id AS product_id,
+            SUM(cm_inventory_items.max_capacity) AS max_capacity,
+            SUM(cm_inventory_items.quantity_available) AS quantity_available'
+        )
+        .joins(variants: :inventory_items)
+        .where(cm_inventory_items: { inventory_date: date.to_date })
+        .group('spree_products.id')
+    end
+
     private
 
     def build_trip_query_result(connections)
@@ -130,7 +152,9 @@ module SpreeCmCommissioner
           short_name: trip[:route1_short_name],
           vehicle_id: trip[:trip1_vehicle],
           origin: trip[:trip1_origin],
-          destination: trip[:trip2_origin]
+          destination: trip[:trip2_origin],
+          quantity_available: trip[:trip1_quantity_available].to_i,
+          max_capacity: trip[:trip1_max_capacity].to_i
         }
         to_trip = {
           trip_id: trip[:trip2_id],
@@ -143,7 +167,9 @@ module SpreeCmCommissioner
           short_name: trip[:route2_short_name],
           vehicle_id: trip[:trip2_vehicle],
           origin: trip[:trip2_origin],
-          destination: trip[:trip2_destination]
+          destination: trip[:trip2_destination],
+          quantity_available: trip[:trip2_quantity_available].to_i,
+          max_capacity: trip[:trip2_max_capacity].to_i
         }
         data = [SpreeCmCommissioner::TripResult.new(from_trip),
                 SpreeCmCommissioner::TripResult.new(to_trip)

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(:province_id).value(:integer)
+      required(:adult).value(:integer)
+      required(:children).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(:adult).value(:integer)
+      required(:children).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/storefront/line_item_serializer_decorator.rb

@@ -4,6 +4,7 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
+                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,

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

@@ -11,7 +11,6 @@ module Spree
         has_one :profile, serializer: Spree::V2::Tenant::AssetSerializer
         has_many :device_tokens, serializer: Spree::V2::Tenant::UserDeviceTokenSerializer
         has_many :spree_roles, serializer: Spree::V2::Tenant::RoleSerializer
-        has_many :user_identity_providers, serializer: Spree::V2::Tenant::UserIdentityProviderSerializer
 
         attribute :store_credits, &:total_available_store_credit
 

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -32,7 +32,7 @@ module SpreeCmCommissioner
         options = { login: params[:username], password: params[:password], tenant_id: tenant_id }
         SpreeCmCommissioner::UserPasswordAuthenticator.call(options)
       when 'social_auth'
-        options = { id_token: params[:id_token], tenant_id: tenant_id }
+        options = { id_token: params[:id_token] }
         SpreeCmCommissioner::UserIdTokenAuthenticator.call(options)
       when 'telegram_web_app_auth'
         options = { telegram_init_data: params[:telegram_init_data], telegram_bot_username: params[:tg_bot] }

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,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