From 917583beaff51e75a2fd9a754099f3f9ec839637 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 1 Oct 2024 17:16:25 +0800
Subject: [PATCH] Laravel Vapor - Code sync from Shipping Portal

---
 .env.example                      | 3 ++-
 app/Classes/General/LogHelper.php | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index b897aefa..bb284b4d 100644
--- a/.env.example
+++ b/.env.example
@@ -35,7 +35,7 @@ MAIL_FROM_NAME="${APP_NAME}"
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
+AWS_BUCKET=exchange-2.0-localhost
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
@@ -69,6 +69,7 @@ VOUCHERIFY_CLIENT_SECRET_KEY=""
 VOUCHERIFY_VERSION="v2018-08-01"
 VOUCHERIFY_URL="https://as1.api.voucherify.io"
 
+VAPOR_ENV=local
 LARAVEL_VAPOR_ENABLED=false
 COMMANDS_V2_ENABLED=false
 SENDING_EMAIL_ENABLED=false
diff --git a/app/Classes/General/LogHelper.php b/app/Classes/General/LogHelper.php
index 23d133c8..ffea115c 100644
--- a/app/Classes/General/LogHelper.php
+++ b/app/Classes/General/LogHelper.php
@@ -18,8 +18,9 @@ class LogHelper
     public function info($message)
     {
         $envVar = env('LARAVEL_VAPOR_ENABLED');
+        $isLocal = env('VAPOR_ENV') === 'local';
         Log::info("LogHelper.info: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar) {
+        if ($envVar && !$isLocal) {
             Log::channel($this->channelName.'_vapor')->info($message);
         }
         else{
@@ -30,8 +31,9 @@ class LogHelper
     public function warning($message)
     {
         $envVar = env('LARAVEL_VAPOR_ENABLED');
+        $isLocal = env('VAPOR_ENV') === 'local';
         Log::info("LogHelper.warning: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar) {
+        if ($envVar && !$isLocal) {
             Log::channel($this->channelName . '_vapor')->warning($message);
         } else {
             Log::channel($this->channelName)->warning($message);
@@ -41,8 +43,9 @@ class LogHelper
     public function error($message)
     {
         $envVar = env('LARAVEL_VAPOR_ENABLED');
+        $isLocal = env('VAPOR_ENV') === 'local';
         Log::info("LogHelper.error: {$message}， channelName： {$this->channelName},  envVar {$envVar}");
-        if ($envVar) {
+        if ($envVar && !$isLocal) {
             Log::channel($this->channelName . '_vapor')->error($message);
         } else {
             Log::channel($this->channelName)->error($message);