cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-27 16:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/137-project-upgrade-update-0-a' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2026-04-05 09:20:56 +08:00
parent 14cdda6071 48537a61a2
commit 11ce4dd7f9
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/LogHelper.php
+1
View File
@@ -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);
app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+6
View File
@@ -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.');
}
app/Classes/Modules/Bookings/ControllersLogic/ApprovePurchaseOrderLogic.php
+8 -1
View File
@@ -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
]
);
app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
+1 -1
View File
@@ -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];
app/Providers/AppServiceProvider.php
+3
View File
@@ -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
{