Benchmark cron job for YD API call

app/Classes/Jobs/FetchOrdersFromYDPortalJob.php

@@ -13,6 +13,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
 
 class FetchOrdersFromYDPortalJob implements ShouldQueue
 {
@@ -29,12 +30,17 @@ class FetchOrdersFromYDPortalJob implements ShouldQueue
      */
     public function handle()
     {
+        Log::info('FetchOrdersFromYDPortalJob starts');
+        Log::info('FetchPackingListsFromYdPortalProcessor starts');
         (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute();
+        Log::info('FetchContainersFromYdPortalProcessor starts');
         (App()->make(FetchContainersFromYdPortalProcessor::class))->execute();
+        Log::info('FetchContainersUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchContainersUpdatesFromYdPortalProcessor::class))->execute();
+        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor starts');
         (App()->make(FetchDeliveryUpdatesFromYdPortalProcessor::class))->execute();
-
-//        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
+        Log::info('FetchOrdersFromYDPortalJob ends');
+        //        (App()->make(FetchOrderListsFromYdPortalProcessor::class))->execute();
     }
 
 }

app/Classes/Modules/PackingLists/Processors/FetchDeliveryUpdatesFromYdPortalProcessor.php

@@ -76,6 +76,7 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
                 try {
                     $client = new \GuzzleHttp\Client(['cookies' => true, 'headers' => ['Cookie' => 'utc_offset=480']]);
 
+                    Log::info('Delivery tracking sTrackingNo: '. $packingList->reference);
                     $request = $client->request('get', 'https://main.universe.com.my/Tracking/User/Paging?sEcho=1&sTrackingNo='.$packingList->reference.'&sOrgId=sti', ['timeout' => 3]);
                     $deliveryTracking = json_decode($request->getBody()->getContents());
                     foreach (array_reverse($deliveryTracking->aaData) as $trackingRow) {
@@ -119,7 +120,7 @@ class FetchDeliveryUpdatesFromYdPortalProcessor
             }
 
         }
-
+        Log::info('FetchDeliveryUpdatesFromYdPortalProcessor ends');
     }
 }
 

app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php

@@ -114,7 +114,7 @@ class CreatePaymentTransactionProcessor
             /** @var Wallet $wallet */
             $wallet = $company_module->wallets()->first();
 
-            if((float) number_format(($wallet->amount - $amount),2) < 0){
+            if((float) number_format(($wallet->amount - $amount),2) < -0.01){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 

app/Console/Commands/FixApprovedPaymentFailedGroup.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Group;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class FixApprovedPaymentFailedGroup extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-approved-payment-failed-group';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix all payment is approved or completed but group failed to be updated';
+
+    protected $output = null;
+
+    protected $outputArray = [];
+
+    /** @var CallbackBillplzProcessor */
+    private $callbackBillplzProcessor;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct(CallbackBillplzProcessor $callbackBillplzProcessor)
+    {
+        parent::__construct();
+        $this->callbackBillplzProcessor = $callbackBillplzProcessor;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        ini_set('memory_limit', '-1');
+
+        $this->outputArray = [];
+        $start   = new Carbon();
+
+        $groups = Group::whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+            ->whereHas('payment', function ($query) {
+                $query->whereIn('status', [2, 3]);
+            })->get();
+
+        foreach ($groups as $group) {
+            $transaction = $group->payment;
+
+            $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->get(config('billplz.base_url') . '/api/v3/bills/' . $transaction->payment_reference);
+
+            dump($transaction->payment_reference);
+
+            if ($response->successful()) {
+                $data = $response->json();
+                if ($data['paid']) {
+                    $status = ApprovalStatus::PENDING_VERIFICATION;
+
+                    if ($data['state'] === 'paid') {
+                        $status = ApprovalStatus::APPROVED;
+                    }
+
+                    $this->info(Carbon::now() . ' : Fixing ' . $transaction->payment_reference);
+                    $this->callbackBillplzProcessor->execute($transaction, $status);
+                }
+            } else {
+                $this->info("billplz error</br>");
+            }
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        if ($groups) {
+            $this->info(Carbon::now() . ' : Done . ElapsedTime: ' . $elapsedTime);
+        }
+    }
+}

app/Models/Group.php

@@ -84,4 +84,12 @@ class Group extends Model implements Documentable, Transactionable
     {
         return $this->BelongsTo(Currency::class, 'original_currency_id', 'id');
     }
+
+    /**
+     * @return hasOne
+     */
+    public function payment()
+    {
+        return $this->hasOne(Transaction::class, 'payment_reference', 'reference');
+    }
 }

resources/assets/vue/components/paymentsBilling/elements/PaymentHistoryComponent.vue

@@ -92,6 +92,22 @@
                     </div>
                 </div>
             </div>
+            <div class="row bg-white padding-5" v-if="$store.getters.isSuperAdmin">
+                <div class="col-auto">
+                    <div class="font-heading fs-8 muted all-caps">Payment Method</div>
+                    <div class="font-heading fs-10">
+                        {{ convertPaymentMethodToText(item.payment_method) }}
+                    </div>
+                </div>
+                <div class="col-auto">
+                    <div class="font-heading fs-8 muted all-caps">Created At</div>
+                    <div class="font-heading fs-10">{{ item.created_at }}</div>
+                </div>
+                <div class="col-auto">
+                    <div class="font-heading fs-8 muted all-caps">Updated At</div>
+                    <div class="font-heading fs-10">{{ item.updated_at }}</div>
+                </div>
+            </div>
             <div class="row b-t b-grey" v-if="expandPaymentDetails">
                 <div class="col bg-white padding-15">
                     <!-- <div class="row align-items-end m-b-10 text-success bold">
@@ -198,6 +214,17 @@
                     this.expandPaymentDetails = !this.expandPaymentDetails;
                 }
             },
+            convertPaymentMethodToText(number) {
+                var paymentMethods = {
+                    1: "CASH",
+                    2: "CHEQUE",
+                    3: "BA",
+                    4: "WALLET",
+                    5: "PAYMENT_GATEWAY"
+                };
+                
+                return paymentMethods[number] || "Unknown Payment Method";
+            },
         },
         mixins: [componentHandler]
     }

routes/web.php

@@ -34,6 +34,7 @@ use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
+use App\Models\Group;
 use App\Models\Transaction;
 use App\Models\Wallet;
 use Illuminate\Support\Facades\DB;
@@ -1271,6 +1272,8 @@ Route::get('/payment-and-billing-2', function () {
 
 Route::get('/show-all-extra-payments', function () {
     ini_set('memory_limit', '-1');
+    ini_set('max_execution_time', 0);
+    $transactionCounter = 0;
 
     $invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)
         ->where('status', ApprovalStatus::COMPLETED)
@@ -1300,6 +1303,7 @@ Route::get('/show-all-extra-payments', function () {
         if (($paidAmount <= $invoice->amount) || ($paidAmount - $invoice->amount < 0.01)) {
             continue;
         }
+        $transactionCounter += 1;
 
         echo '<tr>';
         echo '<td>' . $invoice->type . '</td>';
@@ -1310,8 +1314,35 @@ Route::get('/show-all-extra-payments', function () {
         echo '</tr>';
     }
     echo '</table>';
+
+    echo'<br> Total: ' . $transactionCounter;
 });
 
 Route::get('/segments', function (Request $request) {
     return view('pages.segments.index');
 })->name('segments');
+
+Route::get('/group-transaction-with-completed-payments', function () {
+    $groups = Group::whereNotIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+        ->whereHas('payment', function ($query) {
+            $query->whereIn('status', [2, 3]);
+        })->get();
+
+    foreach ($groups as $group) {
+        $groupPayment = $group->payment;
+        $order = $group->groupTransactions->first()->transaction->owner->owner;
+        $companyModule = $order->companyModule;
+
+        $connection = $companyModule->connections()->first();
+        $companyMarking = $connection ? $connection->invitee_reference : '';
+
+        dump([
+            'reference' => $group->reference, 
+            'groupPayment_id' => $groupPayment->id, 
+            'groupPayment_status' => $groupPayment->status, 
+            'order' => $order->reference, 
+            'companyMarking' => $companyMarking, 
+        ]);
+        echo '<tr><td><a target="_blank" href="' . route('customer.payment-and-billing', $companyMarking) . '">' . $companyMarking . '</a><br></td></tr>';
+    }
+});