spree_cm_commissioner 1.9.2 → 1.10.0.pre.pre

data/app/models/spree_cm_commissioner/stock/availability_checker.rb

@@ -1,47 +1,49 @@
 module SpreeCmCommissioner
   module Stock
     class AvailabilityChecker
-      attr_reader :variant, :error_message
+      attr_reader :variant, :options, :error_message
 
-      def initialize(variant)
+      def initialize(variant, options = {})
         @variant = variant
+        @options = options
         @error_message = nil
       end
 
-      def can_supply?(quantity = 1, options = {})
+      def can_supply?(quantity = 1)
         return false unless variant.available?
         return true unless variant.should_track_inventory?
         return true if variant.backorderable?
         return true if variant.need_confirmation?
 
-        # when delivery required, shipment will dynamically add / remove unit from stock item.
-        # so we can directly check can_supply with stock items directly.
-        return variant.stock_items.sum(:count_on_hand) >= quantity if variant.delivery_required?
+        variant_available?(quantity)
+      end
 
-        if variant.permanent_stock?
-          permanent_stock_variant_available?(quantity, options)
-        else
-          variant_available?(quantity, options)
+      def variant_available?(quantity = 1)
+        return false if cached_inventory_items.empty?
+
+        cached_inventory_items.all? do |cached_inventory_item|
+          cached_inventory_item.active? && cached_inventory_item.quantity_available >= quantity
         end
       end
 
-      def variant_available?(quantity = 1, options = {})
-        query = SpreeCmCommissioner::VariantAvailability::NonPermanentStockQuery.new(
-          variant: variant,
-          except_line_item_id: options[:except_line_item_id]
-        )
-        result = query.available?(quantity)
-        @error_message = query.error_message unless result
-        result
+      def cached_inventory_items
+        return @cached_inventory_items if defined?(@cached_inventory_items)
+
+        if variant.permanent_stock?
+          return [] if options[:from_date].blank? || options[:to_date].blank?
+
+          @cached_inventory_items = builder_klass.new(
+            variant_id: variant.id,
+            from_date: options[:from_date].to_date,
+            to_date: options[:to_date].to_date
+          ).call
+        else
+          @cached_inventory_items = builder_klass.new(variant_id: variant.id).call
+        end
       end
 
-      def permanent_stock_variant_available?(quantity = 1, options = {})
-        SpreeCmCommissioner::VariantAvailability::PermanentStockQuery.new(
-          variant: variant,
-          from_date: options[:from_date].to_date,
-          to_date: options[:to_date].to_date,
-          except_line_item_id: options[:except_line_item_id]
-        ).available?(quantity)
+      def builder_klass
+        ::SpreeCmCommissioner::RedisStock::VariantCachedInventoryItemsBuilder
       end
     end
   end

data/app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb

@@ -3,7 +3,8 @@ module SpreeCmCommissioner
     module AvailabilityValidatorDecorator
       # override
       def item_available?(line_item, quantity)
-        SpreeCmCommissioner::Stock::LineItemAvailabilityChecker.new(line_item).can_supply?(quantity)
+        SpreeCmCommissioner::Stock::LineItemAvailabilityChecker.new(line_item)
+                                                               .can_supply?(quantity)
       end
     end
   end

data/app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb

@@ -8,14 +8,14 @@ module SpreeCmCommissioner
       end
 
       def can_supply?(quantity)
-        AvailabilityChecker.new(line_item.variant).can_supply?(quantity, options)
+        ::SpreeCmCommissioner::Stock::AvailabilityChecker.new(line_item.variant, options)
+                                                         .can_supply?(quantity)
       end
 
       def options
         {
           from_date: line_item.from_date,
-          to_date: line_item.to_date,
-          except_line_item_id: line_item.id
+          to_date: line_item.to_date
         }
       end
     end

data/app/models/spree_cm_commissioner/stock/order_availability_checker.rb

@@ -0,0 +1,44 @@
+# On top of SpreeCmCommissioner::Stock::AvailabilityChecker, this class does the same thing but in bulk check with redis.
+# Which mean, it check basic condition with db first, once pass, it check with redis.
+module SpreeCmCommissioner
+  module Stock
+    class OrderAvailabilityChecker
+      attr_reader :order
+
+      def initialize(order)
+        @order = order
+      end
+
+      def can_supply_all?
+        insufficient_stock_lines.empty?
+      end
+
+      def insufficient_stock_lines
+        cached_inventory_items_group_by_line_item_id.map do |line_item_id, cached_inventory_items|
+          line_item = order.line_items.find { |item| item.id == line_item_id }
+          line_item unless sufficient_stock_for?(line_item, cached_inventory_items)
+        end.compact
+      end
+
+      # {
+      #   1: [ {inventory_key: "inventory:1", active: true, quantity_available: 5, inventory_item_id: 1, variant_id: 1}],
+      #   2: [ {inventory_key: "inventory:2", active: true, quantity_available: 5, inventory_item_id: 2, variant_id: 2}],
+      # }
+      def cached_inventory_items_group_by_line_item_id
+        @cached_inventory_items_group_by_line_item_id ||=
+          ::SpreeCmCommissioner::RedisStock::LineItemsCachedInventoryItemsBuilder.new(
+            line_item_ids: order.line_items.pluck(:id)
+          ).call
+      end
+
+      def sufficient_stock_for?(line_item, cached_inventory_items)
+        return false unless line_item.variant.available?
+        return true unless line_item.variant.should_track_inventory?
+        return true if line_item.variant.backorderable?
+        return true if line_item.variant.need_confirmation?
+
+        cached_inventory_items.all? { |item| item.active? && item.quantity_available >= line_item.quantity }
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/stock_movement_decorator.rb

@@ -0,0 +1,34 @@
+module SpreeCmCommissioner
+  module StockMovementDecorator
+    def self.prepended(base)
+      base.after_create :adjust_inventory_items, if: -> { stock_item.should_track_inventory? }
+    end
+
+    def adjust_inventory_items
+      if !variant.permanent_stock? && !variant.default_inventory_item_exist?
+        variant.create_default_non_permanent_inventory_item!
+      else
+        adjust_existing_inventory_items!
+      end
+    end
+
+    private
+
+    def should_create_default_non_permanent_inventory_item?
+      return false if variant.permanent_stock?
+      return false if variant.inventory_items.exists?(inventory_date: nil)
+
+      true
+    end
+
+    def adjust_existing_inventory_items!
+      variant.inventory_items.active.find_each(batch_size: 100) do |inventory_item|
+        inventory_item.adjust_quantity!(quantity)
+      end
+    end
+  end
+end
+
+unless Spree::StockMovement.included_modules.include?(SpreeCmCommissioner::StockMovementDecorator)
+  Spree::StockMovement.prepend(SpreeCmCommissioner::StockMovementDecorator)
+end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -46,7 +46,8 @@ module SpreeCmCommissioner
       base.before_save :set_kind
       base.before_save :set_slug
 
-      base.whitelisted_ransackable_attributes |= %w[kind]
+      base.whitelisted_ransackable_associations |= %w[vendor]
+      base.whitelisted_ransackable_attributes |= %w[kind from_date to_date]
 
       base.enum purchasable_on: { both: 0, web: 1, app: 2 }
       base.has_many :crew_invites, class_name: 'SpreeCmCommissioner::CrewInvite', dependent: :destroy

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -1,7 +1,7 @@
 # rubocop:disable Metrics/MethodLength
 module SpreeCmCommissioner
   module UserDecorator
-    def self.prepended(base)
+    def self.prepended(base) # rubocop:disable Metrics/AbcSize
       base.include SpreeCmCommissioner::UserNotification
       base.include SpreeCmCommissioner::UserIdentity
       base.include SpreeCmCommissioner::UserPreference
@@ -18,6 +18,10 @@ module SpreeCmCommissioner
       base.has_many :events, through: :user_events, class_name: 'Spree::Taxon', source: 'taxon'
       base.has_many :guests, class_name: 'SpreeCmCommissioner::Guest', dependent: :destroy
 
+      base.has_many :google_user_identity_providers,
+                    -> { where(identity_type: :google) },
+                    class_name: 'SpreeCmCommissioner::UserIdentityProvider'
+
       base.has_many :wished_items, class_name: 'Spree::WishedItem', through: :wishlists
       base.has_many :promotions, through: :promotion_rules, class_name: 'Spree::Promotion'
 

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   module VariantDecorator
     def self.prepended(base)
+      base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
 
@@ -21,7 +22,12 @@ module SpreeCmCommissioner
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
+      base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
+
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
+      base.scope :with_permanent_stock, -> { joins(:product).where(product: { product_type: base::PERMANENT_STOCK_PRODUCT_TYPES }) }
+      base.scope :with_non_permanent_stock, -> { joins(:product).where.not(product: { product_type: base::PERMANENT_STOCK_PRODUCT_TYPES }) }
+
       base.has_one :trip,
                    class_name: 'SpreeCmCommissioner::Trip'
       base.accepts_nested_attributes_for :option_values
@@ -41,14 +47,26 @@ module SpreeCmCommissioner
       super || product.discontinued?
     end
 
-    def permanent_stock?
-      accommodation?
-    end
-
     def event
       taxons.event.first
     end
 
+    def default_inventory_item_exist?
+      inventory_items.exists?(inventory_date: nil)
+    end
+
+    def create_default_non_permanent_inventory_item!(quantity_available: nil, max_capacity: nil)
+      return if product_type.blank? # handle in case product not exist for variant.
+      return unless should_track_inventory?
+      return if default_inventory_item_exist?
+
+      inventory_items.create!(
+        product_type: product_type,
+        quantity_available: [0, quantity_available || total_on_hand].max,
+        max_capacity: [0, max_capacity || total_on_hand].max
+      )
+    end
+
     # override
     def options_text
       @options_text ||= Spree::Variants::VisableOptionsPresenter.new(self).to_sentence
@@ -69,23 +87,12 @@ module SpreeCmCommissioner
     end
 
     # override
-    def in_stock?
-      available_quantity.positive?
+    def in_stock?(options = {})
+      SpreeCmCommissioner::Stock::AvailabilityChecker.new(self, options).can_supply?
     end
 
     private
 
-    def total_purchases
-      Spree::LineItem.complete.where(variant_id: id).sum(:quantity).to_i
-    end
-
-    def available_quantity
-      stock_count = stock_items.sum(&:count_on_hand)
-      return stock_count if delivery_required?
-
-      stock_count - total_purchases
-    end
-
     def update_vendor_price
       return unless vendor.present? && product&.product_type == vendor&.primary_product_type
 

data/app/overrides/spree/admin/prototypes/_form/description.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_before "[id=properties]" -->
+
+<div id="description" class="field mb-3">
+  <%= f.label :description, Spree.t(:description) %><br>
+  <%= f.text_area :description, rows: 5, class: 'form-control' %>
+</div>

data/app/overrides/spree/admin/prototypes/_form/icon.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_bottom "[data-hook='admin_prototype_form_fields']" -->
+
+<div id='icon'>
+  <%= f.field_container :icon do %>
+    <%= f.label :preferred_icon, Spree.t(:icon_name) %> <%= link_to Spree.t(:icons), spree.admin_vectors_icons_url %>
+    <%= f.select :preferred_icon, @icons.map(&:path), { include_blank: Spree.t(:None) }, { class: "select2" } %>
+  <% end %>
+</div>

data/app/overrides/spree/admin/prototypes/_form/product_type.html.erb.deface

@@ -1,3 +1,3 @@
-<!-- insert_bottom "[data-hook='admin_prototype_form_fields']" -->
+<!-- insert_bottom "#taxons" -->
 
-<%= render 'shared/product_type_field', field: :product_type, f: f %>
+<%= render 'shared/product_type_field', field: :product_type, f: f %>

data/app/overrides/spree/admin/shared/sub_menu/_product/events_tab.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_bottom "[data-hook='admin_product_sub_tabs']" -->
+
+<%= tab :events, match_path: '/events', label: 'Events' if can? :manage, Spree::Taxon %>

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(:state_id).value(:integer)
+      required(:number_of_adults).value(:integer)
+      required(:number_of_kids).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(:number_of_adults).value(:integer)
+      required(:number_of_kids).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/tenant/payment_method_serializer.rb

@@ -7,6 +7,18 @@ module Spree
         attribute :preferences do |object|
           object.public_preferences.as_json
         end
+
+        attribute :icon_name do |payment_method|
+          return nil if payment_method.preferences.blank?
+
+          payment_method.preferences[:icon_name]
+        end
+
+        attribute :payment_option do |payment_method|
+          pref = payment_method.preferences
+
+          pref.blank? || pref[:payment_option].blank? ? payment_method.method_type : pref[:payment_option]
+        end
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Spree
   module V2
     module Tenant
       class UserSerializer < BaseSerializer
-        attributes :email, :first_name, :last_name, :gender,
+        attributes :email, :first_name, :last_name, :gender, :dob,
                    :public_metadata, :completed_orders,
                    :phone_number, :intel_phone_number, :country_code,
                    :otp_enabled, :otp_email, :otp_phone_number,

data/app/views/spree/admin/events/_search_form.html.erb

@@ -0,0 +1,61 @@
+<% content_for :table_filter do %>
+  <%= search_form_for [:admin, @search], url: admin_events_path do |f| %>
+    <div class="row">
+
+      <div class="date-range-filter col-12 col-lg-8">
+        <div class="form-group">
+          <%= label_tag :q_from_date_gt, Spree.t(:date_range) %>
+          <div class="row pb-0">
+            <div class="col-12 col-md-6 mb-3 mb-md-0">
+              <div class="input-group datePickerFrom"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-max-date="<%= params[:q][:from_date_lt] %>">
+                <%= f.text_field :from_date_gt,
+                  class: 'form-control js-filterable',
+                    value: params[:q][:from_date_gt],
+                    placeholder: Spree.t(:starting_from),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+              </div>
+            </div>
+            <div class="col-12 col-md-6 mt-3 mt-md-0">
+              <div class="input-group datePickerTo"
+                   data-wrap="true"
+                   data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                   data-min-date="<%= params[:q][:from_date_gt] %>">
+
+                <%= f.text_field :from_date_lt,
+                  class: 'form-control js-filterable',
+                    value: params[:q][:from_date_lt],
+                    placeholder: Spree.t(:ending_at),
+                    'data-input':'' %>
+                <%= render partial: 'spree/admin/shared/cal_close' %>
+                </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="col-md-6">
+        <div class="form-group">
+          <%= label_tag :q_name_cont, "Event Name" %>
+          <%= f.text_field :name_cont, class: "form-control js-quick-search-target js-filterable" %>
+        </div>
+      </div>
+
+      <div class="col-md-6">
+        <div class="form-group">
+          <%= label_tag :q_vendor_name_cont, "Vendor" %>
+          <%= f.text_field :vendor_name_cont, class: "form-control js-quick-search-target js-filterable" %>
+        </div>
+      </div>
+
+
+    </div>
+    <div class="form-actions">
+      <%= button Spree.t(:filter_results), 'search' %>
+      <%= link_to Spree.t(:clear_filters), admin_events_path(q: {}), class: "btn btn-secondary" %>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/admin/events/_tab.html.erb

@@ -0,0 +1,25 @@
+<% content_for :page_tabs do %>
+  <li class="nav-item">
+    <%= link_to 'All',
+    admin_events_path,
+    class: "nav-link #{'active' if params[:q][:status_eq].blank? }" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'calendar.svg',
+      Spree.t(:"admin.events.upcoming"),
+      admin_events_path(q: { from_date_gt: Date.today, status_eq: 'Upcoming' }),
+      class: "nav-link #{'active' if params[:q][:status_eq] == 'Upcoming'}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'clock.svg',
+      Spree.t(:"admin.events.happening"),
+      admin_events_path(q: { from_date_lteq: Date.today, to_date_gteq: Date.today, status_eq: 'Happening' }),
+      class: "nav-link #{'active' if params[:q][:status_eq] == 'Happening'}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'clock.svg',
+      Spree.t(:"admin.events.past"),
+      admin_events_path(q: { to_date_lt: Date.today, status_eq: 'Past' }),
+      class: "nav-link #{'active' if params[:q][:status_eq] == 'Past'}" %>
+  </li>
+<% end %>

data/app/views/spree/admin/events/_table.html.erb

@@ -0,0 +1,27 @@
+<div class="table-responsive border rounded bg-white mb-4">
+  <table class="table " id="listing_products">
+    <thead class="text-muted">
+      <tr data-hook="admin_products_index_headers">
+        <th><%= sort_link @search,:name, Spree.t(:name), { default_order: "asc" } %></th>
+        <th class="col-2">Vendor</th>
+        <th><%= sort_link @search,:from_date, Spree.t(:from_date), { default_order: "asc" } %></th>
+        <th><%= sort_link @search,:to_date, Spree.t(:to_date), { default_order: "asc" } %></th>
+        <th class="col-1 text-center" data-hook="admin_event_header_actions">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @taxons.each do |taxon| %>
+        <tr>
+          <td class="col-4 align-middle"><%= taxon.name %></td>
+          <td class="col-2 align-middle"><%= taxon.vendor.name if taxon.vendor.present? %></td>
+          <td class="col-2 align-middle"><%= taxon.from_date %></td>
+          <td class="col-2 align-middle"><%= taxon.to_date %></td>
+          <td class="col-1 align-middle text-center" data-hook="admin_products_index_row_actions">
+            <%= link_to_edit taxon.id, url: edit_admin_taxonomy_taxon_url(taxon.taxonomy.id, taxon.id), no_text: true if can?(:edit, taxon) %>
+            <%= link_to_delete taxon.id, url: admin_taxonomy_taxon_url(taxon.taxonomy.id, taxon.id), no_text: true if can?(:delete, taxon) %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -0,0 +1,15 @@
+<%= content_for :page_title do %>
+   <%= Spree.t(:Events) %>
+<% end %>
+
+<%= content_for :page_actions do %>
+  <%= button_link_to Spree.t(:new_event), new_admin_taxonomy_taxon_path(@taxonomy.id) , class: "btn btn-success", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
+<% end %>
+
+<%= render 'tab' %>
+
+<%= render 'search_form' %>
+
+<%= render 'table' %>
+
+<%= paginate @taxons, theme: 'admin-twitter-bootstrap-4', params: {taxon_id: params[:taxon_id] } %>

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

@@ -0,0 +1,17 @@
+<div>
+  <% events.each do |event| %>
+    <div>
+      <h6><%= event.options[:inventory_item].variant.options_text %></h6>
+      <ul class="list-group mt-1">
+        <li class="list-group-item d-flex justify-content-between align-items-center">
+          Max capacity
+          <span class="badge badge-primary badge-pill"><%= event.options[: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"><%= event.options[:inventory_item].quantity_available %></span>
+        </li>
+      </ul>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,32 @@
+<%= 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' %>"
+            type="button"
+            tabindex="0"
+            data-toggle="popover"
+            data-trigger="hover"
+            data-placement="right"
+            data-html="true"
+            data-content="<%= raw render_escape_html partial: "events_popover", locals: { events: events } if events.any? %>">
+            <%= date.day %>
+            <ul class="p-0 m-0 list-unstyled">
+              <% events.each do |event| %>
+              <li class="badge badge-warning">
+                <%= event.options[:inventory_item].quantity_available %>
+              </li>
+              <% end %>
+            </ul>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -19,10 +19,7 @@
       <% @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 %>
@@ -35,14 +32,37 @@
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
+
+            <% if defined?(@reserved_stocks) %>
+              <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: "cart-check.svg", width: '14', height: '14' %>
+                </span>
+                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
+              </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" %>
+                </div>
+              <% end %>
+            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -53,3 +73,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? %>