cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-25 07:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.8-jenkins-vapor' into vapor/production

Browse Source
This commit is contained in:
Dillon Ngo
2024-11-12 09:24:09 +08:00
parent 634a39b1ea 67969c63d3
commit 8295b80f73
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/General/LogHelper.php
+3 -3
View File
@@ -19,7 +19,7 @@ class LogHelper
{
$envVar = env('LARAVEL_VAPOR_ENABLED');
$isLocal = env('VAPOR_ENV') === 'local';
Log::info("LogHelper.info: {$message}， channelName： {$this->channelName}, envVar {$envVar}");
Log::info("Info: {$message}， channelName： {$this->channelName}, envVar {$envVar}");
if ($envVar && !$isLocal) {
Log::channel($this->channelName.'_vapor')->info($message);
}
@@ -32,7 +32,7 @@ class LogHelper
{
$envVar = env('LARAVEL_VAPOR_ENABLED');
$isLocal = env('VAPOR_ENV') === 'local';
Log::info("LogHelper.warning: {$message}， channelName： {$this->channelName}, envVar {$envVar}");
Log::info("Warning: {$message}， channelName： {$this->channelName}, envVar {$envVar}");
if ($envVar && !$isLocal) {
Log::channel($this->channelName . '_vapor')->warning($message);
} else {
@@ -44,7 +44,7 @@ class LogHelper
{
$envVar = env('LARAVEL_VAPOR_ENABLED');
$isLocal = env('VAPOR_ENV') === 'local';
Log::info("LogHelper.error: {$message}， channelName： {$this->channelName}, envVar {$envVar}");
Log::info("Error: {$message}， channelName： {$this->channelName}, envVar {$envVar}");
if ($envVar && !$isLocal) {
Log::channel($this->channelName . '_vapor')->error($message);
} else {
app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php
-1
View File
@@ -69,7 +69,6 @@ class ReleaseGoodsToCustomerProcessor
Log::channel('storage_invoices')->info('ReleaseGoodsToCustomerProcessor updatesTransactionStatus');
$this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
//cief todo: remove the following if block
if($invoice->type === TransactionType::STORAGE_INVOICE){
Log::channel('storage_invoices')->info('ReleaseGoodsToCustomerProcessor createStorageInvoiceDocTransactionProcessor');
$this->createStorageInvoiceDocTransactionProcessor->execute($packingList);
config/perfexcrm.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
return [
'base_url' => env('PERFEXCRM_BASE_URL', 'http://192.168.1.100:8084'), //cief todo: Update crm api domain here
'base_url' => env('PERFEXCRM_BASE_URL', 'http://192.168.1.100:8084'),
'api_key' => env('PERFEXCRM_API_KEY', ''),
'is_enabled' => env('PERFEXCRM_IS_ENABLED', 'true'),
];
resources/assets/vue/components/reports/sections/ServiceReportSectionPollingComponent.vue
-1
View File
@@ -321,7 +321,6 @@
}
},
errorHandler(error){
// console.log("Error: " + JSON.stringify(error));
this.$store.dispatch('updatePollingJobResultByJobId', {'jobId': this.getJob.jobId, 'isPolling': false, 'isFetchingResult': false });
},
fetchJobResult(isLastAttempt = false) {