status update
This commit is contained in:
Abhishek Mali
@@ -1253,19 +1253,49 @@ body, .container-fluid {
|
||||
<td>{{ $order->kg }}</td>
|
||||
<td>{{ $order->ttl_kg }}</td>
|
||||
<td>
|
||||
<span class="badge badge-{{ $order->status }}">
|
||||
@if($order->status == 'pending')
|
||||
<i class="bi bi-clock-fill status-icon"></i>
|
||||
@elseif($order->status == 'in_transit')
|
||||
<i class="bi bi-truck status-icon"></i>
|
||||
@elseif($order->status == 'dispatched')
|
||||
<i class="bi bi-box-seam status-icon"></i>
|
||||
@elseif($order->status == 'delivered')
|
||||
<i class="bi bi-check-circle-fill status-icon"></i>
|
||||
@endif
|
||||
{{ ucfirst(str_replace('_', ' ', $order->status)) }}
|
||||
@php
|
||||
// Badge color mapping
|
||||
$badgeMap = [
|
||||
'order_placed' => 'secondary',
|
||||
'order_confirmed' => 'info',
|
||||
'supplier_warehouse' => 'warning',
|
||||
'consolidate_warehouse' => 'warning',
|
||||
'export_custom' => 'primary',
|
||||
'international_transit' => 'primary',
|
||||
'arrived_india' => 'info',
|
||||
'import_custom' => 'info',
|
||||
'warehouse' => 'dark',
|
||||
'domestic_distribution' => 'primary',
|
||||
'out_for_delivery' => 'success',
|
||||
'delivered' => 'success',
|
||||
];
|
||||
|
||||
// Icon mapping
|
||||
$iconMap = [
|
||||
'order_placed' => 'bi-clock-fill',
|
||||
'order_confirmed' => 'bi-check-circle',
|
||||
'supplier_warehouse' => 'bi-box-seam',
|
||||
'consolidate_warehouse' => 'bi-boxes',
|
||||
'export_custom' => 'bi-upload',
|
||||
'international_transit' => 'bi-truck',
|
||||
'arrived_india' => 'bi-geo-alt',
|
||||
'import_custom' => 'bi-download',
|
||||
'warehouse' => 'bi-building',
|
||||
'domestic_distribution' => 'bi-diagram-3',
|
||||
'out_for_delivery' => 'bi-truck-flatbed',
|
||||
'delivered' => 'bi-check-circle-fill',
|
||||
];
|
||||
|
||||
$badgeClass = $badgeMap[$order->status] ?? 'secondary';
|
||||
$iconClass = $iconMap[$order->status] ?? 'bi-info-circle';
|
||||
@endphp
|
||||
|
||||
<span class="badge bg-{{ $badgeClass }}">
|
||||
<i class="bi {{ $iconClass }} status-icon"></i>
|
||||
{{ $order->status_label }}
|
||||
</span>
|
||||
</td>
|
||||
</td>
|
||||
|
||||
<td>{{ $order->created_at->format('d-m-Y') }}</td>
|
||||
<td>
|
||||
<a href="{{ route('admin.orders.show', $order->id) }}" class="btn btn-sm btn-outline-primary">
|
||||
|
||||
@@ -1093,11 +1093,16 @@
|
||||
<div class="status-filter-container">
|
||||
<select id="statusFilter" class="status-filter-select">
|
||||
<option value="all">All Status</option>
|
||||
<option value="loading">Loading</option>
|
||||
<option value="pending">Pending</option>
|
||||
<option value="in_transit">In Transit</option>
|
||||
<option value="dispatched">Dispatched</option>
|
||||
<option value="shipment_ready">Shipment Ready</option>
|
||||
<option value="export_custom">Export Custom</option>
|
||||
<option value="international_transit">International Transit</option>
|
||||
<option value="arrived_india">Arrived at India</option>
|
||||
<option value="import_custom">Import Custom</option>
|
||||
<option value="warehouse">Warehouse</option>
|
||||
<option value="domestic_distribution">Domestic Distribution</option>
|
||||
<option value="out_for_delivery">Out for Delivery</option>
|
||||
<option value="delivered">Delivered</option>
|
||||
|
||||
</select>
|
||||
</div>
|
||||
<select id="carrierFilter">
|
||||
@@ -1293,26 +1298,42 @@
|
||||
<form action="{{ route('admin.shipments.updateStatus') }}" method="POST" class="status-form">
|
||||
@csrf
|
||||
<input type="hidden" name="shipment_id" value="{{ $ship->id }}">
|
||||
<button type="submit" name="status" value="loading" class="status-option loading">
|
||||
<span class="status-indicator loading"></span>
|
||||
Loading
|
||||
<button type="submit" name="status" value="shipment_ready" class="status-option shipment_ready">
|
||||
Shipment Ready
|
||||
</button>
|
||||
<button type="submit" name="status" value="pending" class="status-option pending">
|
||||
<span class="status-indicator pending"></span>
|
||||
Pending
|
||||
|
||||
<button type="submit" name="status" value="export_custom" class="status-option export_custom">
|
||||
Export Custom
|
||||
</button>
|
||||
<button type="submit" name="status" value="in_transit" class="status-option in_transit">
|
||||
<span class="status-indicator in_transit"></span>
|
||||
In Transit
|
||||
|
||||
<button type="submit" name="status" value="international_transit" class="status-option international_transit">
|
||||
International Transit
|
||||
</button>
|
||||
<button type="submit" name="status" value="dispatched" class="status-option dispatched">
|
||||
<span class="status-indicator dispatched"></span>
|
||||
Dispatched
|
||||
|
||||
<button type="submit" name="status" value="arrived_india" class="status-option arrived_india">
|
||||
Arrived at India
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="import_custom" class="status-option import_custom">
|
||||
Import Custom
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="warehouse" class="status-option warehouse">
|
||||
Warehouse
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="domestic_distribution" class="status-option domestic_distribution">
|
||||
Domestic Distribution
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="out_for_delivery" class="status-option out_for_delivery">
|
||||
Out for Delivery
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="delivered" class="status-option delivered">
|
||||
<span class="status-indicator delivered"></span>
|
||||
Delivered
|
||||
</button>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1716,38 +1737,68 @@ function renderTable() {
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<div class="action-container">
|
||||
<button type="button" class="btn-edit-status" onclick="toggleStatusDropdown(this, ${shipment.id})" title="Edit Status">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</button>
|
||||
<div class="status-dropdown" id="statusDropdown-${shipment.id}">
|
||||
<form action="/admin/shipments/update-status" method="POST" class="status-form">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="shipment_id" value="${shipment.id}">
|
||||
<button type="submit" name="status" value="loading" class="status-option loading">
|
||||
<span class="status-indicator loading"></span>
|
||||
Loading
|
||||
</button>
|
||||
<button type="submit" name="status" value="pending" class="status-option pending">
|
||||
<span class="status-indicator pending"></span>
|
||||
Pending
|
||||
</button>
|
||||
<button type="submit" name="status" value="in_transit" class="status-option in_transit">
|
||||
<span class="status-indicator in_transit"></span>
|
||||
In Transit
|
||||
</button>
|
||||
<button type="submit" name="status" value="dispatched" class="status-option dispatched">
|
||||
<span class="status-indicator dispatched"></span>
|
||||
Dispatched
|
||||
</button>
|
||||
<button type="submit" name="status" value="delivered" class="status-option delivered">
|
||||
<span class="status-indicator delivered"></span>
|
||||
Delivered
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<div class="action-container">
|
||||
<button type="button"
|
||||
class="btn-edit-status"
|
||||
onclick="toggleStatusDropdown(this, ${shipment.id})"
|
||||
title="Edit Status">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</button>
|
||||
|
||||
<div class="status-dropdown" id="statusDropdown-${shipment.id}">
|
||||
<form action="/admin/shipments/update-status" method="POST" class="status-form">
|
||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="shipment_id" value="${shipment.id}">
|
||||
|
||||
<button type="submit" name="status" value="shipment_ready" class="status-option shipment_ready">
|
||||
<span class="status-indicator shipment_ready"></span>
|
||||
Shipment Ready
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="export_custom" class="status-option export_custom">
|
||||
<span class="status-indicator export_custom"></span>
|
||||
Export Custom
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="international_transit" class="status-option international_transit">
|
||||
<span class="status-indicator international_transit"></span>
|
||||
International Transit
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="arrived_india" class="status-option arrived_india">
|
||||
<span class="status-indicator arrived_india"></span>
|
||||
Arrived at India
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="import_custom" class="status-option import_custom">
|
||||
<span class="status-indicator import_custom"></span>
|
||||
Import Custom
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="warehouse" class="status-option warehouse">
|
||||
<span class="status-indicator warehouse"></span>
|
||||
Warehouse
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="domestic_distribution" class="status-option domestic_distribution">
|
||||
<span class="status-indicator domestic_distribution"></span>
|
||||
Domestic Distribution
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="out_for_delivery" class="status-option out_for_delivery">
|
||||
<span class="status-indicator out_for_delivery"></span>
|
||||
Out for Delivery
|
||||
</button>
|
||||
|
||||
<button type="submit" name="status" value="delivered" class="status-option delivered">
|
||||
<span class="status-indicator delivered"></span>
|
||||
Delivered
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
`;
|
||||
tbody.appendChild(row);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user