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

---
 routes/web.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 7c1c936c..ae5fc51a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\InvoiceController;
+use App\Invoice;
 use App\InvoiceStatuses;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\File;
@@ -20,15 +21,19 @@ Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm
 Route::post('password/reset', 'Auth\ResetPasswordController@postReset')->name('password.reset');
 
 Route::get('/po-approval', function(){
-    $approvedInvoices = InvoiceStatuses::where(function($q) {
-        $q->where('status', 'approve')
-            ->orWhere('status', 'request_change');
-    })->distinct()->get(['invoice_id'])->pluck('invoice_id');
-    $invoices = InvoiceStatuses::whereNotIn('invoice_id', $approvedInvoices)->get();
-    echo "<h1>Total PO Pending Approval:<b>".count($invoices)."</b></h1>";
+    $approvedInvoices = InvoiceStatuses::where('status', 'approve')->distinct()->get(['invoice_id'])->pluck('invoice_id');
+    $pendingChangeInvoices = InvoiceStatuses::where('status', 'request_change')->distinct()->get(['invoice_id'])->pluck('invoice_id');
+    $invoices = InvoiceStatuses::whereNotIn('invoice_id', $approvedInvoices)->whereNotIn($pendingChangeInvoices)->get();
+    echo "<h1>Total PO Pending Approval: <b>".count($invoices)."</b></h1>";
     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){
+        echo "<a target='_blank' href='https://exchange.cief-malaysia.com/booking/".$invoice->booking->id."/admin/complete'>".$invoice->booking->id."</a><br>";
+    }
 })->name('po.approval');
 
 Route::get('/old-invoices', function(){