spree_delhivery 1.0.0

data/app/services/spree_delhivery/shipment_tracker.rb

@@ -0,0 +1,50 @@
+module SpreeDelhivery
+    class ShipmentTracker
+      # Simple result object pattern
+      Result = Struct.new(:success?, :status, :data)
+  
+      def initialize(shipment)
+        @shipment = shipment
+        @client = SpreeDelhivery::Client.new
+      end
+  
+      def call
+        unless @shipment.delhivery_waybill.present?
+          return Result.new(false, "No Waybill found for Shipment #{@shipment.number}")
+        end
+  
+        begin
+          response = @client.track_shipment(@shipment.delhivery_waybill)
+          
+          # Safe navigation to extract the Shipment object
+          # Delhivery structure: { "ShipmentData" => [ { "Shipment" => { ... } } ] }
+          shipment_data = response.dig('ShipmentData', 0, 'Shipment')
+  
+          if shipment_data.present?
+            # 1. Extract Status safely
+            # "Status" object contains keys like "Status", "StatusDateTime", "RecievedBy"
+            current_status = shipment_data.dig('Status', 'Status') || "Unknown"
+  
+            # 2. Update Database efficiently
+            # usage of update_columns avoids triggering callbacks/validations, which is preferred for background sync
+            @shipment.update_columns(
+              delhivery_response_data: shipment_data,
+              tracking_status: current_status
+            )
+  
+            Rails.logger.info "[Delhivery] Synced Shipment #{@shipment.number}: #{current_status}"
+            
+            return Result.new(true, current_status, shipment_data)
+          else
+            error_msg = "No Shipment Data found in Delhivery response"
+            Rails.logger.warn "[Delhivery] Tracking Failed for #{@shipment.number}: #{error_msg}"
+            return Result.new(false, error_msg)
+          end
+  
+        rescue StandardError => e
+          Rails.logger.error "[Delhivery] Exception tracking #{@shipment.number}: #{e.message}"
+          return Result.new(false, e.message)
+        end
+      end
+    end
+  end

data/app/views/spree/admin/fulfillments/new.html.erb

@@ -0,0 +1,118 @@
+<turbo-frame id="dialog">
+  <div>
+    <div class="dialog-header">
+      <h5 class="dialog-title">Ship Package</h5>
+      <button name="button" type="button" class="btn-close" data-action="dialog#close" data-dismiss="dialog" aria-label="Close"></button>
+    </div>
+
+    <%= form_with url: spree.admin_order_shipment_fulfillment_path(@order.number, @shipment.number), method: :post, data: { turbo_frame: "_top" } do |f| %>
+      <div class="dialog-body">
+        
+        <div class="alert badge-info mb-4">
+          <div>
+            <h5 class="font-bold mb-1" style="font-size: 0.95rem;">
+              <i class="ti ti-info-circle mr-1"></i> Shipment Notice
+            </h5>
+            You are preparing to generate a manifest and ship package <strong><%= @shipment.number %></strong>.
+          </div>
+        </div>
+
+        <%# LIVE PRICING SERVICE LEVEL DROPDOWN %>
+        <div class="form-group mb-4">
+          <label for="shipping_method_id" class="font-medium text-gray-900 mb-2 block">Shipping Service Level</label>
+          <select name="shipping_method_id" id="shipping_method_id" class="form-select w-full">
+            <% @available_methods.each do |method| %>
+              <option value="<%= method[:id] %>" <%= 'selected' if @shipment.selected_shipping_rate&.shipping_method_id == method[:id] %>>
+                <%= method[:name] %> (<%= method[:display_cost] %>)
+              </option>
+            <% end %>
+          </select>
+          <span class="form-text mt-2 text-xs text-gray-600">Changing this updates the customer's total to match the actual carrier rate.</span>
+        </div>
+
+        <%# LOGISTICS & DIMENSIONAL AUDIT BOX %>
+        <% if @integration.present? %>
+          <div class="mb-4 border border-gray-200 rounded-md bg-gray-50/70 p-4">
+            <div class="flex items-center gap-1.5 mb-3 border-b border-gray-200 pb-2">
+              <i class="ti ti-scale icon text-gray-700" style="font-size: 1.1rem;"></i>
+              <h6 class="text-sm font-semibold text-gray-900 m-0">Logistics & Dim Weight Verification</h6>
+            </div>
+
+            <div class="grid grid-cols-1 gap-y-2 text-sm mb-4">
+              
+              <div class="flex items-center justify-between">
+                <span class="text-muted">Catalog Store Weight:</span>
+                <span class="badge badge-balance_due border text-dark font-mono" style="font-size: 0.85rem;">
+                  <%= @shipment.line_items.sum { |li| (li.variant.weight || 0) * li.quantity }.round(2) %> <%= @weight_unit %>
+                </span>
+              </div>
+              
+              <div class="flex items-center justify-between">
+                <span class="text-muted">Delhivery Payload Weight:</span>
+                <span class="badge badge-balance_due border text-dark font-mono" style="font-size: 0.85rem;">
+                  <%= @weight_in_grams %> g
+                </span>
+              </div>
+              
+              <div class="flex items-center justify-between pt-1">
+                <span class="text-muted">Calculated Dimensions (L×W×H):</span>
+                <div class="flex items-center gap-2">
+                  <% if @dims_cm.any? { |d| d == 10.0 } %>
+                    <span class="badge badge-warning text-dark flex items-center" title="One or more items are using fallback defaults. Please review catalog metrics.">
+                      <i class="ti ti-alert-triangle mr-1"></i> Fallback Used
+                    </span>
+                  <% end %>
+                  <span class="badge badge-balance_due border text-dark font-mono" style="font-size: 0.85rem;">
+                    <%= @dims_cm[0] %> × <%= @dims_cm[1] %> × <%= @dims_cm[2] %> CM
+                  </span>
+                </div>
+              </div>
+
+            </div>
+
+            <%# Dynamic Packaging Selection Rule %>
+            <div class="form-group mb-0 pt-3 border-t border-gray-200">
+              <label for="delhivery_packaging_type" class="font-medium text-gray-900 text-xs mb-1.5 block">Assigned Physical Packaging Profile</label>
+              <select name="delhivery_packaging_type" id="delhivery_packaging_type" class="form-select form-select-sm w-full font-sans">
+                <option value="Carton" <%= 'selected' if @recommended_packaging == 'Carton Box' %>>Carton Box (Large Profile / Fragile Frame Shipments)</option>
+                <option value="Flyer" <%= 'selected' if @recommended_packaging == 'Flyer' %>>Standard Document Flyer (Soft Materials &lt; 2kg)</option>
+              </select>
+            </div>
+          </div>
+        <% end %>
+
+        <label class="font-medium text-gray-900 mb-3 block">Fulfillment Action</label>
+
+        <%# 2. DELHIVERY PRIMARY ACTION %>
+        <% if defined?(Spree::Integrations::Delhivery) && Spree::Integrations::Delhivery.active.exists? %>
+          <div class="flex items-center gap-2 mb-3">
+             <input type="radio" name="fulfillment_type" value="delhivery" id="fulfillment_type_delhivery" checked class="form-radio text-primary focus:ring-primary" onchange="document.getElementById('manual_tracking_field').classList.add('hidden')">
+             <label for="fulfillment_type_delhivery" class="text-sm font-medium">Use Delhivery API (Auto-generates Waybill)</label>
+          </div>
+        <% end %>
+
+        <%# 3. MANUAL OVERRIDE ACTION %>
+        <div class="flex items-center gap-2 mb-3">
+          <input type="radio" name="fulfillment_type" value="manual" id="fulfillment_type_manual" class="form-radio text-primary focus:ring-primary" <%= 'checked' unless defined?(Spree::Integrations::Delhivery) %> onchange="document.getElementById('manual_tracking_field').classList.remove('hidden')">
+          <label for="fulfillment_type_manual" class="text-sm font-medium">Manual Tracking (Shipped outside API)</label>
+        </div>
+
+        <%# 4. CONDITIONAL TRACKING INPUT %>
+        <div id="manual_tracking_field" class="pl-6 pt-2 <%= 'hidden' if defined?(Spree::Integrations::Delhivery) %>">
+          <div class="form-group mb-0">
+            <label for="tracking_number">Tracking Number <span class="required font-weight-bold text-danger">*</span></label>
+            <%= f.text_field :tracking_number, class: "form-input w-full", placeholder: "e.g. BD77382910" %>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="dialog-footer">
+        <button name="button" type="button" class="btn btn-light" data-action="dialog#close" data-dismiss="dialog">Discard</button>
+        <button name="button" type="submit" class="btn btn-primary text-center flex items-center justify-center" data-turbo-submits-with="<span class='inline-block w-4 h-4 border-2 border-current border-r-transparent rounded-full animate-spin' role='status'></span>" style="width: 100px; height: 35px;">
+          Confirm
+        </button>
+      </div>
+    <% end %>
+  </div>
+</turbo-frame>

data/app/views/spree/admin/integrations/forms/_delhivery.html.erb

@@ -0,0 +1,51 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="mb-0">Delhivery Settings</h5>
+  </div>
+  <div class="card-body">
+    <%# API Token %>
+    <%= preference_field(@integration, form, 'api_token', i18n_scope: 'spree.admin.integrations.delhivery') %>
+
+    <%# Client Name (Optional) %>
+    <%= preference_field(@integration, form, 'client_name', i18n_scope: 'spree.admin.integrations.delhivery') %>
+
+    <%# Pickup Location - CRITICAL %>
+    <%= preference_field(@integration, form, 'pickup_location_name', i18n_scope: 'spree.admin.integrations.delhivery') %>
+    <small class="form-text text-muted mb-4">
+      Must match the exact Warehouse Name in your Delhivery Dashboard.
+    </small>
+
+    <%# --- NEW: COD SURCHARGE --- %>
+    <div class="form-group mb-4 bg-light p-3 border rounded">
+      <label class="font-weight-bold">COD Surcharge Fee (₹)</label>
+      <%= form.number_field :preferred_cod_surcharge_amount, class: 'form-control', step: '0.01' %>
+      <small class="form-text text-muted mt-2">
+        <strong>Optional:</strong> Enter a fixed amount to charge customers for using Cash on Delivery (e.g. 150). Set to 0 to disable.
+      </small>
+    </div>
+
+    <div class="row mb-4">
+      <div class="col-6">
+        <div class="form-group">
+          <label>Store Weight Unit</label>
+          <%= form.select :preferred_store_weight_unit, 
+              options_for_select([['Kilograms (kg)', 'kg'], ['Pounds (lbs)', 'lbs'], ['Grams (g)', 'g'], ['Ounces (oz)', 'oz']], @integration.preferred_store_weight_unit), 
+              {}, class: 'form-control' %>
+          <small class="form-text text-muted mt-2">Select the unit your products use in Spree.</small>
+        </div>
+      </div>
+      <div class="col-6">
+        <div class="form-group">
+          <label>Store Dimension Unit</label>
+          <%= form.select :preferred_store_dimension_unit, 
+              options_for_select([['Centimeters (cm)', 'cm'], ['Inches (in)', 'in'], ['Meters (m)', 'm'], ['Millimeters (mm)', 'mm']], @integration.preferred_store_dimension_unit), 
+              {}, class: 'form-control' %>
+          <small class="form-text text-muted mt-2">Select the unit your products use in Spree.</small>
+        </div>
+      </div>
+    </div>
+
+    <%# Production Mode Checkbox %>
+    <%= preference_field(@integration, form, 'production_mode', i18n_scope: 'spree.admin.integrations.delhivery') %>
+  </div>
+</div>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -0,0 +1,180 @@
+<% order ||= shipment.order %>
+<%= turbo_frame_tag dom_id(shipment), class: "card mb-6 block w-full shadow-sm" do %>
+  
+  <%# --- HEADER & TOOLBAR --- %>
+  <div class="card-header flex flex-col sm:flex-row sm:items-center justify-between px-4 py-4 gap-4 h-auto">
+    
+    <div class="flex items-center gap-2 w-full sm:w-auto">
+      <span class="flex items-center"><%= shipment_state(shipment.state) %></span>
+      <strong class="shipment-number text-lg text-gray-900"><%= shipment.number %></strong>
+      <% if shipment.shipped_at.present? %>
+        <small class="text-gray-600 whitespace-nowrap ml-auto sm:ml-1">
+          <%= spree_time_ago(shipment.shipped_at) %>
+        </small>
+      <% end %>
+    </div>
+
+    <div class="flex items-center gap-3 w-full sm:w-auto sm:ml-auto justify-end pt-2">
+      <div class="flex items-center gap-2">
+        
+        <%# 1. DELHIVERY ACTIONS %>
+        <% if defined?(Spree::Integrations::Delhivery) && shipment.try(:delhivery_waybill).present? %>
+          
+          <%= link_to spree.delhivery_label_admin_shipment_path(shipment, format: :pdf), class: 'btn btn-light btn-sm p-0 flex items-center justify-center border hover:bg-white', style: 'width: 28px; height: 28px;', target: '_blank', title: "Print Shipping Label" do %>
+              <i class="ti ti-printer icon" style=""></i>
+          <% end %>
+          <button type="button" class="btn btn-light btn-sm p-0 flex items-center justify-center border hover:bg-white" style="width: 28px; height: 28px;" onclick="document.getElementById('pickupModal-<%= shipment.id %>').showModal()" title="Schedule Pickup">
+            <i class="ti ti-truck icon" style=""></i>
+          </button>
+          <%= button_to spree.delhivery_track_admin_shipment_path(shipment), method: :post, class: 'btn btn-light btn-sm p-0 flex items-center justify-center border hover:bg-white', style: 'width: 28px; height: 28px;', title: "Refresh Status", data: { turbo: false } do %>
+              <i class="ti ti-refresh icon" style=""></i>
+          <% end %>
+          <%= button_to spree.delhivery_cancel_admin_shipment_path(shipment), method: :post, class: 'btn btn-light btn-sm p-0 flex items-center justify-center border hover:bg-white', style: 'width: 28px; height: 28px;', data: { turbo: false, confirm: "Void this Delhivery Waybill? This allows you to generate a new one." }, title: "Cancel Shipment" do %>
+              <i class="ti ti-x icon text-red-500" style=""></i>
+          <% end %>
+
+        <%# 2. OUR FULFILLMENT MODAL (Native Spree 5 Styling) %>
+        <% elsif !shipment.canceled? %>
+          
+          <%= link_to spree.new_admin_order_shipment_fulfillment_path(order.number, shipment.number), 
+              class: 'btn btn-secondary btn-sm', 
+              data: { turbo_frame: 'dialog', action: 'dialog#open click->reveal:stop' } do %>
+              <i class="ti ti-send icon icon-send" style=""></i> 
+              <span><%= shipment.shipped? ? 'Update Carrier' : Spree.t(:ship) %></span>
+          <% end %>
+          
+        <% end %>
+      </div>
+
+      <%# LOCATION INFO %>
+      <div class="flex items-center gap-1 text-sm pl-3 border-l border-gray-200 ml-auto hidden sm:flex">
+        <small class="text-gray-600"><%= Spree.t(:package_from).downcase %></small>
+        <strong class="text-gray-900 truncate" style="max-width: 150px;">
+          <% if can?(:edit, shipment.stock_location) %>
+            <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_path(shipment.stock_location), data: { turbo_frame: '_top' } %>
+          <% else %>
+            <%= shipment.stock_location.name %>
+          <% end %>
+        </strong>
+      </div>
+    </div>
+  </div>
+
+  <%# --- BODY (Line Items) --- %>
+  <div class="card-body mb-0 p-0">
+    <div class="shipment-line-items overflow-x-auto">
+      <div class="text-gray-600 text-center border-b py-2 px-4 text-sm shipment-line-items__row bg-gray-50 min-w-[500px]">
+        <span class="text-left"><%= Spree.t(:item_description) %></span>
+        <span><%= Spree.t(:price) %></span>
+        <span><%= Spree.t(:quantity) %></span>
+        <span><%= Spree.t(:total) %></span>
+        <span></span>
+      </div>
+      <div class="min-w-[500px]">
+        <%= render collection: shipment.manifest, partial: 'spree/admin/orders/shipment_manifest_item', as: :item, locals: { shipment: shipment } %>
+      </div>
+    </div>
+
+    <%= turbo_frame_tag dom_id(shipment, :shipping_method), class: "py-2 px-4 flex justify-between items-center min-h-14 border-t" do %>
+      <div class="flex items-center gap-2">
+        <% if rate = shipment.selected_shipping_rate %>
+          <strong><%= rate.name %></strong>
+          <span class="text-gray-600">(<%= shipment.display_cost %>)</span>
+        <% else %>
+          <%= Spree.t(:no_shipping_method_selected) %>
+        <% end %>
+      </div>
+    <% end %>
+
+    <%# --- TRACKING --- %>
+    <% unless shipment.digital? %>
+      <%= turbo_frame_tag dom_id(shipment, :tracking), class: "border-t px-4 flex justify-between items-center min-h-14 bg-gray-50/50" do %>
+        <div class="py-4 flex items-center gap-2 mr-2">
+          <strong class="text-sm text-gray-900"><%= Spree.t(:tracking) %>:</strong>
+          <% if shipment.tracked? %>
+            <% if shipment.tracking_url.present? %>
+              <%= link_to shipment.tracking, shipment.tracking_url, target: '_blank', class: "text-blue-600 hover:underline font-mono text-sm font-medium" %>
+            <% else %>
+              <span class="font-mono text-gray-800 text-sm font-medium"><%= shipment.tracking %></span>
+            <% end %>
+          <% else %>
+            <span class="text-gray-400 italic text-sm"><%= Spree.t(:no_tracking_present) %></span>
+          <% end %>
+
+          <%# UNIFIED EDIT BUTTON (Native Spree 5 Styling) %>
+          <% if can?(:update, shipment) && !order.canceled? && !shipment.canceled? && shipment.try(:delhivery_waybill).blank? %>
+              <%= link_to spree.new_admin_order_shipment_fulfillment_path(order.number, shipment.number), 
+                  class: 'btn btn-light btn-sm ml-2 p-0 flex items-center justify-center border hover:bg-white', 
+                  style: 'width: 28px; height: 28px;',
+                  title: "Update Carrier & Tracking",
+                  data: { turbo_frame: 'dialog', action: 'dialog#open' } do %>
+                  <i class="ti ti-pencil icon mr-0" style=""></i>
+              <% end %>
+          <% end %>
+        </div>
+        
+        <%# Delhivery Status Badge %>
+        <% if shipment.try(:tracking_status).present? %>
+          <% 
+            status_down = shipment.tracking_status.to_s.downcase
+            badge_class = case status_down
+                          when 'delivered' then 'bg-green-100 text-green-800'
+                          when 'shipped', 'in transit', 'out for delivery' then 'bg-blue-100 text-blue-800'
+                          when 'canceled', 'rto' then 'bg-red-100 text-red-800'
+                          else 'bg-gray-100 text-gray-800'
+                          end
+          %>
+          <small class="px-2.5 py-0.5 rounded-full text-xs font-medium <%= badge_class %> flex items-center gap-1">
+            <i class="ti ti-truck icon" style="width: 14px; height: 14px;"></i>
+            <%= shipment.tracking_status.upcase %>
+          </small>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
+
+<%# --- HTML5 PICKUP MODAL --- %>
+<% if defined?(Spree::Integrations::Delhivery) && shipment.try(:delhivery_waybill).present? %>
+  <dialog id="pickupModal-<%= shipment.id %>" class="dialog">
+    <div>
+      <div class="dialog-header">
+        <h5 class="dialog-title">Schedule Pickup</h5>
+        <button type="button" class="btn-close" onclick="document.getElementById('pickupModal-<%= shipment.id %>').close()" aria-label="Close"></button>
+      </div>
+
+      <%= form_with url: spree.delhivery_pickup_admin_stock_location_path(shipment.stock_location), method: :post, data: { turbo: false } do |f| %>
+        <div class="dialog-body">
+          <div class="alert alert-info text-sm mb-4 bg-blue-50 text-blue-800 p-3 rounded-md flex items-center">
+            <i class="ti ti-info-circle icon mr-2 w-5 h-5" style=""></i>
+            <span>Requesting pickup for: <strong><%= shipment.stock_location.name %></strong></span>
+          </div>
+
+          <div class="flex gap-4">
+            <div class="form-group w-1/2">
+              <label for="pickup_date">Pickup Date</label>
+              <%= f.date_field :pickup_date, value: Date.today, min: Date.today, class: "form-input", id: "pickup_date" %>
+            </div>
+            <div class="form-group w-1/2">
+              <label for="pickup_time">Pickup Time</label>
+              <%= f.time_field :pickup_time, value: "16:00", class: "form-input", id: "pickup_time" %>
+            </div>
+          </div>
+
+          <div class="form-group mt-4">
+            <label for="count">Total Packages to Pickup <span class="required font-weight-bold text-danger"> *</span></label>
+            <%= f.number_field :count, value: 1, min: 1, class: "form-input", id: "count" %>
+            <span class="form-text mt-2">Total packages ready at this location today.</span>
+          </div>
+        </div>
+
+        <div class="dialog-footer">
+          <button type="button" class="btn btn-light" onclick="document.getElementById('pickupModal-<%= shipment.id %>').close()">Discard</button>
+          <button type="submit" class="btn btn-primary text-center flex items-center justify-center" data-turbo-submits-with="<span class='inline-block w-4 h-4 border-2 border-current border-r-transparent rounded-full animate-spin' role='status'></span>">
+            <i class="ti ti-truck icon mr-2" style=""></i> Schedule
+          </button>
+        </div>
+      <% end %>
+    </div>
+  </dialog>
+<% end %>

data/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb

@@ -0,0 +1,157 @@
+<% edit_link =
+  if can?(:edit, return_authorization)
+    spree.edit_admin_order_return_authorization_path(
+      @order,
+      return_authorization,
+    )
+  else
+    spree.admin_order_return_authorization_path(@order, return_authorization)
+  end %>
+
+<tr
+  id="<%= spree_dom_id(return_authorization) %>"
+  data-controller="row-link"
+  class="cursor-pointer"
+>
+  <td data-action="click->row-link#openLink" class="font-bolder">
+    <%= link_to return_authorization.number, edit_link %>
+  </td>
+  <td data-action="click->row-link#openLink">
+    <small class="badge badge-<%= return_authorization.state %>">
+      <%= Spree.t("return_authorization_states.#{return_authorization.state}") %>
+    </small>
+  </td>
+  <td data-action="click->row-link#openLink"><%= return_authorization.display_pre_tax_total.to_html %></td>
+  <td data-action="click->row-link#openLink"><%= spree_time(return_authorization.created_at) %></td>
+  
+  <%# --- DELHIVERY RETURN ACTION --- %>
+  <td class="text-right">
+    <div class="flex items-center justify-end gap-2">
+      
+      <%# Only show if Delhivery integration exists %>
+      <% if defined?(Spree::Integrations::Delhivery) && Spree::Integrations::Delhivery.active.exists? %>
+        
+        <%# 1. SUCCESS STATE: Waybill Exists %>
+        <% if return_authorization.respond_to?(:delhivery_waybill) && return_authorization.delhivery_waybill.present? %>
+          <div class="badge badge-success text-white" title="Waybill: <%= return_authorization.delhivery_waybill %>" style="background-color: #28a745;">
+            <%= icon('check', class: "w-3 h-3 mr-1") %> 
+            Pickup Scheduled
+          </div>
+        
+        <% else %>
+          
+          <%# 2. TRIGGER BUTTON (Opens Modal) %>
+          <%# Note: onclick with stopPropagation prevents the row-click event %>
+          <button type="button" 
+                  class="btn btn-sm btn-outline-primary shadow-sm stop-propagation"
+                  onclick="event.stopPropagation(); $('#rvpModal-<%= return_authorization.id %>').modal('show');"
+                  title="Schedule Reverse Pickup via Delhivery">
+            <%= icon('truck', class: "w-4 h-4 mr-1") %> Pickup
+          </button>
+
+          <%# 3. PICKUP FORM MODAL %>
+          <div class="modal fade text-left" id="rvpModal-<%= return_authorization.id %>" tabindex="-1" role="dialog" aria-hidden="true" onclick="event.stopPropagation();">
+            <div class="modal-dialog modal-dialog-centered" role="document">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title font-weight-bold">
+                    <%= icon('truck', class: "mr-1") %> Schedule Reverse Pickup
+                  </h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                
+                <%# FORM START %>
+                <%= form_with url: spree.delhivery_create_pickup_admin_return_authorization_path(return_authorization), method: :post, local: true do |f| %>
+                  <div class="modal-body">
+                    
+                    <div class="alert alert-info text-sm mb-3 w-100">
+                      <strong>Return To:</strong> <%= return_authorization.stock_location.name %>
+                      <br>
+                      <span class="text-muted text-xs">
+                        (Ensure "Delhivery Warehouse Name"
+                        <br>is configured for this location)
+                      </span>
+                    </div>
+
+                    <h6 class="font-weight-bold mb-2 border-bottom pb-1">Parametric QC Details</h6>
+                    
+                    <div class="row">
+                      <div class="col-6">
+                        <div class="form-group">
+                          <label class="small font-weight-bold">Brand Name <span class="text-danger">*</span></label>
+                          <%# Pre-fill with Store Name %>
+                          <%= f.text_field :brand, value: current_store.name, class: "form-control", required: true %>
+                        </div>
+                      </div>
+                      <div class="col-6">
+                        <div class="form-group">
+                          <label class="small font-weight-bold">Category <span class="text-danger">*</span></label>
+                          <%# Default to General %>
+                          <%= f.text_field :category, value: "General", class: "form-control", required: true %>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div class="form-group">
+                      <label class="small font-weight-bold">QC Question Set</label>
+                      <select class="form-control" disabled title="Using Generic Visual Check">
+                        <option>Generic / Visual Check (Default)</option>
+                      </select>
+                      <small class="text-muted">Specific question sets require ID mapping configuration.</small>
+                    </div>
+
+                    <div class="bg-light p-2 rounded border mb-3">
+                      <label class="small font-weight-bold">Items to Pickup:</label>
+                      <% return_authorization.return_items.each do |item| %>
+                        <div class="d-flex align-items-center mb-1 pl-2">
+                          <%= icon('cube', class: "text-muted mr-2") %>
+                          <span class="text-sm font-weight-bold">
+                            <%= item.inventory_unit.variant.name %>
+                          </span>
+                          <span class="badge badge-info ml-auto">Qty: 1</span>
+                        </div>
+                      <% end %>
+                    </div>
+
+                    <div class="form-group pt-2 border-top">
+                      <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="confirmCheck-<%= return_authorization.id %>" required>
+                        <label class="form-check-label text-sm font-weight-bold" for="confirmCheck-<%= return_authorization.id %>">
+                          I confirm the details are correct.
+                        </label>
+                      </div>
+                    </div>
+
+                  </div>
+                  
+                  <div class="modal-footer bg-light">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <%= f.button class: "btn btn-primary ml-2" do %>
+                      Confirm Pickup
+                    <% end %>
+                  </div>
+                <% end %>
+                <%# FORM END %>
+              </div>
+            </div>
+          </div>
+          <%# --- END MODAL --- %>
+
+        <% end %>
+
+      <% end %>
+
+      <%# Existing Edit Button %>
+      <%= link_to_edit(
+        return_authorization,
+        no_text: true,
+        data: {
+          row_link_target: :link,
+        },
+        url: edit_link,
+      ) %>
+    </div>
+  </td>
+</tr>