From 48e7354b38c399310282682cd2ff1b03177c394d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Dec 2020 17:06:47 +0800
Subject: [PATCH] include approved po's in the system

---
 routes/web.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index eea61379..79d4f53a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -28,10 +28,14 @@ Route::get('/po-approval', function(){
     foreach ($invoices as $invoice){
         echo "<a target='_blank' href='https://exchange.cief-malaysia.com/booking/".$invoice->invoice->booking->id."/upload-invoice'>".$invoice->invoice->booking->id."</a><br>";
     }
-    $completedInvoices = Invoice::where('invoice_path', '!=', '')->orWhereNotNull('invoice_path')->get();
-    $completedInvoices = array_merge($completedInvoices, $approvedInvoices);
-    echo "<h1>Total Po Approved: <b>".count($completedInvoices)."</b></h1>";
-    foreach ($completedInvoices as $invoice){
+    $oldCompletedInvoices = Invoice::where('invoice_path', '!=', '')->orWhereNotNull('invoice_path')->get();
+    $newCompletedInvoices = Invoice::whereIn('invoice_id', $approvedInvoices)->get();
+    $total = count($oldCompletedInvoices) + count($newCompletedInvoices);
+    echo "<h1>Total Po Approved: <b>".$total."</b></h1>";
+    foreach ($newCompletedInvoices as $invoice){
+        echo "<a target='_blank' href='https://exchange.cief-malaysia.com/booking/".$invoice->booking->id."/admin/complete'>".$invoice->booking->id."</a><br>";
+    }
+    foreach ($oldCompletedInvoices as $invoice){
         echo "<a target='_blank' href='https://exchange.cief-malaysia.com/booking/".$invoice->booking->id."/admin/complete'>".$invoice->booking->id."</a><br>";
     }
 })->name('po.approval');