kent-logistics/Kent-logistics-Laravel
SHA256
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes in order and dashboard, records

Browse Source
This commit is contained in:
divya abdar
2025-12-19 16:15:18 +05:30
parent 7ef28e06ae
commit 48f7ab82ff
6 changed files with 113 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
resources/views/admin/see_order.blade.php
View File

@@ -1074,7 +1074,7 @@
<thead>
<tr>
<th>#</th>
<th>Order ID</th>
<th>Description</th>
<th>Origin</th>
<th>Destination</th>
<th>Description</th>
@@ -1090,11 +1090,8 @@
<tr class="{{ $orderItem['order_id'] == $orderData['order_id'] ? 'current-order' : '' }}">
<td>{{ $index + 1 }}</td>
<td>
<strong>{{ $orderItem['order_id'] ?? '-' }}</strong>
@if($orderItem['order_id'] == $orderData['order_id'])
<span class="badge bg-primary ms-1">Current</span>
@endif
</td>
<strong>{{ $orderItem['description'] ?? '-' }}</strong>
</td>
<td>{{ $orderItem['origin'] ?? '-' }}</td>
<td>{{ $orderItem['destination'] ?? '-' }}</td>
<td>{{ $orderItem['description'] ?? '-' }}</td>
@@ -1103,7 +1100,13 @@
<td>{{ $orderItem['ttl_qty'] ?? '-' }}</td>
<td><strong>₹{{ number_format($orderItem['amount'] ?? 0, 2) }}</strong></td>
<td>
<span class="badge bg-info">In Shipment</span>
@php
$status = strtolower(str_replace(' ', '-', $orderItem['status'] ?? 'pending'));
@endphp
<span class="status-badge status-{{ $status }}">
{{ ucfirst($orderItem['status'] ?? 'Pending') }}
</span>
</td>
</tr>
@endforeach
@@ -1162,6 +1165,22 @@
</div>
@endif
</div>
@php
$derivedShipmentId = null;
foreach ($shipmentsData as $shipment) {
foreach ($shipment['orders'] as $orderItem) {
if ($orderItem['order_id'] == $orderData['order_id']) {
$derivedShipmentId = $shipment['shipment_id'];
break 2; // exit both loops
}
}
}
@endphp
@php
$gstAmount = $invoiceData['summary']['total'] - $invoiceData['summary']['amount'];
@endphp
{{-- =====================================================
INVOICE DETAILS TAB
@@ -1209,7 +1228,9 @@
</div>
<div class="invoice-meta-item">
<div class="invoice-meta-label">Belongs to Shipment</div>
<div class="invoice-meta-value">{{ $order->invoice->shipment_id ?? 'N/A' }}</div>
<div class="invoice-meta-value">
{{ $invoiceData['shipment_id'] ?? $derivedShipmentId ?? 'N/A' }}
</div>
</div>
<div class="invoice-meta-item">
<div class="invoice-meta-label">Order ID</div>
@@ -1271,8 +1292,8 @@
<td>{{ $item->qty }}</td>
<td>{{ $item->qty }}</td>
<td>{{ $item->unit ?? '-' }}</td>
<td>₹{{ number_format($item->rate, 2) }}</td>
<td><strong>₹{{ number_format($item->amount, 2) }}</strong></td>
<td>₹{{ number_format($item->price ?? 0, 2) }}</td>
<td><strong>₹{{ number_format($item->ttl_amount ?? 0, 2) }}</strong></td>
<td>{{ number_format($item->cbm ?? 0, 3) }}</td>
<td>{{ number_format(($item->cbm ?? 0) * $item->qty, 3) }}</td>
<td>{{ number_format($item->kg ?? 0, 3) }}</td>
@@ -1293,13 +1314,12 @@
<div class="invoice-total-value">₹{{ number_format($invoiceData['summary']['amount'], 2) }}</div>
</div>
<div class="invoice-total-item">
<div class="invoice-total-label">CGST (0%):</div>
<div class="invoice-total-value">₹{{ number_format($invoiceData['summary']['cgst'], 2) }}</div>
</div>
<div class="invoice-total-item">
<div class="invoice-total-label">SGST (0%):</div>
<div class="invoice-total-value">₹{{ number_format($invoiceData['summary']['sgst'], 2) }}</div>
<div class="invoice-total-label">GST:</div>
<div class="invoice-total-value">
₹{{ number_format($gstAmount, 2) }}
</div>
</div>
</div>
<div class="invoice-grand-total">