diff --git a/resources/views/mail/import_transit_report.blade.php b/resources/views/mail/import_transit_report.blade.php
index 1085c05..2b24918 100644
--- a/resources/views/mail/import_transit_report.blade.php
+++ b/resources/views/mail/import_transit_report.blade.php
@@ -89,38 +89,27 @@
                 <tr style="{{ $row['is_transit_identified'] == 1 ? 'background-color:#FFFF00;' . 'font-weight: bold;' : '' }}">
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $row['cri_rfq_number'] }}</td>
-                    {{-- <td>{{ $row['mail_received_date'] }}</td> --}}
-                    {{-- <td>{{ \Carbon\Carbon::parse($row['mail_received_date'])->format('Y-m-d') }}</td> --}}
-                    {{-- <td>{{ $row['pricol_ref_number'] }}</td> --}}
                     <td>{{ $row['requester'] }}</td>
                     <td>{{ $row['shipper'] }}</td>
                     <td>{{ $row['shipper_location'] }}</td>
                     <td>{{ $row['shipper_invoice'] }}</td>
-                    {{-- <td>{{ $row['shipper_invoice_date'] }}</td> --}}
-                    <td>{{ \Carbon\Carbon::parse($row['shipper_invoice_date'])->format('Y-m-d') }}</td>
+                    {{-- <td>{{ \Carbon\Carbon::parse($row['shipper_invoice_date'])->format('Y-m-d') }}</td> --}}
+                    <td>
+                        {{ !empty($row['shipper_invoice_date']) ? \Carbon\Carbon::parse($row['shipper_invoice_date'])->format('Y-m-d') : '' }}
+                    </td>
                     <td>{{ $row['customs_agent_name'] }}</td>
-                    {{-- <td>{{ $row['eta_date'] }}</td> --}}
-                    <td>{{ \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') }}</td>
-                    {{-- <td>{{ $row['status'] }}</td> --}}
+                    {{-- <td>{{ \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') }}</td> --}}
+                    <td>
+                        {{ !empty($row['eta_date']) ? \Carbon\Carbon::parse($row['eta_date'])->format('Y-m-d') : '' }}
+                    </td>
                     <td class="status-column">
                         {{ $row['status'] }}
                     </td>
                     <td>{{ $row['delivery_location'] }}</td>
-                    {{-- <td>{{ $row['etd_date'] }}</td> --}}
-                    <td>{{ \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') }}</td>
-                    {{-- <td>{{ $row['mode'] }}</td>
-                    <td>{{ $row['inco_terms'] }}</td>
-                    <td>{{ $row['port_of_loading'] }}</td>
-                    <td>{{ $row['port_of_discharge'] }}</td>
-                    <td>{{ $row['delivery_city'] }}</td>
-                    <td>{{ $row['packages'] }}</td>
-                    <td>{{ $row['type_of_package'] }}</td>
-                    <td>{{ $row['gross_weight'] }}</td>
-                    <td>{{ $row['volume'] }}</td>
-                    <td>{{ $row['bill_number'] }}</td> --}}
-                    {{-- <td>{{ $row['bill_received_date'] }}</td> --}}
-                    {{-- <td>{{ \Carbon\Carbon::parse($row['bill_received_date'])->format('Y-m-d') }}</td>
-                    <td>{{ $row['vessel_number'] }}</td> --}}
+                    {{-- <td>{{ \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') }}</td> --}}
+                    <td>
+                        {{ !empty($row['etd_date']) ? \Carbon\Carbon::parse($row['etd_date'])->format('Y-m-d') : '' }}
+                    </td>
                     <td>{{ $row['remark'] }}</td>
                 </tr>
                 @endforeach