Merge pull request 'Swapped column of remark and status column in import transit mail' (#777) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 41s

Reviewed-on: #777
This commit was merged in pull request #777.
This commit is contained in:
2026-06-19 08:57:39 +00:00

View File

@@ -103,14 +103,16 @@
{{ !empty($row['eta_date']) ? \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') : '' }} {{ !empty($row['eta_date']) ? \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') : '' }}
</td> </td>
<td class="status-column"> <td class="status-column">
{{ $row['status'] }} {{ $row['remark'] }}
</td> </td>
<td>{{ $row['delivery_location'] }}</td> <td>{{ $row['delivery_location'] }}</td>
{{-- <td>{{ \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') }}</td> --}} {{-- <td>{{ \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') }}</td> --}}
<td> <td>
{{ !empty($row['etd_date']) ? \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') : '' }} {{ !empty($row['etd_date']) ? \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') : '' }}
</td> </td>
<td>{{ $row['remark'] }}</td> <td class="status-column">
{{ $row['status'] }}
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>