spree_cm_commissioner 2.5.1 → 2.5.2.pre.pre1

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

@@ -1,9 +1,50 @@
 <%= 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="flex-wrap gap-3 mt-4 d-flex align-items-center justify-content-between">
+    <%= form_with url: admin_product_stock_managements_path, method: :get, class: "d-flex flex-wrap align-items-center gap-2" do |f| %>
+      <%= select_year(params[:year]&.to_i || @year, { start_year: 2025, end_year: @year + 3 }, { class: 'form-control', style: "width: auto;", name: "year", onchange: "this.form.submit()" }) %>
+      <%= f.select :selected_variant_id, 
+        options_for_select([["All Variants", ""]] + @variants.map { |v| [v.options_text.presence || "N/A", v.id] }, params[:selected_variant_id]), {},
+        { class: "form-control", style: "width: auto;", onchange: "this.form.submit()" } %>
+    <% end %>
 
-  <div class="c-annual-calendar-container mt-2">
+    <div id="bulkActionsBar" class="flex-wrap gap-2 align-items-center" style="display:none;">
+      <button class="btn btn-primary" 
+              onclick="setModalUrl('prices')"
+              data-toggle="modal" 
+              data-target="#inventoryItemModal">
+        <%= svg_icon name: "money.svg", width: '18', height: '18' %>
+        <span class="ml-1">Bulk Update Prices</span>
+      </button>
+      <button class="btn btn-success" 
+              onclick="setModalUrl('stocks')"
+              data-toggle="modal" 
+              data-target="#inventoryItemModal">
+        <%= svg_icon name: "box-seam.svg", width: '18', height: '18' %>
+        <span class="ml-1">Bulk Update Stocks</span>
+      </button>
+      <button class="btn btn-outline-secondary" onclick="clearSelection()">
+        Clear (<span id="selectedCount">0</span>)
+      </button>
+    </div>
+  </div>
+
+  <style>
+    .gap-2 {
+      gap: 0.5rem;
+    }
+    
+    .gap-3 {
+      gap: 1rem;
+    }
+    
+    .day-selected {
+      background-color: #e3f2fd !important;
+      border: 2px solid #2196F3 !important;
+      box-shadow: 0 2px 4px rgba(33, 150, 243, 0.2);
+    }
+  </style>
+
+  <div class="mt-2 c-annual-calendar-container">
     <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| %>
@@ -20,10 +61,8 @@
                 <% 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) %>')">
+                    data-variant-id="<%= inventory_item.variant_id %>"
+                    data-inventory-id="<%= inventory_item.id %>">
                     <%= inventory_item.quantity_available %>
                     <%= inventory_item.prices.first.display_amount if inventory_item.prices.any? %>
                 </li>
@@ -46,11 +85,65 @@
   </div>
 
   <script>
-    function updateModalTurboFrameSrc(url) {
+    let selectedInventoryIds = new Set();
+
+    // Use event delegation for day clicks - works after Turbo updates
+    document.addEventListener('click', function(e) {
+      const dayElement = e.target.closest('.c-annual-day');
+      if (dayElement) {
+        handleDayClick(e, dayElement);
+      }
+    });
+
+    function handleDayClick(event, dayElement) {
+      event.preventDefault();
+      event.stopPropagation();
+
+      const badges = dayElement.querySelectorAll('.badge[data-inventory-id]');
+      const inventoryIds = Array.from(badges).map(b => b.getAttribute('data-inventory-id'));
+
+      if (inventoryIds.length === 0) return;
+
+      const allSelected = inventoryIds.every(id => selectedInventoryIds.has(id));
+
+      if (allSelected) {
+        // Deselect
+        inventoryIds.forEach(id => selectedInventoryIds.delete(id));
+        dayElement.parentElement.classList.remove('day-selected');
+        updateBulkButton();
+      } else {
+        // Select
+        inventoryIds.forEach(id => selectedInventoryIds.add(id));
+        dayElement.parentElement.classList.add('day-selected');
+        updateBulkButton();
+      }
+
+      return false;
+    }
+
+    function updateBulkButton() {
+      const count = selectedInventoryIds.size;
+      document.getElementById('selectedCount').textContent = count;
+      const bar = document.getElementById('bulkActionsBar');
+      bar.style.display = count > 0 ? 'flex' : 'none';
+    }
+
+    function clearSelection() {
+      selectedInventoryIds.clear();
+      document.querySelectorAll('.day-selected').forEach(element => {
+        element.classList.remove('day-selected');
+      });
+      updateBulkButton();
+    }
+
+    function setModalUrl(type) {
+      const ids = Array.from(selectedInventoryIds).join(',');
+      const url = type === 'prices' 
+        ? '<%= prices_admin_product_inventory_items_path(@product) %>?inventory_ids=' + ids
+        : '<%= stocks_admin_product_inventory_items_path(@product) %>?inventory_ids=' + ids;
       let frame = document.getElementById('inventory_item');
-      frame.src = null;
-      frame.innerHTML = `<div class="spinner-border mt-2" role="status"></div>`;
-      frame.src = url
+      frame.innerHTML = `<div class="mt-2 spinner-border" role="status"></div>`;
+      frame.setAttribute('src', url);
     }
   </script>
 <% end %>

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

@@ -2,23 +2,24 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
 
 <% if false && can?(:create, Spree::StockMovement) %>
-  <div id="add_stock_form" class="card mb-3">
+  <div id="add_stock_form" class="mb-3 card">
     <%= render 'add_stock_form' %>
   </div>
 <% end %>
 
-<div class="table-responsive border rounded bg-white">
+<div class="bg-white border rounded table-responsive">
   <table class="table" id="listing_product_stock">
     <thead class="text-muted">
       <tr data-hook="admin_product_stock_management_index_headers">
         <th colspan="2"><%= Spree.t(:variant) %></th>
         <th colspan="3"><%= Spree.t(:stock) %></th>
+        <th colspan="2"><%= Spree.t(:price) %></th>
       </tr>
     </thead>
     <tbody>
       <% @variants.each do |variant| %>
         <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
-          <td class="image text-center">
+          <td class="text-center image">
             <%= small_image(variant) %>
           </td>
           <td>
@@ -40,7 +41,7 @@
               <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_variant_inventory_items_path(@product.id, variant.id),
+                <%= link_to_with_icon('capture.svg', "Create Inventory Item", admin_product_inventory_items_path(@product.slug, variant_id: variant.id),
                   method: :post,
                   remote: false,
                   class: 'icon_link btn btn-sm btn-outline-primary ml-2',
@@ -77,7 +78,7 @@
                     <% 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),
+                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_inventory_item_path(@product.slug, inventory_item.id),
                     method: :patch,
                     remote: false,
                     class: 'icon_link btn btn-sm outline text-dark',
@@ -87,18 +88,18 @@
               <% end %>
             <% end %>
           </td>
-
           <td colspan="3" class="stock_location_info">
             <%= render partial: 'variant_stock_items', locals: { variant: variant } if variant.vendor.stock_locations.any? %>
           </td>
+          <td><%= variant.display_price %></td>
         </tr>
       <% end %>
     </tbody>
   </table>
 </div>
 
-<%= turbo_frame_tag "calendar", src: calendar_admin_product_stock_managements_path(@product.id, year: params[:year]) do %>
-  <div class="spinner-border mt-2" role="status">
+<%= turbo_frame_tag "calendar", src: calendar_admin_product_stock_managements_path(@product.slug, year: params[:year], selected_variant_id: params[:selected_variant_id]) do %>
+  <div class="mt-2 spinner-border" role="status">
     <span class="sr-only">Loading...</span>
   </div>
 <% end if @product.permanent_stock? %>

data/app/views/spree/transit/trip_stops/index.html.erb

@@ -9,7 +9,8 @@
         <tr data-hook="option_header">
           <th class="no-border handel-head"></th>
           <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:stop_type) %></th>
+          <th><%= Spree.t(:allow_boarding) %></th>
+          <th><%= Spree.t(:allow_drop_off) %></th>
           <th><%= Spree.t(:sequence) %></th>
           <th><%= Spree.t(:created_at) %></th>
         </tr>
@@ -21,7 +22,8 @@
               <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
             </td>
             <td><%= stop.stop_name %></td>
-            <td> <%= stop.stop_type %></td>
+            <td> <%= stop.allow_boarding ? 'Yes' : 'No' %></td>
+	           <td> <%= stop.allow_drop_off ? 'Yes' : 'No' %></td>
             <td> <%= stop.sequence %></td>
             <td> <%= stop.created_at.to_date %></td>
           </tr>

data/app/views/spree_cm_commissioner/guest_mailer/send_ticket_to_guest.html.erb

@@ -151,7 +151,6 @@
             <% @trip.trip_stops.order(:sequence).each do |stop| %>
               <tr>
                 <td>
-                  <span class="stop-type <%= stop.stop_type %>"><%= stop.stop_type.to_s.titleize %></span>
                   <div class="stop-name"><strong><%= stop.stop_name %></strong></div>
                   <% if stop.respond_to?(:location_place) && stop.location_place.present? %>
                     <% if stop.location_place.respond_to?(:address) && stop.location_place.address.present? %>

data/config/initializers/spree_permitted_attributes.rb

@@ -1,5 +1,8 @@
 module Spree
   module PermittedAttributes
+    ATTRIBUTES << :route_attributes unless ATTRIBUTES.include?(:route_attributes)
+    mattr_reader :route_attributes
+
     @@vendor_attributes << :logo
 
     # Permitted all guest attributes for now as permitting only some guest attributes is not working by design
@@ -86,5 +89,13 @@ module Spree
       originator_type
       originator_id
     ]
+
+    @@route_attributes = %i[
+      route_name
+      short_name
+      vendor_id
+      route_type
+      route_stops
+    ]
   end
 end

data/config/routes.rb

@@ -149,13 +149,12 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :variants do
-        resources :inventory_items, only: %i[show create] do
-          member do
-            patch :reset
-            patch :update_prices
-            delete :delete_prices
-          end
+      resources :inventory_items, only: [] do
+        collection do
+          get :prices
+          get :stocks
+          patch :bulk_update_prices
+          patch :bulk_update_stocks
         end
       end
 
@@ -560,6 +559,12 @@ Spree::Core::Engine.add_routes do
         resources :trip_places, only: :index
         resources :trip_search, only: [:index]
         resources :trips, only: %i[show]
+        resources :popular_route_places, only: [:index]
+        resources :routes, only: [:index]
+
+        namespace :transit do
+          resources :draft_orders, only: %i[create]
+        end
 
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]

data/db/migrate/20251224033103_migrate_cm_routes_to_cm_route_metrics.rb

@@ -0,0 +1,17 @@
+class MigrateCmRoutesToCmRouteMetrics < ActiveRecord::Migration[7.0]
+  def change
+    # 1. Rename cm_routes which we use to track order, trip count to cm_route_metrics instead.
+    remove_index :cm_routes, [:origin_place_id, :destination_place_id] if index_exists?(:cm_routes, [:origin_place_id, :destination_place_id])
+    rename_table :cm_routes, :cm_route_metrics unless table_exists?(:cm_route_metrics)
+    add_column :cm_route_metrics, :route_type, :integer, default: 0, null: false unless column_exists?(:cm_route_metrics, :route_type)
+
+    # 2. Drop the old index before renaming table to avoid index name length issues & re-add the index with a shorter name
+    unless index_exists?(:cm_route_metrics, [:route_type, :origin_place_id, :destination_place_id], name: 'index_cm_route_metrics_on_origin_dest')
+      add_index :cm_route_metrics, [:route_type, :origin_place_id, :destination_place_id], unique: true, name: 'index_cm_route_metrics_on_origin_dest'
+    end
+
+    # 3. Remove old route_id column from trips.
+    # it has route_metrics value, and trip don't need to have association with metric directly.
+    remove_column :cm_trips, :route_id if column_exists?(:cm_trips, :route_id)
+  end
+end

data/db/migrate/20251224033910_migrate_cm_vendor_routes_to_cm_routes.rb

@@ -0,0 +1,30 @@
+class MigrateCmVendorRoutesToCmRoutes < ActiveRecord::Migration[7.0]
+  def change
+    # 1. Remove cm_vendor_routes and add cm_routes instead for routes that associated with vendor.
+    drop_table :cm_vendor_routes, if_exists: true
+    create_table :cm_routes, if_not_exists: true do |t|
+      t.string :route_name
+      t.string :short_name
+      t.integer :order_count
+      t.integer :fulfilled_order_count
+      t.integer :route_type
+      t.jsonb :route_stops, default: "[]"
+      t.references :vendor, foreign_key: { to_table: :spree_vendors }, null: false
+      t.references :tenant, foreign_key: { to_table: :cm_tenants }, null: true
+
+      t.references :origin_place, foreign_key: { to_table: :cm_places }, null: false
+      t.references :destination_place, foreign_key: { to_table: :cm_places }, null: false
+
+      t.integer :lock_version, default: 0, null: false
+      t.timestamps
+    end
+
+    # 2. Add indexes for popular_routes association (vendor_id + order by fulfilled_order_count, order_count)
+    add_index :cm_routes, [:vendor_id, :route_type, :fulfilled_order_count, :order_count],
+              order: { fulfilled_order_count: :desc, order_count: :desc },
+              name: 'index_cm_routes_on_vendor_id_route_type_and_popular' unless index_exists?(:cm_routes, [:vendor_id, :route_type, :fulfilled_order_count, :order_count])
+
+    # 3. Add new route reference to cm_trips
+    add_reference :cm_trips, :route, foreign_key: { to_table: :cm_routes }, null: true unless column_exists?(:cm_trips, :route_id)
+  end
+end

data/db/migrate/20260105072450_migrate_cm_trip_stops_to_support_trip_connection.rb

@@ -0,0 +1,12 @@
+class MigrateCmTripStopsToSupportTripConnection < ActiveRecord::Migration[7.0]
+  def change
+    # 1. Replace stop_type with allow_boarding & allow_drop_off instead, it is more flexible.
+    # Useful for middle stops where both boarding & drop off can be allowed or both can be disallowed.
+    remove_column :cm_trip_stops, :stop_type if column_exists?(:cm_trip_stops, :stop_type)
+    add_column :cm_trip_stops, :allow_boarding, :boolean unless column_exists?(:cm_trip_stops, :allow_boarding)
+    add_column :cm_trip_stops, :allow_drop_off, :boolean unless column_exists?(:cm_trip_stops, :allow_drop_off)
+
+    # 2. Add references to link trip stops to trips for boarding, this will enable trip connections. Where current trip is main trip.
+    add_reference :cm_trip_stops, :board_to_trip, foreign_key: { to_table: :cm_trips }, null: true unless column_exists?(:cm_trip_stops, :board_to_trip_id)
+  end
+end

data/db/migrate/20260108101406_add_allow_booking_to_cm_trips.rb

@@ -0,0 +1,5 @@
+class AddAllowBookingToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_trips, :allow_booking, :boolean, default: true, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/route_factory.rb

@@ -1,10 +1,11 @@
 FactoryBot.define do
-  factory :cm_route, class: 'SpreeCmCommissioner::Route' do
+  factory :cm_route, class: SpreeCmCommissioner::Route do
+    association :vendor, factory: :vendor
+    association :tenant, factory: :cm_tenant
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
+
     sequence(:route_name) { |n| "Route #{n}" }
-    origin_place_id { create(:cm_place).id }
-    destination_place_id { create(:cm_place).id }
-    trip_count { 0 }
-    order_count { 0 }
-    fulfilled_order_count { 0 }
+    sequence(:short_name) { |n| "R#{n}" }
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/route_metric_factory.rb

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :cm_route_metric, class: SpreeCmCommissioner::RouteMetric do
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
+
+    route_name { "#{origin_place.name} - #{destination_place.name}" } 
+    route_type { :bus }
+    trip_count { 0 }
+    order_count { 0 }
+    fulfilled_order_count { 0 }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/route_photo_factory.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :cm_route_photo, class: SpreeCmCommissioner::RoutePhoto do
+    attachment { Rack::Test::UploadedFile.new(SpreeMultiVendor::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg'), 'image/jpeg') }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb

@@ -11,7 +11,10 @@ FactoryBot.define do
     association :vehicle, factory: :cm_vehicle
     association :origin_place, factory: :cm_place
     association :destination_place, factory: :cm_place
-    association :route, factory: :cm_route
+
+    # Don't create route by default to avoid uniqueness conflicts
+    # Tests that need these should create them explicitly
+    route { nil }
   end
 
   factory :cm_trip_with_seat_counts, parent: :cm_trip do

data/lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb

@@ -4,7 +4,9 @@ FactoryBot.define do
     association :stop_place, factory: :cm_place
     association :location_place, factory: :cm_place
 
-    stop_type { :boarding }
+    allow_boarding { true }
+    allow_drop_off { true }
+
     stop_name { stop_place.name }
 
     arrival_time { Time.current }

data/lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :cm_transit_vendor, parent: :vendor do
+    from_email { FFaker::Internet.email } # required only when tenant exist.
     sequence(:name) { |n| "#{FFaker::Company.name} #{n}#{Kernel.rand(9999)}" }
     state { :active }
     primary_product_type { :transit }
@@ -7,6 +8,7 @@ FactoryBot.define do
 
   factory :cm_vendor, parent: :vendor do
     sequence(:name) { |n| "#{FFaker::Company.name} #{n}#{Kernel.rand(9999)}" }
+    from_email { FFaker::Internet.email } # required only when tenant exist.
     state { :active }
     default_state_id { Spree::State.first&.id }
     primary_product_type { :ecommerce }

data/lib/spree_cm_commissioner/test_helper/factories/vendor_place_factory.rb

@@ -7,6 +7,17 @@ FactoryBot.define do
     position  { FFaker::Number.number }
 
     place_type { :location }
+
+    transient do
+      place_name { nil }
+    end
+
+    before :create do |vendor_place, evaluator|
+      if evaluator.place_name.present?
+        vendor_place.place.name = evaluator.place_name
+        vendor_place.place.save!
+      end
+    end
   end
 
   factory :cm_vendor_place, class: SpreeCmCommissioner::VendorPlace do
@@ -30,5 +41,16 @@ FactoryBot.define do
       place_type { :location }
       location { nil }
     end
+
+    transient do
+      place_name { nil }
+    end
+
+    before :create do |vendor_place, evaluator|
+      if evaluator.place_name.present?
+        vendor_place.place.name = evaluator.place_name
+        vendor_place.place.save!
+      end
+    end
   end
 end

data/lib/spree_cm_commissioner/transit/route_stop.rb

@@ -0,0 +1,61 @@
+module SpreeCmCommissioner::Transit
+  class RouteStop
+    attr_accessor :location_id, :vendor_place_id, :type, :sequence, :vendor_place
+
+    STOP_TYPES = %i[branch stop].freeze
+
+    def initialize(options = {})
+      @location_id = options[:location_id]
+      @type = options[:type]&.to_sym
+      @sequence = options[:sequence]
+
+      # vendor place is either stop or branch
+      @vendor_place_id = options[:vendor_place_id]
+    end
+
+    def self.from_hash(hash)
+      hash = hash.symbolize_keys
+
+      new(
+        location_id: hash[:location_id],
+        vendor_place_id: hash[:vendor_place_id],
+        type: hash[:type],
+        sequence: hash[:sequence]
+      )
+    end
+
+    def to_h
+      {
+        location_id: @location_id,
+        vendor_place_id: @vendor_place_id,
+        type: @type,
+        sequence: @sequence
+      }
+    end
+
+    def branch?
+      @type == :branch
+    end
+
+    def stop?
+      @type == :stop
+    end
+
+    def valid?
+      errors.empty?
+    end
+
+    def errors
+      @errors ||= []
+      @errors.clear
+
+      @errors << 'location_id is required' if @location_id.blank?
+      @errors << 'vendor_place_id is required' if @vendor_place_id.blank?
+      @errors << 'type is required' if @type.blank?
+      @errors << 'type must be :branch or :stop' if @type.present? && STOP_TYPES.exclude?(@type)
+      @errors << 'sequence is required' if @sequence.nil?
+
+      @errors
+    end
+  end
+end