Merge pull request 'DONE: add env based checking for whatsapp before testing at staging' (#18) from feature/env-based-whatsapp-cloud into main

Reviewed-on: #18

.env.example

@@ -89,6 +89,7 @@ DB_PASSWORD_11=G0dz!ll42020
 
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync
+
 MAX_MUTUEMAS=true
 
 TENNANT_MASTER_DB=master_erahn

.env.production

@@ -77,11 +77,12 @@ TENNANT_KAUNTER_DB=kaunter_erahn
 KAUNTER_URL=https://ujrah.erahn.com.my
 INTERNAL_NOTIFICATION_SECRET="nIDTe(u@6[)VLJyd"
 
-WHATSAPP_TOKEN=EAAZAonT56AO0BSlxZAKa8QX6HIWJpp5Czsz2KQ8BYE4iyZAe5fg8ZAmaSwZCXZCPf44xazDZAhaXLHJKHKUrUZCxei86EWl6Ar3RingfybZAlXp79Yd6WwOG5IZAnu9o5mevm895ygrs39H11G01fpYU2lYRpIWdn6URkTA0kMJdqZAlTaRILTjUM5KhvV05Q4lLAZDZD
-WHATSAPP_PHONE_NUMBER_ID=1323449077519027
+WHATSAPP_CLOUD_ENABLED=true
+WHATSAPP_TOKEN=EAAZAonT56AO0BSnZAhWLi4UXDRT6iAldbiybxSQZAnGrzIke1QiNWvQkZAbQQTjWeVZC5bL1gEBhW6ff3Shf79nowXiTQEwyxqgZAZB6ZATwFCeTs8MZA5H6ZA76IJBuVqRiAZBvZCfkeSurbUNpEWyi9W7zsT2GWiZCLX8meX0KCfDHu7cp4aBgVu1Ps5ZCRO3bP4ZCQZDZD
+WHATSAPP_PHONE_NUMBER_ID=1375899418935337
 WHATSAPP_API_VERSION=v25.0
-WHATSAPP_TEMPLATE=pembiayaan_online_paid
+WHATSAPP_TEMPLATE=hebahan_pembiayaan_online
 WHATSAPP_TEMPLATE_LANG=ms
 WHATSAPP_VERIFY_TOKEN=418ed86d49422071681c76bed25ae1cb7e90456c794a92f1c9ea417945a35a0a
 WHATSAPP_APP_SECRET=
-ADMIN_PHONE_NUMBER=60193450165
+ADMIN_PHONE_NUMBER=

.env.staging

@@ -4,14 +4,12 @@ APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa
 APP_DEBUG=true
 APP_URL=http://127.0.0.1:8090
 APP_TIMEZONE=Asia/Kuala_Lumpur
+API_ARRAHNBID=http://lelong.test/api/
+API_ARRAHNBID_ANNUR=http://lelong-annur.test/api/
 
-# Unique host ports — change these if they collide with other containers on the server.
-# Host nginx should proxy the staging domain to 127.0.0.1:${HTTP_PORT}
 HTTP_PORT=8090
 MYSQL_PUBLISH_PORT=3308
 
-MAX_MUTUEMAS=true
-
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
 LOG_SLACK_WEBHOOK_URL=
@@ -72,15 +70,30 @@ DB_DATABASE_6=erahn_test
 DB_USERNAME_6=root
 DB_PASSWORD_6=root
 
-# DB_CONNECTION_8=mysql
-# DB_HOST_8=mysql
-# DB_PORT_8=3306
-# DB_DATABASE_8=arrahn_klanas
-# DB_USERNAME_8=spider
-# DB_PASSWORD_8=G0dz!ll42020
+DB_CONNECTION_9=mysql
+DB_HOST_9=mysql
+DB_PORT_9=3306
+DB_DATABASE_9=annur_tampoi
+DB_USERNAME_9=root
+DB_PASSWORD_9=root
+
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+
+MAX_MUTUEMAS=true
 
 TENNANT_MASTER_DB=master_erahn
 TENNANT_KAUNTER_DB=kaunter_erahn
 
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
+KAUNTER_URL=https://staging.erahn.com.my/login
+INTERNAL_NOTIFICATION_SECRET=staging_noti_secret
+
+WHATSAPP_CLOUD_ENABLED=false
+WHATSAPP_TOKEN=EAAZAonT56AO0BSnZAhWLi4UXDRT6iAldbiybxSQZAnGrzIke1QiNWvQkZAbQQTjWeVZC5bL1gEBhW6ff3Shf79nowXiTQEwyxqgZAZB6ZATwFCeTs8MZA5H6ZA76IJBuVqRiAZBvZCfkeSurbUNpEWyi9W7zsT2GWiZCLX8meX0KCfDHu7cp4aBgVu1Ps5ZCRO3bP4ZCQZDZD
+WHATSAPP_PHONE_NUMBER_ID=1375899418935337
+WHATSAPP_API_VERSION=v25.0
+WHATSAPP_TEMPLATE=hebahan_pembiayaan_online
+WHATSAPP_TEMPLATE_LANG=ms
+WHATSAPP_VERIFY_TOKEN=418ed86d49422071681c76bed25ae1cb7e90456c794a92f1c9ea417945a35a0a
+WHATSAPP_APP_SECRET=
+ADMIN_PHONE_NUMBER=

app/Console/Commands/WhatsappTestSend.php

@@ -31,11 +31,12 @@ class WhatsappTestSend extends Command
         $bodyParams = [];
 
         if (strtolower($template) !== 'hello_world') {
+            // pembiayaan_online_paid: SAG, amaun, bank, 4 digit akhir, tarikh, rujukan
             $bodyParams = [
-                'Tampoi',
                 'TEST-SAG',
                 '100.00',
-                'Maybank ****1234',
+                'Maybank',
+                '1234',
                 date('d/m/Y'),
                 'TEST-REF',
             ];

app/Jobs/WhatsappPembiayaanOnlinePaid.php

@@ -54,10 +54,10 @@ class WhatsappPembiayaanOnlinePaid extends Job
         $storedPhone = $customer ? ($customer->telefon ?: $customer->telefon2) : null;
         $to = $client->normalizeMsisdn($storedPhone);
 
-        if (env('APP_ENV') !== 'production') {
+        if (!config('whatsapp.whatsapp_cloud_enabled')) {
             $admin = $client->normalizeMsisdn(env('ADMIN_PHONE_NUMBER'));
             if (!$admin) {
-                Log::warning('WhatsApp Cloud skipped: ADMIN_PHONE_NUMBER required when not production', [
+                Log::warning('WhatsApp Cloud skipped: ADMIN_PHONE_NUMBER required when WHATSAPP_ENABLED is false', [
                     'norujukan' => $this->norujukan,
                 ]);
                 $this->logBlast($now, $storedPhone, 'skipped: ADMIN_PHONE_NUMBER empty');
@@ -96,27 +96,29 @@ class WhatsappPembiayaanOnlinePaid extends Job
     }
 
     /**
-     * Matches pembiayaan_online_paid body: cawangan, SAG, amaun, akaun, tarikh, rujukan.
+     * Matches Meta template pembiayaan_online_paid (ms):
+     * AR-RAHN KoPKB: Pembiayaan bagi No. SAG *{{1}}* sebanyak *RM{{2}}*
+     * telah berjaya dikreditkan ke akaun *{{3}}* berakhir *{{4}}* pada *{{5}}*.
+     * Rujukan: *{{6}}*
+     *
+     * {{1}} SAG, {{2}} amaun, {{3}} nama bank/akaun, {{4}} 4 digit akhir, {{5}} tarikh, {{6}} rujukan bayaran
      *
      * @return array<int,string>
      */
     protected function bodyParams()
     {
-        $akaun = trim((string) $this->namaBank);
+        $bank = trim((string) $this->namaBank);
         $tail = $this->accountTail($this->noakaun);
-        if ($tail !== '') {
-            $akaun = trim($akaun . ' ' . $tail);
-        }
 
         $tarikh = $this->tarikhBayaran
             ? Carbon::parse($this->tarikhBayaran)->format('d/m/Y')
             : Carbon::now()->format('d/m/Y');
 
         return [
-            $this->cawName ?: $this->kodcaw,
             $this->norujukan ?: '-',
             number_format((float) $this->pinjaman, 2, '.', ''),
-            $akaun !== '' ? $akaun : '-',
+            $bank !== '' ? $bank : '-',
+            $tail !== '' ? $tail : '-',
             $tarikh,
             $this->noRujukanBayaran ?: '-',
         ];
@@ -129,7 +131,7 @@ class WhatsappPembiayaanOnlinePaid extends Job
             return '';
         }
 
-        return '****' . substr($digits, -4);
+        return substr($digits, -4);
     }
 
     protected function logBlast($now, $telefon, $status)

app/Services/PembiayaanOnline/PembiayaanOnlineService.php

@@ -1992,7 +1992,7 @@ class PembiayaanOnlineService
                 'slot' => 'BATCH2',
                 'label' => 'Batch 2',
                 'mula' => '11:00',
-                'cutoff' => '16:30',
+                'cutoff' => '15:00',
                 'proses' => '16:30',
             ],
         ];

config/whatsapp.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'whatsapp_cloud_enabled' => env('WHATSAPP_CLOUD_ENABLED', true),
     'token' => env('WHATSAPP_TOKEN'),
     'phone_number_id' => env('WHATSAPP_PHONE_NUMBER_ID'),
     'api_version' => env('WHATSAPP_API_VERSION', 'v25.0'),