From 0d7d306f3d8f0094ab3611ac58cc578c6cb1fae3 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 14 Jan 2026 13:03:40 +0800 Subject: [PATCH 1/6] Remove code, environment variable --- .env.example | 2 +- resources/views/pages/bookings/profile.blade.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index a3ebeffe..eb03c862 100644 --- a/.env.example +++ b/.env.example @@ -50,7 +50,7 @@ FILESYSTEM_DRIVER="documents" JWT_SECRET= JWT_TTL=1440 -IS_PRODUCTION=false +IS_PRODUCTION=false # deprecated, please do not use BILLPLZ_BASE_URL="https://www.billplz-sandbox.com" BILLPLZ_API_KEY="d25c6170-dc00-45cd-b226-d702b957870c" diff --git a/resources/views/pages/bookings/profile.blade.php b/resources/views/pages/bookings/profile.blade.php index d1e3925a..d145687b 100644 --- a/resources/views/pages/bookings/profile.blade.php +++ b/resources/views/pages/bookings/profile.blade.php @@ -3,9 +3,11 @@
+ {{-- @if(!env('IS_PRODUCTION')) - {{--Merge Transfer Orders--}} + Merge Transfer Orders @endif + --}}
-@endsection \ No newline at end of file +@endsection From 5298d03d27d1c690d1817b39eb4fc0621fe57f03 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 14 Jan 2026 13:21:36 +0800 Subject: [PATCH 2/6] environment variables example update --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index eb03c862..85196360 100644 --- a/.env.example +++ b/.env.example @@ -78,5 +78,5 @@ SENDING_EMAIL_WELCOME_VOUCHER_ENABLED=false E_INVOICE_START_DATE="2025-07-01 00:00:00" -MAINTENANCE_MESSAGE_TITLE="We'll be back online on 00:00 1/7/2025" +MAINTENANCE_MESSAGE_TITLE="" # default empty, e.g. We'll be back online on 00:00 1/7/2025 MAINTENANCE_MESSAGE="Sorry for the inconvenience but we're performing some maintenance at the moment." From 570adf183bf48ed2cf1f4b1eebb0569901659664 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 14 Jan 2026 13:23:41 +0800 Subject: [PATCH 3/6] Update environment variables --- .../Accounts/ControllersLogic/UserEmailVerificationLogic.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php index 13a8bcc7..db5888e8 100644 --- a/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php +++ b/app/Classes/Modules/Accounts/ControllersLogic/UserEmailVerificationLogic.php @@ -84,8 +84,7 @@ class UserEmailVerificationLogic extends AbstractControllerLogic $user = $attempt->user; $this->verifiesUser->execute($user); - // if (env('SENDING_EMAIL_WELCOME_VOUCHER_ENABLED', false)){ - if (app()->environment('production') && env('SENDING_EMAIL_WELCOME_VOUCHER_ENABLED', false)){ + if (app()->environment('production') && env('SENDING_EMAIL_WELCOME_VOUCHER_ENABLED', true)){ try{ //In case voucher got deleted unintentionally $voucher = $this->fetchesVoucher->execute(['code' => Vouchers::WELCOME_50_PERCENT_OFF]); if($voucher) $this->sendWelcomeVoucherEmail::dispatch($user, $voucher, 1); From 0fef8bcffcbb50d74c7b27a04da8b66ea0daded6 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 14 Jan 2026 13:41:53 +0800 Subject: [PATCH 4/6] Update environment variables --- config/voucherify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/voucherify.php b/config/voucherify.php index c97fab5b..78c67c7e 100644 --- a/config/voucherify.php +++ b/config/voucherify.php @@ -3,6 +3,6 @@ return [ 'application_id' => env('VOUCHERIFY_APPLICATION_ID', ''), 'client_secret_key' => env('VOUCHERIFY_CLIENT_SECRET_KEY', ''), - 'version' => env('VOUCHERIFY_VERSION', ''), - 'url' => env('VOUCHERIFY_URL', ''), + 'version' => env('VOUCHERIFY_VERSION', 'v2018-08-01'), + 'url' => env('VOUCHERIFY_URL', 'https://as1.api.voucherify.io'), ]; From 34d872a5cece6a6f41473be8c3fa32fc8fcbc87b Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 14 Jan 2026 14:00:59 +0800 Subject: [PATCH 5/6] Update environment variables - default --- .env.example | 4 ++-- .../Modules/Accounts/ControllersLogic/CreateCustomerLogic.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 85196360..ed6dedb2 100644 --- a/.env.example +++ b/.env.example @@ -73,8 +73,8 @@ VOUCHERIFY_URL="https://as1.api.voucherify.io" VAPOR_ENV=local LARAVEL_VAPOR_ENABLED=false COMMANDS_V2_ENABLED=false -SENDING_EMAIL_ENABLED=false -SENDING_EMAIL_WELCOME_VOUCHER_ENABLED=false +SENDING_EMAIL_ENABLED=true +SENDING_EMAIL_WELCOME_VOUCHER_ENABLED=true E_INVOICE_START_DATE="2025-07-01 00:00:00" diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php index c6c3a1b4..d4da4d34 100644 --- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php +++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php @@ -162,8 +162,8 @@ class CreateCustomerLogic extends AbstractControllerLogic CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject); } - $isSendingEmailEnabled = env('SENDING_EMAIL_ENABLED', false); - if($isSendingEmailEnabled){ + $isSendingEmailEnabled = env('SENDING_EMAIL_ENABLED', true); + if(app()->environment('production') && $isSendingEmailEnabled){ $this->generateEmailVerificationAttemptProcessor->execute($user); } From afc49aef0344fdc6a9325557d6ab851605e6d532 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Wed, 14 Jan 2026 14:15:39 +0800 Subject: [PATCH 6/6] Update environment variables - default --- config/logging.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/logging.php b/config/logging.php index eabe9a64..c2d7e1f4 100644 --- a/config/logging.php +++ b/config/logging.php @@ -147,7 +147,7 @@ return [ ], 'retention' => env('APP_ENV') === 'production' ? 90 : 14, 'level' => 'debug', - 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'), + 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX', 'exchange'), ], 'vue_polling_vapor' => [ @@ -165,7 +165,7 @@ return [ ], 'retention' => env('APP_ENV') === 'production' ? 90 : 14, 'level' => 'debug', - 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'), + 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX', 'exchange'), ], 'perfex_crm_vapor' => [ @@ -183,7 +183,7 @@ return [ ], 'retention' => env('APP_ENV') === 'production' ? 90 : 14, 'level' => 'debug', - 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'), + 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX', 'exchange'), ], 'request_path_vapor' => [ @@ -201,7 +201,7 @@ return [ ], 'retention' => env('APP_ENV') === 'production' ? 90 : 14, 'level' => 'debug', - 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX'), + 'groupNamePrefix' => env('CLOUDWATCH_LOGGROUP_PREFIX', 'exchange'), ], //Custom Log Channels - For Laravel Vapor AWS - Ends ],