From 857003b25bb0d116fdedc4e8ea37690899c66ee7 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 2 Apr 2023 11:45:58 +0800
Subject: [PATCH] update code conflict

---
 routes/web.php | 71 ++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 48 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index c0aa7c56..99897b48 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -993,31 +993,6 @@ Route::get('/wallet/audit', function (Request $request) {
 });
 
 
-Route::get('/billplz/audit', function (Request $request) {
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
-    $i = 0;
-    $totalAmount = 0;
-    foreach ($transactions as $transaction){
-        $response = Http::withBasicAuth(config('billplz.api_key').':', '')->get(config('billplz.base_url').'/api/v3/bills/'.$transaction->payment_reference);
-
-        if($response->successful()){
-            $data = $response->json();
-            if($data['paid']){
-
-            } else {
-
-                $transaction->status = ApprovalStatus::REJECTED;
-                $transaction->save();
-
-                $invoice = $transaction->owner;
-                $invoice->status = ApprovalStatus::APPROVED;
-
-                $totalAmount += $transaction->amount;
-                echo 'Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . " </br></br>";
-            }
-        }else{
-            echo "billplz error</br>";
-        }
 Route::get('/final-duplicated-invoice-debug', function(){
     $duplicatedTransactions = Transaction::select(DB::raw('owner_type, owner_id, receiver, type, GROUP_CONCAT(id) as transaction_ids, COUNT(*) as count'))
     ->whereNotIn('status', [ApprovalStatus::REJECTED,ApprovalStatus::SUSPENDED,ApprovalStatus::EXPIRED])
@@ -1041,31 +1016,31 @@ Route::get('/final-duplicated-invoice-debug', function(){
       <th style="border: 1px solid black" >Invoices</th>
     </tr>';
 
-foreach ($duplicatedTransactions as $transaction) {
-    $transactionIds = explode(',', $transaction->transaction_ids);
+    foreach ($duplicatedTransactions as $transaction) {
+        $transactionIds = explode(',', $transaction->transaction_ids);
 
-    $duplicatedInvoice = Transaction::whereIn('id', $transactionIds)->get(); 
- 
-    $order_reference = $duplicatedInvoice->first()->owner->owner->reference ?? null; 
+        $duplicatedInvoice = Transaction::whereIn('id', $transactionIds)->get(); 
+    
+        $order_reference = $duplicatedInvoice->first()->owner->owner->reference ?? null; 
 
-    if ($transaction->type == TransactionType::PAYMENT) {
-        $order_reference = $duplicatedInvoice->first()->owner->owner->owner->reference ?? null; 
-    }
-
-    echo '<tr>';
-        // echo '<td style="border: 1px solid black">' . $transaction->owner_type . '</td>';
-        // echo '<td style="border: 1px solid black">' . $transaction->owner_id . '</td>';
-        echo '<td style="border: 1px solid black">' . $transaction->receiver . '</td>';
-        echo '<td style="border: 1px solid black">' . '<a target="_blank" href="'.route('order.show', $order_reference).'">'. $order_reference .'</a>' . '</td>';
-        echo '<td style="border: 1px solid black">' . $transactionType[$transaction->type] . '</td>';
-        echo '<td style="border: 1px solid black">' . count($transactionIds) . '</td>';
-        echo '<td style="border: 1px solid black; text-align: left">';
-        foreach ($duplicatedInvoice as $invoice) {
-            echo '<p>ID: ' . $invoice->id . '. Status: ' . $approvalStatusArray[$invoice->status] . '. Amount: ' . $invoice->amount . '</p>';
+        if ($transaction->type == TransactionType::PAYMENT) {
+            $order_reference = $duplicatedInvoice->first()->owner->owner->owner->reference ?? null; 
         }
-        echo'</td>';
-    echo '</tr>';
-}
-echo '</table>';
+
+        echo '<tr>';
+            // echo '<td style="border: 1px solid black">' . $transaction->owner_type . '</td>';
+            // echo '<td style="border: 1px solid black">' . $transaction->owner_id . '</td>';
+            echo '<td style="border: 1px solid black">' . $transaction->receiver . '</td>';
+            echo '<td style="border: 1px solid black">' . '<a target="_blank" href="'.route('order.show', $order_reference).'">'. $order_reference .'</a>' . '</td>';
+            echo '<td style="border: 1px solid black">' . $transactionType[$transaction->type] . '</td>';
+            echo '<td style="border: 1px solid black">' . count($transactionIds) . '</td>';
+            echo '<td style="border: 1px solid black; text-align: left">';
+            foreach ($duplicatedInvoice as $invoice) {
+                echo '<p>ID: ' . $invoice->id . '. Status: ' . $approvalStatusArray[$invoice->status] . '. Amount: ' . $invoice->amount . '</p>';
+            }
+            echo'</td>';
+        echo '</tr>';
+    }
+    echo '</table>';
 });