spree_cm_commissioner 1.18.2.pre.pre1 → 2.0.0.pre.pre

data/app/queries/spree_cm_commissioner/guest_searcher_query.rb

@@ -8,36 +8,20 @@ module SpreeCmCommissioner
 
     def event_id = params[:event_id]
 
-    def call # rubocop:disable Metrics/PerceivedComplexity
+    def call
       return SpreeCmCommissioner::Guest.none if event_id.blank?
 
-      if params[:qr_data].present? && order_qr_data?
-        search_by_order_qr
-      elsif params[:qr_data].present? && line_item_qr_data?
-        search_by_line_item_qr
-      elsif params[:qr_data].present? && guest_qr_data?
+      if params[:qr_data].present?
         search_by_guest_qr
       elsif params[:term].present?
         search_by_term
-      elsif params[:ids].present?
-        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id, id: params[:ids])
       else
-        SpreeCmCommissioner::Guest.complete_or_canceled.where(event_id: event_id)
+        SpreeCmCommissioner::Guest.none
       end
     end
 
     private
 
-    def search_by_order_qr
-      order = Spree::Order.complete_or_canceled.search_by_qr_data!(params[:qr_data])
-      order.guests.where(event_id: event_id)
-    end
-
-    def search_by_line_item_qr
-      line_item = Spree::LineItem.complete_or_canceled.search_by_qr_data!(params[:qr_data])
-      line_item.guests.where(event_id: event_id)
-    end
-
     def search_by_guest_qr
       SpreeCmCommissioner::Guest.complete_or_canceled.where(
         token: params[:qr_data],
@@ -45,32 +29,6 @@ module SpreeCmCommissioner
       )
     end
 
-    def order_qr_data?
-      matches = construct_matches
-      matches&.size == 2
-    end
-
-    def line_item_qr_data?
-      matches = construct_matches
-      matches&.size == 3
-    end
-
-    def guest_qr_data?
-      matches = construct_matches
-      matches.nil?
-    end
-
-    def construct_matches
-      qr_data = params[:qr_data]
-      return nil unless qr_data
-
-      if qr_data =~ /-L\d+$/
-        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)-(L\d+)/)&.captures
-      else
-        qr_data.match(/(R\d+)-([A-Za-z0-9_\-]+)/)&.captures
-      end
-    end
-
     def search_by_term
       terms = params[:term].split.map { |term| "%#{term.downcase}%" }
 

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -2,18 +2,18 @@ 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
+      @date = Time.zone.now if date.to_date == Time.zone.now.to_date
       @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 || []
@@ -35,18 +35,18 @@ module SpreeCmCommissioner
                         trips.duration AS duration,
                         trips.vehicle_id AS vehicle_id'
                       )
-               .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.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 = routes.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')
+
       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],
@@ -70,20 +70,18 @@ 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'
+                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 routes1 ON routes1.id = trip1.product_id
+                INNER JOIN spree_products AS routes2 ON routes2.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 = routes1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = routes2.vendor_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,
@@ -92,7 +90,7 @@ module SpreeCmCommissioner
                         routes1.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,
@@ -106,10 +104,9 @@ module SpreeCmCommissioner
                         vendor2.name AS trip2_vendor_name'
                       ).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)

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_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb

@@ -2,10 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink,
-                   :from_date, :to_date,
-                   :check_in_flows,
-                   :updated_at
+        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_option_serializer.rb

@@ -2,7 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at
+        set_type :dynamic_field_option
+
+        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,7 +2,9 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at
+        set_type :dynamic_field
+
+        attributes :id, :label, :data_type, :vendor_id, :created_at, :updated_at
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_dynamic_field_serializer.rb

@@ -4,10 +4,9 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
-        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end

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

@@ -1,12 +1,11 @@
 module SpreeCmCommissioner
   module Organizer
     class ExportGuestCsvService
-      attr_reader :event_id, :columns, :filters
+      attr_reader :event_id, :columns
 
-      def initialize(event_id, columns, filters = {})
+      def initialize(event_id, columns)
         @event_id = event_id
         @columns = columns
-        @filters = filters
       end
 
       def call
@@ -19,7 +18,7 @@ module SpreeCmCommissioner
       private
 
       def headers
-        columns.map { |col| col.titleize(keep_id_suffix: true) }.uniq
+        columns.map(&:humanize).uniq
       end
 
       def build_row(guest)
@@ -29,8 +28,10 @@ module SpreeCmCommissioner
       def fetch_value(guest, column)
         if guest_field?(column)
           fetch_guest_value(guest, column)
-        else
+        elsif option_type_field?(column)
           fetch_option_value(guest, column)
+        else
+          ''
         end
       end
 
@@ -38,21 +39,19 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::KycBitwise::ORDERED_BIT_FIELDS.include?(column.to_sym)
       end
 
+      def option_type_field?(column)
+        Spree::OptionType.exists?(name: column)
+      end
+
       def fetch_guest_value(guest, column)
         column_mappings(guest)[column] || ''
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      def fetch_option_value(guest, column_name)
-        return guest.formatted_bib_number if column_name == 'bib-prefix'
-        return guest.line_item&.number if column_name == 'item_id'
-        return guest.line_item&.order&.number if column_name == 'order_id'
-        return guest.created_at if column_name == 'created_at'
-        return guest.updated_at if column_name == 'updated_at'
+      def fetch_option_value(guest, option_type_name)
+        return guest.formatted_bib_number if option_type_name == 'bib-prefix'
 
-        guest.line_item&.variant&.find_option_value_name_for(option_type_name: column_name) || ''
+        guest.line_item&.variant&.find_option_value_name_for(option_type_name: option_type_name)
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def column_mappings(guest)
         {
@@ -78,19 +77,12 @@ module SpreeCmCommissioner
       end
 
       def guests_with_associations
-        scope = event.guests.includes(
+        event.guests.includes(
           :occupation,
           :nationality,
           :id_card,
           line_item: { variant: { option_values: :option_type } }
-        ).complete
-        scope = scope.where('cm_guests.created_at >= ?', formatted_date_time(filters[:from_date])) if filters[:from_date].present?
-        scope = scope.where('cm_guests.created_at <= ?', formatted_date_time(filters[:to_date])) if filters[:to_date].present?
-        scope
-      end
-
-      def formatted_date_time(date)
-        Time.zone.parse(date.to_s).strftime('%Y-%m-%d %H:%M:%S %z')
+        )
       end
 
       def event

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? %>