update fix conflicts

2026-08-19 04:24:12 +00:00 · 2023-03-19 04:41:40 +03:00
parent 9217970237 828f424cfd
commit 05ba0ba6fd
14 changed files with 333 additions and 40 deletions
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class DoesNotHavePaymentStatusIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDoesntHave('transactions', function (Builder $query) use($value) {
+            $query->where('type', TransactionType::PAYMENT)->whereIn('status', $value);
+        });
+    }
+}
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
+
+class HavePaymentStatusNotIn implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function (Builder $query) use($value) {
+            $query->where('type', TransactionType::PAYMENT)->whereNotIn('status', $value);
+        });
+    }
+}
@@ -21,6 +21,7 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 use Carbon\Carbon;

+
 class UpdatePerfexCRMInvoice implements ShouldQueue
 {
    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
@@ -60,6 +61,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
            if($invoiceStatus != PerfexCRMInvoiceStatus::PAID){
                //get project
                $projectId = "";
+                $projectName = "";
                if($transaction->owner instanceof Transaction){
                    $orderReference = $transaction->owner->owner->owner()->first()->reference;
                    $packingListReference = $transaction->owner->owner->reference;
@@ -70,6 +72,11 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
                    }
                }

+                if($projectId == ""){
+                    Log::error(json_encode('UpdatePerfexCRMInvoice debug: '.$projectName));
+                    Log::error(json_encode($transaction->owner));
+                }
+
                //update invoice
                (App()->make(UpdatesPerfexCRMInvoice::class))->execute($invoice, $projectId);
            }
@@ -106,11 +106,11 @@ class CallbackBillplzLogic
        $request->headers->set('Authorization', 'Bearer '.$token);

        // check if is wallet top up
-        if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED) {
+        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
            $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
        }
        
-        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
+        $this->updatesTransactionStatus->execute($transaction, $status);

        if(($invoice->amount - $transaction->amount) < 0.01 && !$transaction->owner instanceof Wallet) {
            $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
@@ -124,7 +124,7 @@ class CallbackBillplzLogic
            }
        }

-        $company_module_marking = $transaction->owner->owner->connections->first()->invitee_reference;
+        $company_module_marking = $transaction->owner->owner->connections? $transaction->owner->owner->connections->first()->invitee_reference: null;

        return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $order->reference ?? null, 'company_module_marking' => $company_module_marking ?? null, 'transaction' => $transaction, 'status' => $status]);
    }
@@ -14,6 +14,7 @@ use App\Classes\Modules\PerfexCRM\Services\CreatesPerfexCRMCustomerProject;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
 use App\Models\PackingList;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;

 class CreatePerfexCRMInvoiceProcessor
 {
@@ -67,7 +68,7 @@ class CreatePerfexCRMInvoiceProcessor
        }

        $date = Carbon::parse($transaction->created_at)->format('Y-m-d');
-        $dueDate = Carbon::parse($transaction->created_at)->format('Y-m-d');
+        $dueDate = Carbon::parse($transaction->created_at)->addDays(6)->startOfDay()->format('Y-m-d');
        $currency = 1; //cief TODO: To look into Malaysia and Chinese currency
        $subTotal = 0.00;
        $total = 0.00;
@@ -99,6 +100,7 @@ class CreatePerfexCRMInvoiceProcessor

        //get project
        $projectId = ""; //Project only exist in CRM if the customer already made payment
+        $projectName = "";
        if($isPaid){
            if($transaction->owner instanceof PackingList){
                $orderReference = $transaction->owner->owner->reference;
@@ -115,6 +117,11 @@ class CreatePerfexCRMInvoiceProcessor
                    }
                }
            }
+
+            if($projectId == ""){
+                Log::error(json_encode('CreatePerfexCRMInvoiceProcessor debug: '.$projectName));
+                Log::error(json_encode($transaction->owner));
+            }
        }

        //newitems
@@ -7,6 +7,7 @@ use App\Classes\ValueObjects\Constants\PerfexCRMTasks;
 use App\Classes\Jobs\UpdatePerfexCRM;
 use App\Models\PackingList;
 use App\Classes\ValueObjects\Constants\PerfexCRMProjectStatus;
+use Illuminate\Support\Facades\Log;

 class PackingListToPerfexCRMProcessor
 {
@@ -17,35 +18,41 @@ class PackingListToPerfexCRMProcessor
     */
    public function execute(PackingList $packingList)
    {
-        $order = $packingList->owner;
-        $companyModule  = $order->companyModule()->first();
-        $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
-        $companyName = $companyModule->name;
-        $companyReference = $connection ? $connection->pivot->invitee_reference:'';
-        $employee = $companyModule->employees()->first();
-        $contactEmail = $employee->email;
-        $contactName = $employee->name;
+        try {
+            $order = $packingList->owner;
+            $companyModule  = $order->companyModule()->first();
+            $connection = $companyModule->inviters()->withPivot('invitee_reference')->first();
+            $companyName = $companyModule->name;
+            $companyReference = $connection ? $connection->pivot->invitee_reference:'';
+            $employee = $companyModule->employees()->first();
+            $contactEmail = $employee->email;
+            $contactName = $employee->name;

-        $orderReference = $packingList->owner->reference;
-        $packingListReference = $packingList->reference;
-        $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;
+            $orderReference = $packingList->owner->reference;
+            $packingListReference = $packingList->reference;
+            $projectName = 'IZYIM | X1 Shipping | '.$orderReference.' | '.$packingListReference;

-        $updatePerfexCRMObject = new UpdatePerfexCRMObject(
-            $companyName,
-            $companyReference,
-            $contactName,
-            $contactEmail,
-            "",
-            $projectName,
-            PerfexCRMProjectStatus::NOT_STARTED,
-            [],
-            [
-                PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
-                PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
-            ]
-        );
-        UpdatePerfexCRM::dispatch($updatePerfexCRMObject);
+            $updatePerfexCRMObject = new UpdatePerfexCRMObject(
+                $companyName,
+                $companyReference,
+                $contactName,
+                $contactEmail,
+                "",
+                $projectName,
+                PerfexCRMProjectStatus::NOT_STARTED,
+                [],
+                [
+                    PerfexCRMTasks::TASK_LOADED_CONTAINER_1,
+                    PerfexCRMTasks::TASK_LOADED_CONTAINER_2,
+                ]
+            );
+            UpdatePerfexCRM::dispatch($updatePerfexCRMObject);

+        } catch (\Exception $exception){
+            Log::error(json_encode('PackingListToPerfexCRMProcessor debug:'));
+            Log::error(json_encode($packingList));
+            Log::error($exception);
+        }
        return true;
    }
 }
@@ -38,7 +38,7 @@ class UpdatesPerfexCRMInvoice
            $data = [
                'number' => $invoice->number,
                'date' => $invoice->date,
-                'duedate' => $invoice->date,
+                'duedate' => $invoice->duedate,
                'currency' => $invoice->currency,
                'subtotal' => $invoice->subtotal,
                'total' => $invoice->total,
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class AuditBillplz extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz:audit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Audit Billplz';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1'); 
+
+        $this->info(Carbon::now() . ' : Audit Billplz cron started.');
+        $start   = new Carbon();
+
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->get();
+        $totalTransactions = count($transactions);
+        $counter = 1;
+        $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 {
+                    $totalAmount += $transaction->amount;
+                    $this->info($counter . ' of ' . $totalTransactions . '. Order: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->owner->created_at->format('d-m-Y').' - Amount: '. $transaction->amount);
+                }
+            }else{
+                $this->info("billplz error</br>");
+            }
+            $counter++;
+        }
+    
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->info(Carbon::now() . ' : Done Audit Billplz. ElapsedTime: ' . $elapsedTime . '. Total: ' . $totalAmount);
+    }
+}
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class debugBillplzFailedPayment extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'billplz-failed-payment:debug';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', PaymentMethodType::PAYMENT_GATEWAY)->whereNotIn('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);
+    
+            // dd($response);
+
+            // dd($transaction->owner->owner->owner->reference);
+    
+            if($response->successful()){
+                $data = $response->json();
+                if($data['paid']){
+                    if (!in_array($transaction->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])) {
+                        $this->returnLog('Paid transaction', $transaction);
+                    }
+                } 
+                // else {
+                //     $totalAmount += $transaction->amount;
+                //     $this->returnLog('Unpaid Transaction', $transaction);
+                // }
+            }else{
+                $this->returnLog('billplz error', $transaction);
+            }
+        }
+    }
+
+    public function returnLog($text, $transaction) {
+        $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID;
+        $this->info($text . ' - id: '. $transaction->id . '. Order Marking: '. $transaction->owner->owner->owner->reference . ' - Date: '.$transaction->created_at->format('d-m-Y').' - Amount: '. $transaction->amount . '. Current Status: ' . $approvalStatusArray[$transaction->status]);
+    }
+}
@@ -27,6 +27,22 @@
                                                        </div>
                                                    </div>
                                                </div>
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paymentInProgress">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                width="35" height="35"
+                                                                viewBox="0 0 172 172"
+                                                                style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M39.81699,21.5l-18.31699,22.89414v106.10586h129v-2.15v-103.95586l-18.31699,-22.89414zM41.88301,25.8h88.23398l13.75664,17.2h-47.12363v2.15c0,5.96338 -4.78662,10.75 -10.75,10.75c-5.96338,0 -10.75,-4.78662 -10.75,-10.75v-2.15h-47.12363zM25.8,47.3h45.58672c1.08865,7.23076 7.08802,12.9 14.61328,12.9c7.52526,0 13.52463,-5.66924 14.61328,-12.9h45.58672v98.9h-120.4zM86,68.8c-15.41089,0 -27.95,12.53911 -27.95,27.95c0,15.41089 12.53911,27.95 27.95,27.95c15.41089,0 27.95,-12.53911 27.95,-27.95c0,-15.41089 -12.53911,-27.95 -27.95,-27.95zM86,73.1c13.087,0 23.65,10.563 23.65,23.65c0,13.087 -10.563,23.65 -23.65,23.65c-13.087,0 -23.65,-10.563 -23.65,-23.65c0,-13.087 10.563,-23.65 23.65,-23.65zM85.96641,77.37061c-1.18576,0.01854 -2.13264,0.9936 -2.11641,2.17939v16.125l-7.73916,5.80332c-0.95086,0.71198 -1.1445,2.05998 -0.43252,3.01084c0.71198,0.95086 2.05998,1.1445 3.01084,0.43252l9.46084,-7.09668v-18.275c0.00796,-0.58115 -0.21968,-1.14076 -0.63105,-1.55134c-0.41137,-0.41057 -0.97142,-0.63714 -1.55255,-0.62806zM38.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM47.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM55.9,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM64.5,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM73.1,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM81.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM90.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM98.9,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM107.5,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM116.1,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM124.7,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM133.3,135.45c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15z"></path></g></g>
+                                                            </svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Payment In Progress</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="paidInvoice">
                                                    <div class="row justify-content-center m-b-5">
                                                        <div class="col-auto">
@@ -52,12 +68,17 @@
                                <div class="col bg-master-lightest p-1 p-sm-4">
                                    <div class="row tabsContainer tabContent" tab-name="pendingPayment">
                                        <div class="col">
-                                            <customer-payment-billing-inner-component section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component section="customerPendingPaymentInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1, does_not_have_payment_status_in: [0,1]}"></customer-payment-billing-inner-component>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="paymentInProgress">
+                                        <div class="col">
+                                            <customer-payment-billing-inner-component section="customerPaymentInProgressInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [2], 'receiver': company_module_id, 'type': 1, have_payment_status_not_in: [2,3], order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
                                        </div>
                                    </div>
                                    <div class="row tabsContainer tabContent hide" tab-name="paidInvoice">
                                        <div class="col">
-                                            <customer-payment-billing-inner-component section="customerPaidInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [3], 'receiver': company_module_id, 'type': 1}"></customer-payment-billing-inner-component>
+                                            <customer-payment-billing-inner-component section="customerPaidInvoiceComponent" :company_module_id="company_module_id" :options="{'per_page': 10, order_by: {column: 'id', DESC: true}, 'status_in': [3], 'receiver': company_module_id, 'type': 1, order_by: {column: 'updated_at', DESC: true}}"></customer-payment-billing-inner-component>
                                        </div>
                                    </div>
                                </div>
@@ -23,6 +23,10 @@
                            <p class="no-margin fs-10 all-caps">Amount</p>
                            <div>MYR  {{ item.amount.toFixed(2) }}</div>
                        </div>
+                        <div class="col" v-if="section === 'customerPaidInvoiceComponent'">
+                            <p class="no-margin fs-10 all-caps">Payment Date</p>
+                            <div>{{ item.payment_history[item.payment_history.length-1].created_at }}</div>
+                        </div>
                        <div class="col-auto">
                            <div v-if="item.documents.length">
                                <div v-for="file in item.documents[0].files" v-bind:key="file.id" class="col-auto no-padding">
@@ -95,7 +95,7 @@
                                                <div class="col-auto">
                                                    <div class="font-heading fs-8 muted all-caps">Status</div>
                                                    <div class="font-heading fs-10 bold text-danger">
-                                                        Rejected
+                                                        {{ item.payment_method === 5 ? 'Failed' : 'Rejected' }}
                                                    </div>
                                                </div>
                                                <div class="col-auto p-l-0">
@@ -107,11 +107,21 @@
                                            </div>
                                            <div class="row">
                                                <div class="col">
-                                                    <div class="font-heading fs-8 all-caps" >Rejected On: {{ item.updated_at }}</div>
+                                                    <!-- <div class="font-heading fs-8 all-caps" >Rejected On: {{ item.updated_at }}</div> -->
+                                                    <div class="font-heading fs-8 all-caps" >{{ item.payment_method === 5 ? 'Failed' : 'Rejected' }} On: {{ item.updated_at }}</div>
                                                </div>
                                            </div>
                                        </div>
-                                        <div class="col-auto">
+                                        <div class="col-auto p-l-5 p-r-5 bg-success pointer" v-if="item.payment_method === 5">
+                                            <a :href="route('billplz.bill', item.reference)">
+                                                <div class="row align-items-center h-100">
+                                                    <div class="col">
+                                                        <i class="fa fa-repeat fs-20 text-white p-l-10 p-r-10"></i>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </div>
+                                        <div class="col-auto" v-else>
                                            <div class="row align-items-center h-100">
                                                <div class="col">
                                                    <i class="fa fa-ban text-danger"></i>
@@ -40,7 +40,7 @@
                                @endif
                                @if($company_module_marking)
                                    <a href="{{route('customer.payment-and-billing', $company_module_marking)}}">
-                                        <div class="btn btn-sm all-caps btn-success b-rad-none" >Back to Payment and Billing</div>
+                                        <div class="btn btn-sm all-caps btn-outline-primary b-rad-none" >Back to Payment and Billing</div>
                                    </a>
                                @endif
                            </div>
@@ -66,6 +66,11 @@
                                        <div class="btn btn-sm all-caps btn-success b-rad-none" >Back to Order</div>
                                    </a>
                                @endif
+                                @if($company_module_marking)
+                                    <a href="{{route('customer.payment-and-billing', $company_module_marking)}}">
+                                        <div class="btn btn-sm all-caps btn-outline-primary b-rad-none" >Back to Payment and Billing</div>
+                                    </a>
+                                @endif
                            </div>
                        </div>
                    </div>
@@ -83,7 +88,12 @@
                            <div class="col">
                                @if($marking)
                                    <a href="{{route('order.details', $marking)}}">
-                                        <div class="btn btn-sm all-caps btn-success b-rad-none" >Back to Order</div>
+                                        <div class="btn btn-sm all-caps btn-primary b-rad-none" >Back to Order</div>
+                                    </a>
+                                @endif
+                                @if($company_module_marking)
+                                    <a href="{{route('customer.payment-and-billing', $company_module_marking)}}">
+                                        <div class="btn btn-sm all-caps btn-outline-primary b-rad-none" >Back to Payment and Billing</div>
                                    </a>
                                @endif
                                <a href="{{route('billplz.bill', $transaction->payment_reference)}}">
@@ -967,9 +967,8 @@ Route::get('/wallet/{marking}/details', function ($marking) {

 Route::get('/wallet/audit', function (Request $request) {
    $wallets = \App\Models\Wallet::all();
-
    $i = 0;
-    foreach ($wallets as $wallet) {
+    foreach ($wallets as $wallet){
        $topups = 0;
        $credit = 0;
        $payments = 0;
@@ -992,3 +991,33 @@ 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>";
+        }
+    }
+
+    echo 'Total: ' . $totalAmount;
+});