diff --git a/app/Classes/General/LogHelper.php b/app/Classes/General/LogHelper.php
index f74725b5..8c23f80f 100644
--- a/app/Classes/General/LogHelper.php
+++ b/app/Classes/General/LogHelper.php
@@ -19,6 +19,7 @@ class LogHelper
     {
         $envVar = env('LARAVEL_VAPOR_ENABLED');
         $isLocal = env('VAPOR_ENV') === 'local';
+        Log::info("Info: " . json_encode($message));
         Log::info("Info: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
         if ($envVar && !$isLocal) {
             Log::channel($this->channelName.'_vapor')->info($message);
diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index 42726384..38f047cd 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -86,6 +86,12 @@ class CallbackBillplzLogic
         $billplzXSignatureObject = new BillplzXSignatureObject($request);
 
         if(!$billplzXSignatureObject->isValidSignature()){
+            Log::info('Billplz signature validation failed', [
+                'computed_signature' => $billplzXSignatureObject->getBillPlzComputedXSignature(),
+                'request_signature' => $request->input('x_signature'),
+                'constructed_string' => $billplzXSignatureObject->getBillPlzConstructString(),
+                'request_data' => $request->all(),
+            ]); //cief todo: 137 - DEBUG
             throw new MalformedRequestException('Billplz Payment validation failed.');
         }
 
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
index 3360946a..254779fa 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
@@ -67,11 +67,18 @@ class ApprovePurchaseOrderLogic extends AbstractControllerLogic
 
         $this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED);
 
+        if($booking->invoice_status === ApprovalStatus::APPROVED){
+            $bookingOriginalStatus = ApprovalStatus::COMPLETED;
+        }
+        else{
+            $bookingOriginalStatus = $booking->status;
+        }
+
         $this->createInvoiceTransactionProcessor->execute($booking, "", null, [
                 'generateEInvoice' => false,
                 'generateEInvoiceWithNormalInvoiceTemplate' => false,
                 'generateEInvoiceRefund' => false,
-                'bookingOriginalStatus' => $booking->status
+                'bookingOriginalStatus' => $bookingOriginalStatus
             ]
         );
 
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
index bd26ed8e..b9914527 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
@@ -187,7 +187,7 @@ class ImportPurchaseOrderTransactionLogic extends AbstractControllerLogic
                 $sheet = $collection->first()->skip(1);
 
                 $products = $sheet->map(function ($row) {
-                    Log::info($row);
+                    Log::info('ImportPurchaseOrderTransactionLogic Row data: ' . json_encode($row));
                     $stockCode = $row[0];
                     $description = $row[1];
                     $quantity = $row[2];
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index e4866e98..4e1d6c11 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,6 +4,9 @@ namespace App\Providers;
 
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
 
 class AppServiceProvider extends ServiceProvider
 {