Merge branch 'dillon/129-environment-variables' into vapor/staging

.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"
@@ -73,10 +73,10 @@ 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"
-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."

app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php

@@ -168,8 +168,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);
         }
 

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);

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
     ],

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'),
 ];

resources/views/pages/bookings/profile.blade.php

@@ -3,9 +3,11 @@
     <div class="row">
         <div class="col">
             <booking-details-section-component :marking={{$marking}}></booking-details-section-component>
+            {{--
             @if(!env('IS_PRODUCTION'))
-                {{--<a class="btn btn-xs all-caps b-rad-none btn-warning" href="{{ route('booking.merge', $marking)}}">Merge Transfer Orders</a>--}}
+                <a class="btn btn-xs all-caps b-rad-none btn-warning" href="{{ route('booking.merge', $marking)}}">Merge Transfer Orders</a>
             @endif
+            --}}
         </div>
     </div>
-@endsection
+@endsection