diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index ec1a34d7..f91a179a 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -34,7 +34,7 @@
 
 
                 <div class="ref">REF: {{ $transaction->booking->marking }}</div>
-                <div class="date">Date: {{ $po_order_transaction->created_at }}</div>
+                <div class="date">Date: {{ $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
             </td>
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index c52e87e4..0df3cb98 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -33,18 +33,7 @@
 
 
                 <div class="ref">Ref# {{ $po_order_transaction->booking->marking }}</div>
-
-                <?php
-                    $invoice_based_on_generated_date = false;
-                    $customer_segment_id = $supplier->segments->pluck('id');
-                    foreach ($customer_segment_id as $value) {
-                        if (in_array($value, [23])){
-                            $invoice_based_on_generated_date = true;
-                        }
-                    }
-                ?>
-                <div class="date">Date: {{ $invoice_based_on_generated_date ? \Carbon\Carbon::now() : $po_order_transaction->booking->created_at }}</div>
-                
+                <div class="date">Date: {{ $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->booking->created_at }}</div>
                 <div>&nbsp;</div>
                 </div>
             </td>
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index 9f72b531..c3ac5e8a 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -14,7 +14,7 @@
             <td class="document-detail">
                 PO#: {{ $po_order_transaction->bill_no }} <br>
                 Ref#: {{ $po_order_transaction->booking->marking }} <br>
-                Date: {{ $po_order_transaction->booking->created_at }}
+                Date: {{ $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->booking->created_at }}
             </td>
         </tr>
     </table>