15 Commits

Author SHA1 Message Date
ismailmasseran 2786b3be0c Fix/gadai online details (#23)
Build Docker Image / build-backend (push) Successful in 17s
Deploy to Staging / deploy (push) Successful in 19s
Co-authored-by: afrina <afrina@koppkb.com>
Reviewed-on: #23
2026-10-22 11:52:27 +08:00
afrina aac29bc199 Merge pull request 'fix: recalculate gadai totals after marhun edits' (#21) from fix/marhun-edit-gadai-totals into main
Build Docker Image / build-backend (push) Successful in 18s
Deploy to Staging / deploy (push) Successful in 17s
Reviewed-on: #21
2026-10-05 10:43:45 +08:00
nurafrinaalimi16 9e73f6ad32 fix: recalculate gadai totals after marhun edits 2026-10-05 10:39:19 +08:00
ISMAIL MASSERAN ff21d82af5 DONE: remove nginx for local docker compose 2026-10-01 13:45:34 +08:00
ismailmasseran 62c6d240ce Merge pull request 'DONE: update cicd to auto deploy on staging, clean up garbage files' (#20) from cicd/auto-deploy-staging into main
Build Docker Image / build-backend (push) Successful in 17s
Deploy to Staging / deploy (push) Successful in 17s
Reviewed-on: #20
2026-10-01 12:01:34 +08:00
ISMAIL MASSERAN 1ee7edefff DONE: update cicd to auto deploy on staging, clean up garbage files 2026-10-01 12:00:09 +08:00
ismailmasseran b52f4b6919 Merge pull request 'DONE: add password on laravel log viewer' (#19) from feature/add-pass-logviewer into main
Build Docker Image / build-backend (push) Successful in 18s
Reviewed-on: #19
2026-09-28 16:27:55 +08:00
ISMAIL MASSERAN b8e3e2b369 DONE: add password on laravel log viewer 2026-09-28 16:26:50 +08:00
ismailmasseran 3a86ba5b26 Merge pull request 'DONE: add env based checking for whatsapp before testing at staging' (#18) from feature/env-based-whatsapp-cloud into main
Build Docker Image / build-backend (push) Successful in 18s
Reviewed-on: #18
2026-09-28 10:30:11 +08:00
ISMAIL MASSERAN b1934e1627 DONE: add env based checking for whatsapp before testing at staging 2026-09-28 10:26:06 +08:00
ISMAIL MASSERAN 583d936fd2 DONE: update whatsapp message template
Build Docker Image / build-backend (push) Successful in 17s
2026-09-27 15:57:50 +08:00
ISMAIL MASSERAN 1076ecbaf2 DONE: update env.staging
Build Docker Image / build-backend (push) Successful in 26s
2026-09-26 18:51:47 +08:00
ismailmasseran 92894bad44 Merge pull request 'fix: change pembiayaan online batch 2 cutoff from 16:30 to 15:00' (#17) from fix/pembiayaan-online-batch2-cutoff into main
Reviewed-on: #17
2026-09-24 16:15:43 +08:00
nurafrinaalimi16 9916e81dba fix: change pembiayaan online batch 2 cutoff from 16:30 to 15:00 2026-09-24 16:14:44 +08:00
ismailmasseran 7fb7f75050 Feature/whatsapp blast (#16)
Build Docker Image / build-backend (push) Successful in 18s
Co-authored-by: ISMAIL MASSERAN <topaz@Mac.dlinkrouter.local>
Co-authored-by: ISMAIL MASSERAN <topaz@ISMAILs-Macbook.local>
Reviewed-on: #16
2026-09-24 11:27:48 +08:00
30 changed files with 1323 additions and 8155 deletions
+3
View File
@@ -64,5 +64,8 @@ DB_PASSWORD_7=root
TENNANT_MASTER_DB=master_erahn
TENNANT_KAUNTER_DB=kaunter_erahn
KAUNTER_URL=http://host.docker.internal:8081
INTERNAL_NOTIFICATION_SECRET=erahn-local-notification-secret
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
+15 -163
View File
@@ -87,172 +87,24 @@ DB_DATABASE_11=arrahn_pputeh
DB_USERNAME_11=spider
DB_PASSWORD_11=G0dz!ll42020
DB_CONNECTION_12=mysql
DB_HOST_12=127.0.0.1
DB_PORT_12=3306
DB_DATABASE_12=arrahn_rpanjang
DB_USERNAME_12=spider
DB_PASSWORD_12=G0dz!ll42020
DB_CONNECTION_13=mysql
DB_HOST_13=127.0.0.1
DB_PORT_13=3306
DB_DATABASE_13=arrahn_tmerah
DB_USERNAME_13=spider
DB_PASSWORD_13=G0dz!ll42020
DB_CONNECTION_14=mysql
DB_HOST_14=127.0.0.1
DB_PORT_14=3306
DB_DATABASE_14=arrahn_wb
DB_USERNAME_14=spider
DB_PASSWORD_14=G0dz!ll42020
DB_CONNECTION_15=mysql
DB_HOST_15=127.0.0.1
DB_PORT_15=3306
DB_DATABASE_15=arrahn_wcy
DB_USERNAME_15=spider
DB_PASSWORD_15=G0dz!ll42020
DB_CONNECTION_16=mysql
DB_HOST_16=127.0.0.1
DB_PORT_16=3306
DB_DATABASE_16=arrahn_bentong
DB_USERNAME_16=spider
DB_PASSWORD_16=G0dz!ll42020
DB_CONNECTION_17=mysql
DB_HOST_17=192.168.0.102
DB_PORT_17=3306
DB_DATABASE_17=arrahn_kajang
DB_USERNAME_17=spider
DB_PASSWORD_17=G0dz!ll42020
DB_CONNECTION_18=mysql
DB_HOST_18=192.168.0.102
DB_PORT_18=3306
DB_DATABASE_18=arrahn_kangar
DB_USERNAME_18=spider
DB_PASSWORD_18=G0dz!ll42020
DB_CONNECTION_19=mysql
DB_HOST_19=192.168.0.102
DB_PORT_19=3306
DB_DATABASE_19=arrahn_kuantan
DB_USERNAME_19=spider
DB_PASSWORD_19=G0dz!ll42020
DB_CONNECTION_20=mysql
DB_HOST_20=192.168.0.102
DB_PORT_20=3306
DB_DATABASE_20=arrahn_pgudang
DB_USERNAME_20=spider
DB_PASSWORD_20=G0dz!ll42020
DB_CONNECTION_21=mysql
DB_HOST_21=192.168.0.102
DB_PORT_21=3306
DB_DATABASE_21=arrahn_raub
DB_USERNAME_21=spider
DB_PASSWORD_21=G0dz!ll42020
DB_CONNECTION_22=mysql
DB_HOST_22=192.168.0.102
DB_PORT_22=3306
DB_DATABASE_22=arrahn_rlaut
DB_USERNAME_22=spider
DB_PASSWORD_22=G0dz!ll42020
DB_CONNECTION_23=mysql
DB_HOST_23=192.168.0.102
DB_PORT_23=3306
DB_DATABASE_23=arrahn_skudai
DB_USERNAME_23=spider
DB_PASSWORD_23=G0dz!ll42020
DB_CONNECTION_24=mysql
DB_HOST_24=192.168.0.102
DB_PORT_24=3306
DB_DATABASE_24=arrahn_spetani
DB_USERNAME_24=spider
DB_PASSWORD_24=G0dz!ll42020
DB_CONNECTION_25=mysql
DB_HOST_25=192.168.0.102
DB_PORT_25=3306
DB_DATABASE_25=arrahn_temerloh
DB_USERNAME_25=spider
DB_PASSWORD_25=G0dz!ll42020
DB_CONNECTION_26=mysql
DB_HOST_26=192.168.0.103
DB_PORT_26=3306
DB_DATABASE_26=arrahn_api2
DB_USERNAME_26=spider
DB_PASSWORD_26=G0dz!ll42020
DB_CONNECTION_27=mysql
DB_HOST_27=192.168.0.103
DB_PORT_27=3306
DB_DATABASE_27=arrahn_beaufort
DB_USERNAME_27=spider
DB_PASSWORD_27=G0dz!ll42020
DB_CONNECTION_28=mysql
DB_HOST_28=192.168.0.103
DB_PORT_28=3306
DB_DATABASE_28=arrahn_kbelud
DB_USERNAME_28=spider
DB_PASSWORD_28=G0dz!ll42020
DB_CONNECTION_29=mysql
DB_HOST_29=192.168.0.103
DB_PORT_29=3306
DB_DATABASE_29=arrahn_keningau
DB_USERNAME_29=spider
DB_PASSWORD_29=G0dz!ll42020
DB_CONNECTION_30=mysql
DB_HOST_30=192.168.0.103
DB_PORT_30=3306
DB_DATABASE_30=arrahn_putatan
DB_USERNAME_30=spider
DB_PASSWORD_30=G0dz!ll42020
DB_CONNECTION_31=mysql
DB_HOST_31=192.168.0.103
DB_PORT_31=3306
DB_DATABASE_31=arrahn_sandakan
DB_USERNAME_31=spider
DB_PASSWORD_31=G0dz!ll42020
DB_CONNECTION_32=mysql
DB_HOST_32=192.168.0.103
DB_PORT_32=3306
DB_DATABASE_32=arrahn_tawau
DB_USERNAME_32=spider
DB_PASSWORD_32=G0dz!ll42020
DB_CONNECTION_33=mysql
DB_HOST_33=192.168.0.103
DB_PORT_33=3306
DB_DATABASE_33=arrahn_tuaran
DB_USERNAME_33=spider
DB_PASSWORD_33=G0dz!ll42020
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
WABOT_API=https://md.wabot.my/api/send.php
WABOT_INSTANCES_ID=63F40BD120DB4
# WABOT_INSTANCES_ID=64892FD7440A6
WABOT_TOKEN_KEYS=cbee7e95cf3ffbfa0531d5fddfd44f87
MAX_MUTUEMAS=true
TENNANT_MASTER_DB=master_erahn
TENNANT_KAUNTER_DB=kaunter_erahn
ONEWAYSMS_API=http://gateway.onewaysms.com.my:10001/api.aspx
ONEWAYSMS_AUTH_USER=APIUK330HDAFO
ONEWAYSMS_AUTH_PASS=APIUK330HDAFOUK330
KAUNTER_URL=http://host.docker.internal:8081
INTERNAL_NOTIFICATION_SECRET=
ADMIN_PHONE_NUMBER=60178916936
ACTIVE_JOB_SERVER=false
LOGVIEWER_PASSWORD=
WHATSAPP_TOKEN= # Paste token from Graph API explorer.
WHATSAPP_PHONE_NUMBER_ID=1323449077519027
WHATSAPP_API_VERSION=v25.0
WHATSAPP_TEMPLATE=hello_world
WHATSAPP_TEMPLATE_LANG=en_US
WHATSAPP_VERIFY_TOKEN= # webhook verify token
WHATSAPP_APP_SECRET= # X-Hub-Signature-256 checks; need to be enable first
ADMIN_PHONE_NUMBER=60193450165
+24 -2
View File
@@ -9,6 +9,7 @@ API_ARRAHNBID_ANNUR=https://adminbid-annur.erahn.com.my/api/
LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
LOGVIEWER_PASSWORD="$2y$10$k7eiUyZdm3BruwAaT1gbmelTm.PPgZptOEQT1nlBjyiR84a4KBMlm"
DB_CONNECTION_2=mysql
DB_HOST_2=192.168.1.216
@@ -59,9 +60,30 @@ DB_DATABASE_7=master_erahn
DB_USERNAME_7=spider
DB_PASSWORD_7=arrahn@123
MAX_MUTUEMAS=true
DB_CONNECTION_9=mysql
DB_HOST_9=192.168.1.216
DB_PORT_9=3306
DB_DATABASE_9=annur_tampoi
DB_USERNAME_9=spider
DB_PASSWORD_9=arrahn@123
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
TENNANT_MASTER_DB=master_erahn
MAX_MUTUEMAS=true
TENNANT_MASTER_DB=master_erahn
TENNANT_KAUNTER_DB=kaunter_erahn
KAUNTER_URL=https://ujrah.erahn.com.my
INTERNAL_NOTIFICATION_SECRET="nIDTe(u@6[)VLJyd"
WHATSAPP_CLOUD_ENABLED=true
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=
+26 -12
View File
@@ -4,17 +4,16 @@ 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=
LOGVIEWER_PASSWORD=test123
DB_CONNECTION=mysql
DB_HOST=mysql
@@ -72,15 +71,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=
+37 -18
View File
@@ -1,6 +1,9 @@
name: Deploy to Staging
on:
push:
tags:
- "v*"
workflow_dispatch:
inputs:
image_tag:
@@ -18,10 +21,22 @@ jobs:
runs-on: host
steps:
- name: Resolve image tag
id: resolve
run: |
set -e
if [ "${{ gitea.event_name }}" = "workflow_dispatch" ]; then
IMAGE_TAG="${{ inputs.image_tag }}"
else
IMAGE_TAG="${{ gitea.ref_name }}"
fi
echo "IMAGE_TAG=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
echo "Deploying image tag: ${IMAGE_TAG}"
- name: Checkout repository
uses: actions/checkout@v4
with:
ref: ${{ inputs.image_tag }}
ref: ${{ steps.resolve.outputs.IMAGE_TAG }}
- name: Login to Docker registry
run: |
@@ -33,43 +48,47 @@ jobs:
- name: Verify image exists in registry
run: |
set -e
IMAGE_TAG="${{ inputs.image_tag }}"
IMAGE_TAG="${{ steps.resolve.outputs.IMAGE_TAG }}"
IMAGE="${APP_IMAGE}:${IMAGE_TAG}"
echo "Checking if image exists: ${IMAGE}"
if ! docker manifest inspect "${IMAGE}" > /dev/null 2>&1; then
echo "ERROR: Image ${IMAGE} does not exist in registry!"
echo "Run the Build Docker Image workflow first."
exit 1
fi
echo "✓ ${IMAGE} found"
# Tag pushes build in parallel — wait for the image to appear
for i in $(seq 1 30); do
if docker manifest inspect "${IMAGE}" > /dev/null 2>&1; then
echo "✓ ${IMAGE} found"
exit 0
fi
echo "Image not ready yet (attempt ${i}/30), waiting 20s..."
sleep 20
done
echo "ERROR: Image ${IMAGE} does not exist in registry after waiting!"
echo "Run the Build Docker Image workflow first."
exit 1
- name: Pull Docker image
run: |
set -e
IMAGE_TAG="${{ inputs.image_tag }}"
IMAGE_TAG="${{ steps.resolve.outputs.IMAGE_TAG }}"
docker pull "${APP_IMAGE}:${IMAGE_TAG}"
echo "✓ Image pulled successfully"
- name: Sync compose file and deploy
run: |
set -e
IMAGE_TAG="${{ inputs.image_tag }}"
IMAGE_TAG="${{ steps.resolve.outputs.IMAGE_TAG }}"
mkdir -p "${DEPLOY_DIR}/docker/nginx" "${DEPLOY_DIR}/docker/mysql"
cp docker-compose.staging.yml "${DEPLOY_DIR}/docker-compose.yml"
cp docker/nginx/default.conf "${DEPLOY_DIR}/docker/nginx/default.conf"
cp -R docker/mysql/init "${DEPLOY_DIR}/docker/mysql/"
if [ ! -f "${DEPLOY_DIR}/.env.staging" ]; then
if [ -f .env.staging ]; then
cp .env.staging "${DEPLOY_DIR}/.env.staging"
echo "Copied .env.staging from repo (first deploy). Edit ${DEPLOY_DIR}/.env.staging on the server if needed."
else
echo "ERROR: ${DEPLOY_DIR}/.env.staging is missing on the server"
exit 1
fi
if [ ! -f .env.staging ]; then
echo "ERROR: .env.staging is missing in the repository"
exit 1
fi
cp .env.staging "${DEPLOY_DIR}/.env.staging"
echo "✓ Synced .env.staging from repo"
cd "${DEPLOY_DIR}"
+56
View File
@@ -0,0 +1,56 @@
<?php
namespace App\Console\Commands;
use App\Services\Whatsapp\WhatsappCloudClient;
use Illuminate\Console\Command;
class WhatsappTestSend extends Command
{
protected $signature = 'whatsapp:test {--to= : Recipient MSISDN, default ADMIN_PHONE_NUMBER}';
protected $description = 'Send the configured WhatsApp Cloud template to a test number';
public function handle()
{
$client = new WhatsappCloudClient();
if (!$client->isConfigured()) {
$this->error('Set WHATSAPP_TOKEN and WHATSAPP_PHONE_NUMBER_ID in .env first.');
return 1;
}
$to = $client->normalizeMsisdn($this->option('to') ?: env('ADMIN_PHONE_NUMBER'));
if (!$to) {
$this->error('Pass --to=60193450165 or set ADMIN_PHONE_NUMBER.');
return 1;
}
$template = config('whatsapp.template', 'hello_world');
$lang = config('whatsapp.template_lang', 'en_US');
$bodyParams = [];
if (strtolower($template) !== 'hello_world') {
// pembiayaan_online_paid: SAG, amaun, bank, 4 digit akhir, tarikh, rujukan
$bodyParams = [
'TEST-SAG',
'100.00',
'Maybank',
'1234',
date('d/m/Y'),
'TEST-REF',
];
}
$this->info("Sending {$template} ({$lang}) to {$to} …");
$response = $client->sendTemplate($to, $template, $lang, $bodyParams);
if ($response->successful()) {
$this->info('OK ' . $response->status() . ' ' . $response->body());
return 0;
}
$this->error('FAIL ' . $response->status() . ' ' . $response->body());
return 1;
}
}
+1
View File
@@ -24,6 +24,7 @@ class Kernel extends ConsoleKernel
Commands\ClearCachesAll::class,
Commands\RestartSupervisor::class,
Commands\InsertSempornaData::class,
Commands\WhatsappTestSend::class,
//Commands\ImportCsv::class,
];
+128 -13
View File
@@ -8,6 +8,7 @@ use App\Cawangan;
use App\Mohonid;
use App\MohonAnggota;
use App\Customer;
use App\Services\StaffNotificationClient;
use Carbon\Carbon;
@@ -444,6 +445,8 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
$audit->updated_at = $harini;
$audit->save();
$this->notifyOperasiAssignAnggota($kodcaw, $cawangan, $kelulusan, $request);
// ✅ Return JSON response ke frontend
return response()->json([
'success' => true,
@@ -466,6 +469,58 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
}
}
/**
* Inbox for all operasi staff. Failures must not block the teller request.
*
* @param string $kodcaw
* @param \App\Cawangan $cawangan
* @param \App\MohonAnggota $kelulusan
* @param \Illuminate\Http\Request $request
* @return void
*/
protected function notifyOperasiAssignAnggota($kodcaw, $cawangan, $kelulusan, Request $request)
{
try {
$nama = trim((string) ($request->nama ?? ''));
if ($nama === '' && !empty($kelulusan->nokp)) {
$customer = Customer::on('mysql7')
->where('kpbaru', $kelulusan->nokp)
->orWhere('kplama', $kelulusan->nokp)
->first();
if ($customer && !empty($customer->nama)) {
$nama = trim((string) $customer->nama);
}
}
$namaCaw = $kodcaw;
if ($cawangan) {
$resolved = trim((string) $cawangan->nama_cawangan);
if ($resolved !== '') {
$namaCaw = $resolved;
}
}
app(StaffNotificationClient::class)->notify([
'type' => 'anggota.pending_operasi',
'cawangan' => $kodcaw,
'audience' => ['role' => 'operasi'],
'data' => [
'id' => $kelulusan->id,
'nokp' => $kelulusan->nokp,
'nama' => $nama,
'teller' => $kelulusan->teller,
'komen' => $kelulusan->komen,
'cawangan_nama' => $namaCaw,
],
]);
} catch (\Throwable $e) {
Log::warning('Assign anggota operasi notification failed: '.$e->getMessage(), [
'kodcaw' => $kodcaw,
'nokp' => isset($kelulusan->nokp) ? $kelulusan->nokp : null,
]);
}
}
//KEPOHONAN EDIT DAN HAPUS
public function kepohonancreate(REQUEST $request,$kodcaw,$norujukan)
@@ -600,26 +655,86 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles)
return response()->json($arraykelulusan,200);
}
public function listoperasikelulusan()
public function listoperasikelulusan(Request $request)
{
$harini = Carbon::now();
$harini = new Carbon;
$dateFrom = $request->query('date_from');
$dateTo = $request->query('date_to');
$search = trim((string) $request->query('search', ''));
// Default to last 30 days to avoid loading entire history
if (!$dateFrom && !$dateTo) {
$dateTo = Carbon::now()->toDateString();
$dateFrom = Carbon::now()->subDays(30)->toDateString();
}
$cawangan_all = Cawangan::on('mysql7')
->select('mysql', 'details_caw', 'kodcaw')
->get();
$cawangan_all = Cawangan::on('mysql7')->get();
$arraykelulusan = [];
foreach($cawangan_all as $index=>$cawangan){
$kelulusan=Mohon::on($cawangan['mysql'])
->where('peloperasi','=','operasi')
->where('operasi','!=','')
->get();
foreach ($cawangan_all as $cawangan) {
$query = Mohon::on($cawangan['mysql'])
->select([
'tarikh',
'norujukan',
'komen',
'jumpinj',
'nilaimarhun',
'berat',
'margin',
'status',
'operasi',
'masalulus',
])
->where('peloperasi', '=', 'operasi')
->where('operasi', '!=', '');
if(sizeof($kelulusan) != 0){
array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]);
if ($dateFrom) {
$query->where('tarikh', '>=', $dateFrom);
}
if ($dateTo) {
$query->where('tarikh', '<=', $dateTo);
}
if ($search !== '') {
$query->where(function ($q) use ($search) {
$q->where('norujukan', 'like', "%{$search}%")
->orWhere('operasi', 'like', "%{$search}%")
->orWhere('status', 'like', "%{$search}%")
->orWhere('komen', 'like', "%{$search}%");
});
}
}
return response()->json($arraykelulusan,200);
$kelulusan = $query->orderBy('tarikh', 'desc')->get();
foreach ($kelulusan as $kel) {
$komenParts = explode('|', (string) ($kel->komen ?? ''));
$komenParts = array_values(array_filter($komenParts, function ($part) {
return $part !== '';
}));
$arraykelulusan[] = [
'tarikh' => $kel->tarikh ?? '-',
'norujukan' => $kel->norujukan ?? '-',
'status' => $kel->status ?? '-',
'komen' => $komenParts[0] ?? ($kel->komen ?: '-'),
'pinjaman' => $kel->jumpinj ?? '-',
'nilaimarhun' => $komenParts[1] ?? ($kel->nilaimarhun ?? '-'),
'berat' => $komenParts[2] ?? ($kel->berat ?? '-'),
'margin' => $komenParts[3] ?? ($kel->margin ?? '-'),
'pelulus' => $kel->operasi ?? '-',
'masalulus' => $kel->masalulus ?? '-',
'cawangan' => $cawangan['details_caw'],
'cawangankod' => $cawangan['kodcaw'],
];
}
}
usort($arraykelulusan, function ($a, $b) {
return strcmp((string) ($b['tarikh'] ?? ''), (string) ($a['tarikh'] ?? ''));
});
return response()->json($arraykelulusan, 200);
}
public function UpdateHapusAnsuranOperasi(Request $request){
+43 -28
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Marhun;
use App\Gadai;
use App\Jemas;
use App\Cawangan;
use Illuminate\Http\Request;
@@ -160,39 +161,53 @@ class MarhunController extends Controller
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
// Lock the parent first so concurrent edits to this SAG are serialized.
(new Marhun)->setConnection($cawangan['mysql'])->getConnection()->transaction(function () use ($cawangan, $norujukan, $request, $harga, $nilai_marhun, $kodcaw, $current) {
Gadai::on($cawangan['mysql'])->where('norujukan', $norujukan)->lockForUpdate()->firstOrFail();
$old_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->firstOrFail();
$marhunToUpdate = [
'karat' => $request->karat,
'marhun' => $request->marhun,
'nota' => $request->nota,
'tag_permata' => $request->tag_permata,
'berat_batu_permata' => $request->berat_batu_permata,
'berat' => $request->berat,
'harga' => $harga['harga'],
'n_marhun' => $nilai_marhun,
'bil' => $request->kuantiti,
];
$marhunToUpdate = [
'karat' => $request->karat,
'marhun' => $request->marhun,
'nota' => $request->nota,
'tag_permata' => $request->tag_permata,
'berat_batu_permata' => $request->berat_batu_permata,
'berat' => $request->berat,
'harga' => $harga['harga'],
'n_marhun' => $nilai_marhun,
'bil' => $request->kuantiti,
];
// Set value berat_batu_permata to null if value passed is null
if($marhunToUpdate['berat_batu_permata'] == '') {
$marhunToUpdate['berat_batu_permata'] = null;
};
// Set value berat_batu_permata to null if value passed is null
if($marhunToUpdate['berat_batu_permata'] == '') {
$marhunToUpdate['berat_batu_permata'] = null;
};
$jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update($marhunToUpdate);
$jemas = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->update($marhunToUpdate);
$new_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
// Recalculate from every item belonging to this SAG, after the edit.
$totals = Marhun::on($cawangan['mysql'])->where('norujukan', $norujukan)
->selectRaw('COALESCE(SUM(berat), 0) AS total_berat, COALESCE(SUM(n_marhun), 0) AS total_nilai, COALESCE(SUM(bil), 0) AS total_kuantiti')
->first();
Gadai::on($cawangan['mysql'])->where('norujukan', $norujukan)->update([
'berat' => $totals->total_berat,
'nilaimarhun' => $totals->total_nilai,
'kuantiti' => $totals->total_kuantiti,
]);
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = 'Ubah Marhun';
$audit->norujukan = $norujukan;
$audit->old_data = $old_data;
$audit->new_data = $new_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
$new_data = Marhun::on($cawangan['mysql'])->where([['recno','=',$request->recno],['norujukan','=',$norujukan]])->first();
$audit = new Audit();
$audit->users = $request->teller;
$audit->actions = 'Ubah Marhun';
$audit->norujukan = $norujukan;
$audit->old_data = $old_data;
$audit->new_data = $new_data;
$audit->kodcaw = $kodcaw;
$audit->created_at = $current;
$audit->updated_at = $current;
$audit->save();
});
return response('Edit Successfully', 200);
}
@@ -62,6 +62,7 @@ class PembiayaanOnlineController extends Controller
'kodbank', 'noakaun', 'nama_bank', 'nama_akaun', 'nota',
'bukti_akaun_file_id', 'borang_file_id', 'update_customer_bank',
'bukti_akaun_data', 'bukti_akaun_filename', 'bukti_akaun_type',
'borang_data', 'borang_filename', 'borang_type',
] as $key) {
if ($request->has($key)) {
$input[$key] = $request->input($key);
@@ -214,6 +215,14 @@ class PembiayaanOnlineController extends Controller
return $this->respond($this->service->getBuktiAkaun($kodcaw, $id));
}
/**
* GET /api/pembiayaan-online/{kodcaw}/lines/{id}/borang
*/
public function getBorang($kodcaw, $id)
{
return $this->respond($this->service->getBorang($kodcaw, $id));
}
/**
* GET /api/pembiayaan-online/{kodcaw}/paid?blast_sent=0
*/
+45
View File
@@ -13,6 +13,7 @@ use App\Vault;
use Auth0\SDK\API\Management\Users;
use Illuminate\Http\Request;
use Carbon\Carbon;
use App\Services\StaffNotificationClient;
use Illuminate\Support\Facades\Log;
class TunaiController extends Controller
{
@@ -476,10 +477,54 @@ class TunaiController extends Controller
$audit->updated_at = $current;
$audit->save();
$this->notifyKhazanahAliranTunai($kodcaw, $request, $reqteller);
return response()->json($reqteller,200);
}
/**
* Inbox for PC/PPC at the branch. Failures must not block the request.
*
* @param string $kodcaw
* @param \Illuminate\Http\Request $request
* @param \App\RequestTeller $reqteller
* @return void
*/
protected function notifyKhazanahAliranTunai($kodcaw, Request $request, $reqteller)
{
try {
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
$namaCaw = $kodcaw;
if ($cawangan) {
$nama = trim((string) $cawangan->nama_cawangan);
if ($nama !== '') {
$namaCaw = $nama;
}
}
$modal = (float) $request->modal;
$serahan = (float) $request->serahan;
app(StaffNotificationClient::class)->notify([
'type' => 'aliran_tunai.pending_khazanah',
'cawangan' => $kodcaw,
'audience' => ['role' => 'pc'],
'data' => [
'request_no' => isset($reqteller->no) ? $reqteller->no : null,
'kodlaluan' => $request->kodlaluan,
'modal' => $modal,
'serahan' => $serahan,
'cawangan_nama' => $namaCaw,
],
]);
} catch (\Throwable $e) {
Log::warning('Aliran tunai khazanah notification failed: '.$e->getMessage(), [
'kodcaw' => $kodcaw,
'kodlaluan' => $request->kodlaluan,
]);
}
}
public function getTunaiSemalam($kodcaw)
{
$current = new Carbon();
@@ -0,0 +1,122 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
/**
* Meta WhatsApp Cloud webhook: verify challenge + acknowledge events.
* Sufficient for production onboarding; delivery statuses are logged only.
*/
class WhatsappWebhookController extends Controller
{
/**
* GET /api/whatsapp/webhook
* Meta sends hub.mode, hub.verify_token, hub.challenge.
*/
public function verify(Request $request)
{
$mode = $request->query('hub_mode', $request->query('hub.mode'));
$token = $request->query('hub_verify_token', $request->query('hub.verify_token'));
$challenge = $request->query('hub_challenge', $request->query('hub.challenge'));
$expected = (string) config('whatsapp.verify_token');
if ($mode === 'subscribe' && $expected !== '' && hash_equals($expected, (string) $token)) {
Log::info('WhatsApp webhook verified');
return response((string) $challenge, 200)
->header('Content-Type', 'text/plain');
}
Log::warning('WhatsApp webhook verify failed', [
'mode' => $mode,
'token_match' => $expected !== '' && hash_equals($expected, (string) $token),
]);
return response('Forbidden', 403);
}
/**
* POST /api/whatsapp/webhook
* Acknowledge quickly; optionally check X-Hub-Signature-256 when app secret is set.
*/
public function handle(Request $request)
{
$raw = $request->getContent();
if (!$this->signatureOk($request, $raw)) {
Log::warning('WhatsApp webhook invalid signature');
return response('Invalid signature', 403);
}
$payload = json_decode($raw, true);
if (!is_array($payload)) {
return response('OK', 200);
}
try {
$this->logEvents($payload);
} catch (\Throwable $e) {
Log::error('WhatsApp webhook log failed: ' . $e->getMessage());
}
return response('OK', 200);
}
protected function signatureOk(Request $request, $raw)
{
$secret = trim((string) config('whatsapp.app_secret'));
if ($secret === '') {
return true;
}
$header = (string) $request->header('X-Hub-Signature-256', '');
if ($header === '' || strpos($header, 'sha256=') !== 0) {
return false;
}
$expected = 'sha256=' . hash_hmac('sha256', $raw, $secret);
return hash_equals($expected, $header);
}
protected function logEvents(array $payload)
{
$entries = $payload['entry'] ?? [];
if (!is_array($entries)) {
return;
}
foreach ($entries as $entry) {
$changes = $entry['changes'] ?? [];
if (!is_array($changes)) {
continue;
}
foreach ($changes as $change) {
$value = $change['value'] ?? [];
if (!is_array($value)) {
continue;
}
foreach ($value['statuses'] ?? [] as $status) {
Log::info('WhatsApp status', [
'id' => $status['id'] ?? null,
'status' => $status['status'] ?? null,
'recipient' => $status['recipient_id'] ?? null,
'errors' => $status['errors'] ?? null,
]);
}
foreach ($value['messages'] ?? [] as $message) {
Log::info('WhatsApp inbound', [
'from' => $message['from'] ?? null,
'type' => $message['type'] ?? null,
'id' => $message['id'] ?? null,
]);
}
}
}
}
}
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace App\Http\Middleware;
use Closure;
class LogViewerPassword
{
public function handle($request, Closure $next)
{
$passwordHash = config('logviewer.password');
if (!is_string($passwordHash) || $passwordHash === '') {
return response('Akses log belum dikonfigurasi.', 503)
->header('Cache-Control', 'no-store');
}
$provided = $request->getPassword();
if ($request->getUser() !== 'logviewer' || !is_string($provided) ||
!password_verify($provided, $passwordHash)) {
return response('Kata laluan diperlukan untuk mengakses log.', 401, [
'WWW-Authenticate' => 'Basic realm="Log Viewer", charset="UTF-8"',
'Cache-Control' => 'no-store',
]);
}
$response = $next($request);
$response->headers->set('Cache-Control', 'no-store');
return $response;
}
}
+153
View File
@@ -0,0 +1,153 @@
<?php
namespace App\Jobs;
use App\BlastWasap;
use App\Customer;
use App\Services\Whatsapp\WhatsappCloudClient;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
class WhatsappPembiayaanOnlinePaid extends Job
{
public $kodcaw;
public $cawName;
public $nokp;
public $norujukan;
public $pinjaman;
public $namaBank;
public $noakaun;
public $tarikhBayaran;
public $noRujukanBayaran;
public function __construct(array $data)
{
$this->kodcaw = $data['kodcaw'] ?? null;
$this->cawName = $data['caw_name'] ?? null;
$this->nokp = $data['nokp'] ?? null;
$this->norujukan = $data['norujukan'] ?? null;
$this->pinjaman = $data['pinjaman'] ?? null;
$this->namaBank = $data['nama_bank'] ?? null;
$this->noakaun = $data['noakaun'] ?? null;
$this->tarikhBayaran = $data['tarikh_bayaran'] ?? null;
$this->noRujukanBayaran = $data['no_rujukan_bayaran'] ?? null;
}
public function handle()
{
$client = new WhatsappCloudClient();
$now = Carbon::now();
if (!$client->isConfigured()) {
Log::warning('WhatsApp Cloud skipped: token or phone_number_id missing', [
'norujukan' => $this->norujukan,
]);
return;
}
$customer = Customer::on('mysql7')
->where(function ($q) {
$q->where('kpbaru', $this->nokp)->orWhere('kplama', $this->nokp);
})
->first();
$storedPhone = $customer ? ($customer->telefon ?: $customer->telefon2) : null;
$to = $client->normalizeMsisdn($storedPhone);
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 WHATSAPP_ENABLED is false', [
'norujukan' => $this->norujukan,
]);
$this->logBlast($now, $storedPhone, 'skipped: ADMIN_PHONE_NUMBER empty');
return;
}
$to = $admin;
}
if (!$to) {
Log::warning('WhatsApp Cloud skipped: no phone', [
'nokp' => $this->nokp,
'norujukan' => $this->norujukan,
]);
$this->logBlast($now, $storedPhone, 'skipped: no phone');
return;
}
$template = config('whatsapp.template', 'hello_world');
$lang = config('whatsapp.template_lang', 'en_US');
$bodyParams = $this->isHelloWorld($template) ? [] : $this->bodyParams();
try {
$response = $client->sendTemplate($to, $template, $lang, $bodyParams);
$this->logBlast($now, $to, $response->body());
} catch (\Throwable $e) {
Log::error('WhatsappPembiayaanOnlinePaid failed: ' . $e->getMessage(), [
'norujukan' => $this->norujukan,
]);
$this->logBlast($now, $to, 'exception: ' . $e->getMessage());
}
}
protected function isHelloWorld($template)
{
return strtolower((string) $template) === 'hello_world';
}
/**
* 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()
{
$bank = trim((string) $this->namaBank);
$tail = $this->accountTail($this->noakaun);
$tarikh = $this->tarikhBayaran
? Carbon::parse($this->tarikhBayaran)->format('d/m/Y')
: Carbon::now()->format('d/m/Y');
return [
$this->norujukan ?: '-',
number_format((float) $this->pinjaman, 2, '.', ''),
$bank !== '' ? $bank : '-',
$tail !== '' ? $tail : '-',
$tarikh,
$this->noRujukanBayaran ?: '-',
];
}
protected function accountTail($noakaun)
{
$digits = preg_replace('/\D+/', '', (string) $noakaun);
if ($digits === '') {
return '';
}
return substr($digits, -4);
}
protected function logBlast($now, $telefon, $status)
{
try {
$log = new BlastWasap();
$log->kodcaw = $this->kodcaw;
$log->nokp = $this->nokp;
$log->notelefon = $telefon;
$log->norujukan = $this->norujukan;
$log->status = is_string($status) ? $status : json_encode($status);
$log->created_at = $now;
$log->updated_at = $now;
$log->save();
} catch (\Throwable $e) {
Log::error('log_blast_wasap save failed: ' . $e->getMessage());
}
}
}
@@ -6,6 +6,7 @@ use App\Cawangan;
use App\Feature;
use App\ModalOnline;
use App\RequestModalOnline;
use App\Services\StaffNotificationClient;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@@ -362,6 +363,8 @@ class ModalOnlineService
'nota' => $nota,
]);
$this->notifyOperasiModalRequest($kodcaw, $request, $jenis);
return [
'ok' => true,
'status' => 201,
@@ -373,6 +376,54 @@ class ModalOnlineService
];
}
/**
* Inbox for all operasi staff. Failures must not block the request.
*
* @param string $kodcaw
* @param \App\RequestModalOnline $request
* @param string $jenis
* @return void
*/
protected function notifyOperasiModalRequest($kodcaw, $request, $jenis)
{
try {
app(StaffNotificationClient::class)->notify([
'type' => 'modal_online.pending_operasi',
'cawangan' => $kodcaw,
'audience' => ['role' => 'operasi'],
'data' => [
'request_id' => $request->id,
'amaun' => (float) $request->amaun,
'dimohon_oleh' => $request->dimohon_oleh,
'jenis' => $jenis,
'nota' => $request->nota,
'cawangan_nama' => $this->cawanganNama($kodcaw),
],
]);
} catch (\Throwable $e) {
Log::warning('Operasi modal-online notification failed: '.$e->getMessage(), [
'kodcaw' => $kodcaw,
'request_id' => $request->id,
]);
}
}
/**
* @param string $kodcaw
* @return string
*/
protected function cawanganNama($kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
if (!$cawangan) {
return $kodcaw;
}
$nama = trim((string) $cawangan->nama_cawangan);
return $nama !== '' ? $nama : $kodcaw;
}
/**
* List top-up requests.
* For PC: pass kodcaw. For Operasi: omit kodcaw (all branches).
@@ -9,7 +9,10 @@ use App\Cawangan;
use App\Customer;
use App\Feature;
use App\Gadai;
use App\Jobs\WhatsappPembiayaanOnlinePaid;
use App\PembiayaanOnline;
use App\Services\StaffNotificationClient;
use App\Services\Whatsapp\WhatsappCloudClient;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@@ -412,6 +415,19 @@ class PembiayaanOnlineService
$fields['bukti_akaun_file_id'] = $saved['payload']['id'];
}
if (!empty($input['borang_data'])) {
$saved = $this->storeBuktiFile([
'data' => $input['borang_data'],
'filename' => $input['borang_filename'] ?? null,
'type' => $input['borang_type'] ?? null,
]);
if (!$saved['ok']) {
$saved['payload']['message'] = 'Borang pengesahan diperlukan: fail, nama fail dan jenis fail.';
return $saved;
}
$fields['borang_file_id'] = $saved['payload']['id'];
}
if (empty($fields)) {
return [
'ok' => false,
@@ -691,6 +707,26 @@ class PembiayaanOnlineService
->orderBy('id', 'asc')
->get();
// Fetch customer phone numbers in one query for the batch approval form.
$identityNumbers = $lines->pluck('nokp')->filter()->unique()->values()->all();
$phones = [];
if ($identityNumbers) {
$customers = Customer::on('mysql7')->select('kpbaru', 'kplama', 'telefon')
->where(function ($query) use ($identityNumbers) {
$query->whereIn('kpbaru', $identityNumbers)->orWhereIn('kplama', $identityNumbers);
})->get();
foreach ($customers as $customer) {
foreach ([$customer->kpbaru, $customer->kplama] as $identity) {
if ($identity !== null && $identity !== '') {
$phones[(string) $identity] = $customer->telefon;
}
}
}
}
foreach ($lines as $line) {
$line->setAttribute('telefon', $phones[(string) $line->nokp] ?? null);
}
return [
'ok' => true,
'status' => 200,
@@ -747,7 +783,7 @@ class PembiayaanOnlineService
$tarikh = $now->toDateString();
try {
return DB::connection($mysql)->transaction(function () use (
$result = DB::connection($mysql)->transaction(function () use (
$mysql,
$kodcaw,
$ids,
@@ -855,6 +891,127 @@ class PembiayaanOnlineService
'payload' => ['message' => 'Gagal hantar batch pembiayaan online'],
];
}
if (!empty($result['ok'])) {
$this->notifyOperasiBatchSubmitted($kodcaw, $ids, $pcBy, $result['payload']);
}
return $result;
}
/**
* Inbox for all operasi staff after PC submit. Failures must not block the batch.
*
* @param string $kodcaw
* @param array $ids
* @param string $pcBy
* @param array $payload
* @return void
*/
protected function notifyOperasiBatchSubmitted($kodcaw, array $ids, $pcBy, array $payload)
{
$batch = isset($payload['batch']) ? $payload['batch'] : null;
if (!$batch) {
return;
}
$batchId = is_array($batch) ? ($batch['id'] ?? null) : $batch->id;
$batchNo = is_array($batch) ? ($batch['batch_no'] ?? '') : $batch->batch_no;
$slot = is_array($batch) ? ($batch['slot'] ?? '') : $batch->slot;
$bilangan = is_array($batch) ? ($batch['bilangan'] ?? 0) : $batch->bilangan;
$jumlah = is_array($batch) ? ($batch['jumlah_keseluruhan'] ?? 0) : $batch->jumlah_keseluruhan;
if (!$batchId) {
return;
}
try {
app(StaffNotificationClient::class)->notify([
'type' => 'pembiayaan_online.batch_operasi',
'cawangan' => $kodcaw,
'audience' => ['role' => 'operasi'],
'data' => [
'batch_id' => $batchId,
'batch_no' => $batchNo,
'slot' => $slot,
'appended' => !empty($payload['appended']),
'submitted_count' => count($ids),
'bilangan' => $bilangan,
'jumlah_keseluruhan' => (float) $jumlah,
'pc_submitted_by' => $pcBy,
'cawangan_nama' => $this->cawanganNama($kodcaw),
],
]);
} catch (\Throwable $e) {
Log::warning('Operasi batch notification failed: '.$e->getMessage(), [
'kodcaw' => $kodcaw,
'batch_id' => $batchId,
]);
}
}
/**
* @param string $kodcaw
* @return string
*/
protected function cawanganNama($kodcaw)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
if (!$cawangan) {
return $kodcaw;
}
$nama = trim((string) $cawangan->nama_cawangan);
return $nama !== '' ? $nama : $kodcaw;
}
/**
* Inbox for PC at this branch. Failures must not block the operasi action.
*
* @param string $kodcaw
* @param string $type
* @param array $data
* @return void
*/
protected function notifyPcPembiayaanOnline($kodcaw, $type, array $data)
{
try {
app(StaffNotificationClient::class)->notify([
'type' => $type,
'cawangan' => $kodcaw,
'audience' => ['role' => 'pc'],
'data' => array_merge($data, [
'cawangan_nama' => $this->cawanganNama($kodcaw),
]),
]);
} catch (\Throwable $e) {
Log::warning('PC pembiayaan-online notification failed: '.$e->getMessage(), [
'kodcaw' => $kodcaw,
'type' => $type,
]);
}
}
/**
* @param mixed $line
* @return array
*/
protected function lineNotifyFields($line)
{
if (!$line) {
return [];
}
$isArr = is_array($line);
return [
'norujukan' => $isArr ? ($line['norujukan'] ?? '') : $line->norujukan,
'nama_pelanggan' => $isArr ? ($line['nama_pelanggan'] ?? '') : $line->nama_pelanggan,
'pinjaman' => $isArr ? ($line['pinjaman'] ?? 0) : $line->pinjaman,
'ops_by' => $isArr ? ($line['ops_by'] ?? '') : $line->ops_by,
'reject_reason' => $isArr ? ($line['reject_reason'] ?? '') : $line->reject_reason,
];
}
/**
@@ -1029,7 +1186,7 @@ class PembiayaanOnlineService
$now = Carbon::now();
try {
return DB::connection($mysql)->transaction(function () use ($mysql, $kodcaw, $id, $opsBy, $reason, $now) {
$result = DB::connection($mysql)->transaction(function () use ($mysql, $kodcaw, $id, $opsBy, $reason, $now) {
$line = PembiayaanOnline::on($mysql)
->where('kodcaw', $kodcaw)
->where('id', $id)
@@ -1100,6 +1257,18 @@ class PembiayaanOnlineService
'payload' => ['message' => 'Gagal tolak pembiayaan online'],
];
}
if (!empty($result['ok'])) {
$this->notifyPcPembiayaanOnline($kodcaw, 'pembiayaan_online.rejected_pc', array_merge(
$this->lineNotifyFields(isset($result['payload']['pembiayaan_online']) ? $result['payload']['pembiayaan_online'] : null),
[
'ops_by' => $opsBy,
'reject_reason' => $reason,
]
));
}
return $result;
}
/**
@@ -1220,7 +1389,7 @@ class PembiayaanOnlineService
}
try {
return DB::connection($mysql)->transaction(function () use (
$result = DB::connection($mysql)->transaction(function () use (
$mysql,
$kodcaw,
$id,
@@ -1319,6 +1488,18 @@ class PembiayaanOnlineService
'payload' => ['message' => 'Gagal tanda PAID / muat naik bukti'],
];
}
if (!empty($result['ok'])) {
$this->notifyPcPembiayaanOnline($kodcaw, 'pembiayaan_online.paid_pc', array_merge(
$this->lineNotifyFields(isset($result['payload']['pembiayaan_online']) ? $result['payload']['pembiayaan_online'] : null),
[
'paid_count' => 1,
'ops_by' => $opsBy,
]
));
}
return $result;
}
/**
@@ -1364,7 +1545,7 @@ class PembiayaanOnlineService
}
try {
return DB::connection($mysql)->transaction(function () use (
$result = DB::connection($mysql)->transaction(function () use (
$mysql,
$kodcaw,
$batchId,
@@ -1456,6 +1637,19 @@ class PembiayaanOnlineService
'payload' => ['message' => 'Gagal tanda PAID batch'],
];
}
if (!empty($result['ok'])) {
$batch = isset($result['payload']['batch']) ? $result['payload']['batch'] : null;
$this->notifyPcPembiayaanOnline($kodcaw, 'pembiayaan_online.paid_pc', [
'paid_count' => isset($result['payload']['dibayar']) ? (int) $result['payload']['dibayar'] : 0,
'batch_id' => $batch ? (is_array($batch) ? ($batch['id'] ?? null) : $batch->id) : $batchId,
'batch_no' => $batch ? (is_array($batch) ? ($batch['batch_no'] ?? '') : $batch->batch_no) : '',
'jumlah_keseluruhan' => $batch ? (is_array($batch) ? ($batch['jumlah_keseluruhan'] ?? 0) : $batch->jumlah_keseluruhan) : 0,
'ops_by' => $opsBy,
]);
}
return $result;
}
/**
@@ -1578,6 +1772,65 @@ class PembiayaanOnlineService
];
}
/**
* Get attached signed online-financing confirmation form (borang_file_id).
*
* @return array{ok:bool,status:int,payload:mixed}
*/
public function getBorang($kodcaw, $id)
{
$resolved = $this->resolveMysql($kodcaw);
if (!$resolved['ok']) {
return $resolved;
}
$line = PembiayaanOnline::on($resolved['mysql'])
->where('kodcaw', $kodcaw)
->where('id', $id)
->first();
if (!$line) {
return [
'ok' => false,
'status' => 404,
'payload' => ['message' => 'Pembiayaan online tidak dijumpai'],
];
}
if (empty($line->borang_file_id)) {
return [
'ok' => false,
'status' => 404,
'payload' => ['message' => 'Borang pengesahan belum dimuat naik'],
];
}
$file = ARFiles::on('mysql7')->where('id', $line->borang_file_id)->first();
if (!$file) {
return [
'ok' => false,
'status' => 404,
'payload' => ['message' => 'Fail borang pengesahan tidak dijumpai'],
];
}
return [
'ok' => true,
'status' => 200,
'payload' => [
'pembiayaan_online_id' => $line->id,
'norujukan' => $line->norujukan,
'file' => [
'id' => $file->id,
'filename' => $file->filename,
'type' => $file->type,
'tarikhmasa' => $file->tarikhmasa,
'data' => $file->data,
],
],
];
}
/**
* PC list of PAID lines awaiting blast / tally.
*
@@ -1613,8 +1866,8 @@ class PembiayaanOnlineService
}
/**
* PC marks PAID line(s) as tallied / blast done (blast_sent=1).
* Actual WhatsApp/SMS dispatch can be wired later.
* PC marks PAID line(s) as tallied / blast done (blast_sent=1),
* then queues WhatsApp Cloud template to each customer (or ADMIN_PHONE_NUMBER off-prod).
*
* @param array|int|string $ids
* @return array{ok:bool,status:int,payload:mixed}
@@ -1643,7 +1896,7 @@ class PembiayaanOnlineService
$updated = 0;
try {
return DB::connection($mysql)->transaction(function () use ($mysql, $kodcaw, $ids, $blastBy, $now, &$updated) {
$result = DB::connection($mysql)->transaction(function () use ($mysql, $kodcaw, $ids, $blastBy, $now, &$updated) {
$lines = PembiayaanOnline::on($mysql)
->where('kodcaw', $kodcaw)
->whereIn('id', $ids)
@@ -1697,6 +1950,50 @@ class PembiayaanOnlineService
'payload' => ['message' => 'Gagal tanda blast/tally'],
];
}
if (!empty($result['ok'])) {
$this->queuePaidWhatsapp($kodcaw, $result['payload']['data'] ?? []);
}
return $result;
}
/**
* Dispatch Cloud API jobs after tally commit. Failures are logged; tally stays PAID/blast_sent.
*
* @param \Illuminate\Support\Collection|array $lines
*/
protected function queuePaidWhatsapp($kodcaw, $lines)
{
$client = new WhatsappCloudClient();
if (!$client->isConfigured()) {
Log::info('WhatsApp Cloud not configured; tally saved without send', ['kodcaw' => $kodcaw]);
return;
}
$cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first();
$cawName = $cawangan ? $cawangan->nama_cawangan : $kodcaw;
foreach ($lines as $line) {
try {
dispatch(new WhatsappPembiayaanOnlinePaid([
'kodcaw' => $kodcaw,
'caw_name' => $cawName,
'nokp' => $line->nokp ?? null,
'norujukan' => $line->norujukan ?? null,
'pinjaman' => $line->pinjaman ?? null,
'nama_bank' => $line->nama_bank ?? null,
'noakaun' => $line->noakaun ?? null,
'tarikh_bayaran' => $line->tarikh_bayaran ?? null,
'no_rujukan_bayaran' => $line->no_rujukan_bayaran ?? null,
]));
} catch (\Throwable $e) {
Log::error('queuePaidWhatsapp dispatch failed: ' . $e->getMessage(), [
'kodcaw' => $kodcaw,
'id' => $line->id ?? null,
]);
}
}
}
/**
@@ -1773,40 +2070,88 @@ class PembiayaanOnlineService
return BatchPembiayaanOnline::on($mysql)->where('id', $batchId)->first();
}
public function suggestSlot()
public function slotJadual()
{
$now = Carbon::now();
$mins = ((int) $now->format('G')) * 60 + (int) $now->format('i');
if ($mins < 11 * 60) {
return [
return [
[
'slot' => 'BATCH1',
'label' => 'Batch 1',
'mula' => '00:00',
'cutoff' => '11:00',
'proses' => '12:30',
'lewat' => false,
'nota' => 'Dalam waktu Batch 1',
];
}
if ($mins < 15 * 60) {
return [
],
[
'slot' => 'BATCH2',
'label' => 'Batch 2',
'mula' => '11:00',
'cutoff' => '15:00',
'proses' => '16:30',
'lewat' => false,
'nota' => 'Dalam waktu Batch 2',
];
],
];
}
public function suggestSlot()
{
$now = Carbon::now('Asia/Kuala_Lumpur');
$mins = ((int) $now->format('G')) * 60 + (int) $now->format('i');
$jadual = $this->slotJadual();
$batch1 = $jadual[0];
$batch2 = $jadual[1];
$cutoff1 = $this->hmToMinutes($batch1['cutoff']);
$cutoff2 = $this->hmToMinutes($batch2['cutoff']);
if ($mins < $cutoff1) {
return $this->slotPayload($batch1, false, $cutoff1 - $mins, 'Dalam waktu Batch 1', $now, $jadual);
}
if ($mins < $cutoff2) {
return $this->slotPayload($batch2, false, $cutoff2 - $mins, 'Dalam waktu Batch 2', $now, $jadual);
}
$lewat = $this->slotPayload(
$batch2,
true,
0,
'Selepas cutoff Batch 2 — masih boleh hantar; Operasi mungkin proses esok',
$now,
$jadual
);
$lewat['proses'] = $batch2['proses'] . ' (hari berikutnya jika sudah lewat)';
return $lewat;
}
protected function slotPayload(array $batch, $lewat, $bakiMinit, $nota, Carbon $now, array $jadual)
{
$parts = explode(':', (string) $batch['cutoff']);
$cutoffAt = $now->copy()->setTime(
isset($parts[0]) ? (int) $parts[0] : 0,
isset($parts[1]) ? (int) $parts[1] : 0,
0
);
return [
'slot' => 'BATCH2',
'cutoff' => '15:00',
'proses' => '16:30 (hari berikutnya jika sudah lewat)',
'lewat' => true,
'nota' => 'Selepas cutoff Batch 2 — masih boleh hantar; Operasi mungkin proses esok',
'slot' => $batch['slot'],
'cutoff' => $batch['cutoff'],
'cutoff_at' => $cutoffAt->toIso8601String(),
'server_now' => $now->toIso8601String(),
'proses' => $batch['proses'],
'lewat' => (bool) $lewat,
'baki_minit' => (int) $bakiMinit,
'nota' => $nota,
'jadual' => $jadual,
];
}
protected function hmToMinutes($hm)
{
$parts = explode(':', (string) $hm);
$h = isset($parts[0]) ? (int) $parts[0] : 0;
$m = isset($parts[1]) ? (int) $parts[1] : 0;
return ($h * 60) + $m;
}
/**
* One batch per branch / day / slot (B1-001 or B2-001). Later submits append.
*
+53
View File
@@ -0,0 +1,53 @@
<?php
namespace App\Services;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log;
class StaffNotificationClient
{
/**
* Ask kaunter to persist a staff inbox row. Never throws.
*
* @param array $payload
* @return void
*/
public function notify(array $payload)
{
$base = rtrim((string) config('kaunter.url'), '/');
$secret = (string) config('kaunter.notification_secret');
if ($base === '' || $secret === '') {
Log::info('Staff notification skipped: KAUNTER_URL or INTERNAL_NOTIFICATION_SECRET is empty');
return;
}
$timeout = (int) config('kaunter.notification_timeout', 3);
if ($timeout < 1) {
$timeout = 3;
}
try {
$response = Http::timeout($timeout)
->withHeaders([
'X-Internal-Token' => $secret,
'Accept' => 'application/json',
])
->asJson()
->post($base . '/internal/notifications', $payload);
if (!$response->successful()) {
Log::warning('Staff notification to kaunter failed', [
'status' => $response->status(),
'body' => $response->body(),
'type' => isset($payload['type']) ? $payload['type'] : null,
]);
}
} catch (\Throwable $e) {
Log::warning('Staff notification to kaunter errored: '.$e->getMessage(), [
'type' => isset($payload['type']) ? $payload['type'] : null,
]);
}
}
}
@@ -0,0 +1,100 @@
<?php
namespace App\Services\Whatsapp;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Log;
class WhatsappCloudClient
{
public function isConfigured()
{
return trim((string) config('whatsapp.token')) !== ''
&& trim((string) config('whatsapp.phone_number_id')) !== '';
}
/**
* Malaysia MSISDN for Graph API, e.g. 60193450165.
*
* @return string|null
*/
public function normalizeMsisdn($raw)
{
$digits = preg_replace('/\D+/', '', (string) $raw);
if ($digits === '') {
return null;
}
if (strpos($digits, '60') === 0) {
return $digits;
}
if (strpos($digits, '0') === 0) {
return '60' . substr($digits, 1);
}
return '60' . $digits;
}
/**
* @param string $to
* @param string $templateName
* @param string $lang
* @param array<int,string> $bodyParams
* @return \Illuminate\Http\Client\Response
*/
public function sendTemplate($to, $templateName, $lang, array $bodyParams = [])
{
$payload = [
'messaging_product' => 'whatsapp',
'to' => $to,
'type' => 'template',
'template' => [
'name' => $templateName,
'language' => ['code' => $lang],
],
];
if (count($bodyParams) > 0) {
$payload['template']['components'] = [[
'type' => 'body',
'parameters' => array_map(function ($text) {
return [
'type' => 'text',
'text' => $this->sanitizeParam($text),
];
}, array_values($bodyParams)),
]];
}
$version = config('whatsapp.api_version', 'v25.0');
$phoneId = config('whatsapp.phone_number_id');
$url = 'https://graph.facebook.com/' . $version . '/' . $phoneId . '/messages';
$response = Http::withToken(config('whatsapp.token'))
->acceptJson()
->asJson()
->post($url, $payload);
if (!$response->successful()) {
Log::error('WhatsApp Cloud send failed', [
'to' => $to,
'template' => $templateName,
'status' => $response->status(),
'body' => $response->json() ?: $response->body(),
]);
}
return $response;
}
protected function sanitizeParam($text)
{
$text = trim(preg_replace('/\s+/', ' ', (string) $text));
if ($text === '') {
return '-';
}
return mb_substr($text, 0, 200);
}
}
+6 -3
View File
@@ -88,11 +88,14 @@ $app->singleton(
$app->configure('app');
$app->configure('logging');
$app->configure('logviewer');
$app->configure('tinker');
$app->configure('tennant_database');
$app->configure('report');
$app->configure('app_parameter');
$app->configure('parameter');
$app->configure('whatsapp');
$app->configure('kaunter');
/*
|--------------------------------------------------------------------------
| Register Middleware
@@ -108,9 +111,9 @@ $app->configure('parameter');
// App\Http\Middleware\ExampleMiddleware::class
// ]);
// $app->routeMiddleware([
// 'auth' => App\Http\Middleware\Authenticate::class,
// ]);
$app->routeMiddleware([
'logviewer.password' => App\Http\Middleware\LogViewerPassword::class,
]);
/*
|--------------------------------------------------------------------------
-44
View File
@@ -1,44 +0,0 @@
{
"name": "laravel/lumen",
"description": "The Laravel Lumen Framework.",
"keywords": ["framework", "laravel", "lumen"],
"license": "MIT",
"type": "project",
"require": {
"php": "^7.2.5",
"auth0/auth0-php": "^7.4",
"laravel/lumen-framework": "^7.0",
"rap2hpoutre/laravel-log-viewer": "^1.7"
},
"require-dev": {
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^8.5"
},
"autoload": {
"classmap": [
"database/seeds",
"database/factories"
],
"psr-4": {
"App\\": "app/"
}
},
"autoload-dev": {
"classmap": [
"tests/"
]
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
},
"minimum-stability": "dev",
"prefer-stable": true,
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
]
}
}
-7182
View File
File diff suppressed because it is too large Load Diff
+7
View File
@@ -0,0 +1,7 @@
<?php
return [
'url' => env('KAUNTER_URL', ''),
'notification_secret' => env('INTERNAL_NOTIFICATION_SECRET', ''),
'notification_timeout' => (int) env('KAUNTER_NOTIFICATION_TIMEOUT', 3),
];
+16
View File
@@ -0,0 +1,16 @@
<?php
return [
'password' => env('LOGVIEWER_PASSWORD'),
/*
|--------------------------------------------------------------------------
| Pattern and storage path settings
|--------------------------------------------------------------------------
|
| The env key for pattern and storage path with a default value
|
*/
'max_file_size' => 52428800, // size in Byte
'pattern' => env('LOGVIEWER_PATTERN', '*.log'),
'storage_path' => env('LOGVIEWER_STORAGE_PATH', storage_path('logs')),
];
+12
View File
@@ -0,0 +1,12 @@
<?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'),
'template' => env('WHATSAPP_TEMPLATE', 'hello_world'),
'template_lang' => env('WHATSAPP_TEMPLATE_LANG', 'en_US'),
'verify_token' => env('WHATSAPP_VERIFY_TOKEN'),
'app_secret' => env('WHATSAPP_APP_SECRET'),
];
+3 -10
View File
@@ -5,6 +5,8 @@ services:
dockerfile: docker/php/Dockerfile
target: development
working_dir: /var/www/html
ports:
- "8080:8000"
volumes:
- ./:/var/www/html:cached
environment:
@@ -12,16 +14,7 @@ services:
APP_DEBUG: "true"
depends_on:
- mysql
web:
image: nginx:1.25-alpine
ports:
- "8080:80"
volumes:
- ./:/var/www/html:cached
- ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
depends_on:
- app
command: ["php", "-S", "0.0.0.0:8000", "-t", "public"]
mysql:
image: mysql:8.0
-257
View File
@@ -1,257 +0,0 @@
APP_NAME=Lumen
APP_ENV=local
APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa
APP_DEBUG=true
APP_URL=http://api-arrahn.test
APP_TIMEZONE=Asia/Kuala_Lumpur
LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
DB_CONNECTION_36=mysql
DB_HOST_36=127.0.0.1
DB_PORT_36=3306
DB_DATABASE_36=arrahn_kb2
DB_USERNAME_36=root
DB_PASSWORD_36=
DB_CONNECTION_2=mysql
DB_HOST_2=127.0.0.1
DB_PORT_2=3306
DB_DATABASE_2=arrahn_wcy
DB_USERNAME_2=root
DB_PASSWORD_2=
DB_CONNECTION_3=mysql
DB_HOST_3=127.0.0.1
DB_PORT_3=3306
DB_DATABASE_3=arrahn_1stop
DB_USERNAME_3=root
DB_PASSWORD_3=
DB_CONNECTION_4=mysql
DB_HOST_4=127.0.0.1
DB_PORT_4=3306
DB_DATABASE_4=arrahn_jlwt
DB_USERNAME_4=root
DB_PASSWORD_4=
DB_CONNECTION_5=mysql
DB_HOST_5=127.0.0.1
DB_PORT_5=3306
DB_DATABASE_5=arrahn_wb
DB_USERNAME_5=root
DB_PASSWORD_5=
DB_CONNECTION_6=mysql
DB_HOST_6=127.0.0.1
DB_PORT_6=3306
DB_DATABASE_6=arrahn_kls
DB_USERNAME_6=root
DB_PASSWORD_6=
DB_CONNECTION_7=mysql
DB_HOST_7=127.0.0.1
DB_PORT_7=3306
DB_DATABASE_7=online_arrahn
DB_USERNAME_7=root
DB_PASSWORD_7=
DB_CONNECTION_8=mysql
DB_HOST_8=127.0.0.1
DB_PORT_8=3306
DB_DATABASE_8=arrahn_pp
DB_USERNAME_8=root
DB_PASSWORD_8=
DB_CONNECTION_9=mysql
DB_HOST_9=127.0.0.1
DB_PORT_9=3306
DB_DATABASE_9=arrahn_mace
DB_USERNAME_9=root
DB_PASSWORD_9=
DB_CONNECTION_10=mysql
DB_HOST_10=127.0.0.1
DB_PORT_10=3306
DB_DATABASE_10=arrahn_pm $
DB_USERNAME_10=root
DB_PASSWORD_10=
DB_CONNECTION_11=mysql
DB_HOST_11=127.0.0.1
DB_PORT_11=3306
DB_DATABASE_11=arrahn_gm
DB_USERNAME_11=root
DB_PASSWORD_11=
DB_CONNECTION_12=mysql
DB_HOST_12=127.0.0.1
DB_PORT_12=3306
DB_DATABASE_12=arrahn_gcl
DB_USERNAME_12=root
DB_PASSWORD_12=
DB_CONNECTION_13=mysql
DB_HOST_13=127.0.0.1
DB_PORT_13=3306
DB_DATABASE_13=arrahn_jli
DB_USERNAME_13=root
DB_PASSWORD_13=
DB_CONNECTION_14=mysql
DB_HOST_14=127.0.0.1
DB_PORT_14=3306
DB_DATABASE_14=arrahn_rp
DB_USERNAME_14=root
DB_PASSWORD_14=
DB_CONNECTION_15=mysql
DB_HOST_15=127.0.0.1
DB_PORT_15=3306
DB_DATABASE_15=arrahn_ktn
DB_USERNAME_15=root
DB_PASSWORD_15=
DB_CONNECTION_16=mysql
DB_HOST_16=127.0.0.1
DB_PORT_16=3306
DB_DATABASE_16=arrahn_pg
DB_USERNAME_16=root
DB_PASSWORD_16=
DB_CONNECTION_17=mysql
DB_HOST_17=127.0.0.1
DB_PORT_17=3306
DB_DATABASE_17=arrahn_skudai
DB_USERNAME_17=root
DB_PASSWORD_17=
DB_CONNECTION_18=mysql
DB_HOST_18=127.0.0.1
DB_PORT_18=3306
DB_DATABASE_18=arrahn_pttn
DB_USERNAME_18=root
DB_PASSWORD_18=
DB_CONNECTION_19=mysql
DB_HOST_19=127.0.0.1
DB_PORT_19=3306
DB_DATABASE_19=arrahn_btg
DB_USERNAME_19=root
DB_PASSWORD_19=
DB_CONNECTION_20=mysql
DB_HOST_20=127.0.0.1
DB_PORT_20=3306
DB_DATABASE_20=arrahn_raub
DB_USERNAME_20=root
DB_PASSWORD_20=
DB_CONNECTION_21=mysql
DB_HOST_21=127.0.0.1
DB_PORT_21=3306
DB_DATABASE_21=arrahn_kgr
DB_USERNAME_21=root
DB_PASSWORD_21=
DB_CONNECTION_22=mysql
DB_HOST_22=127.0.0.1
DB_PORT_22=3306
DB_DATABASE_22=arrahn_sdk
DB_USERNAME_22=root
DB_PASSWORD_22=
DB_CONNECTION_23=mysql
DB_HOST_23=127.0.0.1
DB_PORT_23=3306
DB_DATABASE_23=arrahn_sp
DB_USERNAME_23=root
DB_PASSWORD_23=
DB_CONNECTION_24=mysql
DB_HOST_24=127.0.0.1
DB_PORT_24=3306
DB_DATABASE_24=arrahn_twu
DB_USERNAME_24=root
DB_PASSWORD_24=
DB_CONNECTION_25=mysql
DB_HOST_25=127.0.0.1
DB_PORT_25=3306
DB_DATABASE_25=arrahn_api2
DB_USERNAME_25=root
DB_PASSWORD_25=
DB_CONNECTION_26=mysql
DB_HOST_26=127.0.0.1
DB_PORT_26=3306
DB_DATABASE_26=arrahn_kjg
DB_USERNAME_26=root
DB_PASSWORD_26=
DB_CONNECTION_27=mysql
DB_HOST_27=127.0.0.1
DB_PORT_27=3306
DB_DATABASE_27=arrahn_rl
DB_USERNAME_27=root
DB_PASSWORD_27=
DB_CONNECTION_28=mysql
DB_HOST_28=127.0.0.1
DB_PORT_28=3306
DB_DATABASE_28=arrahn_bfort
DB_USERNAME_28=root
DB_PASSWORD_28=
DB_CONNECTION_29=mysql
DB_HOST_29=127.0.0.1
DB_PORT_29=3306
DB_DATABASE_29=arrahn_kbelud
DB_USERNAME_29=root
DB_PASSWORD_29=
DB_CONNECTION_30=mysql
DB_HOST_30=127.0.0.1
DB_PORT_30=3306
DB_DATABASE_30=arrahn_tuaran
DB_USERNAME_30=root
DB_PASSWORD_30=
DB_CONNECTION_31=mysql
DB_HOST_31=127.0.0.1
DB_PORT_31=3306
DB_DATABASE_31=arrahn_kngau
DB_USERNAME_31=root
DB_PASSWORD_31=
DB_CONNECTION_32=mysql
DB_HOST_32=127.0.0.1
DB_PORT_32=3306
DB_DATABASE_32=arrahn_tm
DB_USERNAME_32=root
DB_PASSWORD_32=
DB_CONNECTION_33=mysql
DB_HOST_33=127.0.0.1
DB_PORT_33=3306
DB_DATABASE_33=arrahn_tmlh
DB_USERNAME_33=root
DB_PASSWORD_33=
DB_CONNECTION_34=mysql
DB_HOST_34=127.0.0.1
DB_PORT_34=3306
DB_DATABASE_34=arrahn_semporna
DB_USERNAME_34=root
DB_PASSWORD_34=
DB_CONNECTION_35=mysql
DB_HOST_35=127.0.0.1
DB_PORT_35=3306
DB_DATABASE_35=arrahn_kb1
DB_USERNAME_35=root
DB_PASSWORD_35=
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
-286
View File
@@ -1,286 +0,0 @@
APP_NAME=Lumen
APP_ENV=localhost
APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa
APP_DEBUG=true
APP_URL=http://apiujrah.arrahn
APP_TIMEZONE=Asia/Kuala_Lumpur
LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
#tukar 12-09-23
#DB_CONNECTION=mysql
#DB_HOST=127.0.0.1
#DB_PORT=3306
#DB_DATABASE=arrahn_kb2
#DB_USERNAME=root
#DB_PASSWORD=secret
DB_CONNECTION_36=mysql
DB_HOST_36=database_zone1
DB_PORT_36=3306
DB_DATABASE_36=arrahn_kb2
DB_USERNAME_36=root
DB_PASSWORD_36=secret
DB_CONNECTION_2=mysql
DB_HOST_2=database_zone1
DB_PORT_2=3306
DB_DATABASE_2=arrahn_wcy
DB_USERNAME_2=root
DB_PASSWORD_2=secret
DB_CONNECTION_3=mysql
DB_HOST_3=database_zone1
DB_PORT_3=3306
DB_DATABASE_3=arrahn_1stop
DB_USERNAME_3=root
DB_PASSWORD_3=secret
DB_CONNECTION_4=mysql
DB_HOST_4=database_zone1
DB_PORT_4=3306
DB_DATABASE_4=arrahn_jlwt
DB_USERNAME_4=root
DB_PASSWORD_4=secret
DB_CONNECTION_5=mysql
DB_HOST_5=database_zone1
DB_PORT_5=3306
DB_DATABASE_5=arrahn_wb
DB_USERNAME_5=root
DB_PASSWORD_5=secret
DB_CONNECTION_6=mysql
DB_HOST_6=database_zone1
DB_PORT_6=3306
DB_DATABASE_6=arrahn_kls
DB_USERNAME_6=root
DB_PASSWORD_6=secret
DB_CONNECTION_7=mysql
DB_HOST_7=database_zone1
DB_PORT_7=3306
DB_DATABASE_7=online_arrahn
DB_USERNAME_7=root
DB_PASSWORD_7=secret
DB_CONNECTION_8=mysql
DB_HOST_8=database_zone1
DB_PORT_8=3306
DB_DATABASE_8=arrahn_pp
DB_USERNAME_8=root
DB_PASSWORD_8=secret
DB_CONNECTION_9=mysql
DB_HOST_9=database_zone1
DB_PORT_9=3306
DB_DATABASE_9=arrahn_mace
DB_USERNAME_9=root
DB_PASSWORD_9=secret
DB_CONNECTION_10=mysql
DB_HOST_10=database_zone1
DB_PORT_10=3306
DB_DATABASE_10=arrahn_pm
DB_USERNAME_10=root
DB_PASSWORD_10=secret
DB_CONNECTION_11=mysql
DB_HOST_11=database_zone1
DB_PORT_11=3306
DB_DATABASE_11=arrahn_gm
DB_USERNAME_11=root
DB_PASSWORD_11=secret
DB_CONNECTION_12=mysql
DB_HOST_12=database_zone1
DB_PORT_12=3306
DB_DATABASE_12=arrahn_gcl
DB_USERNAME_12=root
DB_PASSWORD_12=secret
DB_CONNECTION_13=mysql
DB_HOST_13=database_zone1
DB_PORT_13=3306
DB_DATABASE_13=arrahn_jli
DB_USERNAME_13=root
DB_PASSWORD_13=secret
DB_CONNECTION_14=mysql
DB_HOST_14=database_zone1
DB_PORT_14=3306
DB_DATABASE_14=arrahn_rp
DB_USERNAME_14=root
DB_PASSWORD_14=secret
DB_CONNECTION_15=mysql
DB_HOST_15=database_zone2
DB_PORT_15=3306
DB_DATABASE_15=arrahn_ktn
DB_USERNAME_15=root
DB_PASSWORD_15=secret
DB_CONNECTION_16=mysql
DB_HOST_16=database_zone2
DB_PORT_16=3306
DB_DATABASE_16=arrahn_pg
DB_USERNAME_16=root
DB_PASSWORD_16=secret
DB_CONNECTION_17=mysql
DB_HOST_17=database_zone2
DB_PORT_17=3306
DB_DATABASE_17=arrahn_skudai
DB_USERNAME_17=root
DB_PASSWORD_17=secret
DB_CONNECTION_18=mysql
DB_HOST_18=database_zone2
DB_PORT_18=3306
DB_DATABASE_18=arrahn_pttn
DB_USERNAME_18=root
DB_PASSWORD_18=secret
DB_CONNECTION_19=mysql
DB_HOST_19=database_zone2
DB_PORT_19=3306
DB_DATABASE_19=arrahn_btg
DB_USERNAME_19=root
DB_PASSWORD_19=secret
DB_CONNECTION_20=mysql
DB_HOST_20=database_zone2
DB_PORT_20=3306
DB_DATABASE_20=arrahn_raub
DB_USERNAME_20=root
DB_PASSWORD_20=secret
DB_CONNECTION_21=mysql
DB_HOST_21=database_zone2
DB_PORT_21=3306
DB_DATABASE_21=arrahn_kgr
DB_USERNAME_21=root
DB_PASSWORD_21=secret
DB_CONNECTION_22=mysql
DB_HOST_22=database_zone2
DB_PORT_22=3306
DB_DATABASE_22=arrahn_sdk
DB_USERNAME_22=root
DB_PASSWORD_22=secret
DB_CONNECTION_23=mysql
DB_HOST_23=database_zone2
DB_PORT_23=3306
DB_DATABASE_23=arrahn_sp
DB_USERNAME_23=root
DB_PASSWORD_23=secret
DB_CONNECTION_24=mysql
DB_HOST_24=database_zone2
DB_PORT_24=3306
DB_DATABASE_24=arrahn_twu
DB_USERNAME_24=root
DB_PASSWORD_24=secret
DB_CONNECTION_25=mysql
DB_HOST_25=database_zone2
DB_PORT_25=3306
DB_DATABASE_25=arrahn_api2
DB_USERNAME_25=root
DB_PASSWORD_25=secret
DB_CONNECTION_26=mysql
DB_HOST_26=database_zone2
DB_PORT_26=3306
DB_DATABASE_26=arrahn_kjg
DB_USERNAME_26=root
DB_PASSWORD_26=secret
DB_CONNECTION_27=mysql
DB_HOST_27=database_zone2
DB_PORT_27=3306
DB_DATABASE_27=arrahn_rl
DB_USERNAME_27=root
DB_PASSWORD_27=secret
DB_CONNECTION_28=mysql
DB_HOST_28=database_zone2
DB_PORT_28=3306
DB_DATABASE_28=arrahn_bfort
DB_USERNAME_28=root
DB_PASSWORD_28=secret
DB_CONNECTION_29=mysql
DB_HOST_29=database_zone2
DB_PORT_29=3306
DB_DATABASE_29=arrahn_kbelud
DB_USERNAME_29=root
DB_PASSWORD_29=secret
DB_CONNECTION_30=mysql
DB_HOST_30=database_zone2
DB_PORT_30=3306
DB_DATABASE_30=arrahn_tuaran
DB_USERNAME_30=root
DB_PASSWORD_30=secret
DB_CONNECTION_31=mysql
DB_HOST_31=database_zone2
DB_PORT_31=3306
DB_DATABASE_31=arrahn_kngau
DB_USERNAME_31=root
DB_PASSWORD_31=secret
DB_CONNECTION_32=mysql
DB_HOST_32=database_zone1
DB_PORT_32=3306
DB_DATABASE_32=arrahn_tm
DB_USERNAME_32=root
DB_PASSWORD_32=secret
DB_CONNECTION_33=mysql
DB_HOST_33=database_zone2
DB_PORT_33=3306
DB_DATABASE_33=arrahn_tmlh
DB_USERNAME_33=root
DB_PASSWORD_33=secret
DB_CONNECTION_34=mysql
DB_HOST_34=database_zone2
DB_PORT_34=3306
DB_DATABASE_34=arrahn_semporna
DB_USERNAME_34=root
DB_PASSWORD_34=secret
DB_CONNECTION_35=mysql
DB_HOST_35=database_zone1
DB_PORT_35=3306
DB_DATABASE_35=arrahn_kb1
DB_USERNAME_35=root
DB_PASSWORD_35=secret
#DB_CONNECTION_37=mysql
#DB_HOST_37=database_zone2
#DB_PORT_37=3306
#DB_DATABASE_37=arrahn_ld
#DB_USERNAME_37=root
#DB_PASSWORD_37=secret
DB_CONNECTION_38=mysql
DB_HOST_38=database_zone2
DB_PORT_38=3306
DB_DATABASE_38=arrahn_pttn2
DB_USERNAME_38=root
DB_PASSWORD_38=secret
CACHE_DRIVER=file
QUEUE_CONNECTION=database
WABOT_API=https://app.wabot.my/api/send.php
WABOT_INSTANCES_ID=67B69A20D329B
WABOT_TOKEN_KEYS=66a08339284bc
ACTIVE_JOB_SERVER=true
-54
View File
@@ -1,54 +0,0 @@
APP_NAME=Lumen
APP_ENV=localhost
APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa
APP_DEBUG=true
APP_URL=http://apiujrah.arrahn
APP_TIMEZONE=Asia/Kuala_Lumpur
LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
#tukar 12-09-23
#DB_CONNECTION=mysql
#DB_HOST=127.0.0.1
#DB_PORT=3306
#DB_DATABASE=arrahn_kb2
#DB_USERNAME=root
#DB_PASSWORD=secret
DB_CONNECTION_2=mysql
DB_HOST_2=database_zone_franchise
DB_PORT_2=3306
DB_DATABASE_2=kguru_kb
DB_USERNAME_2=root
DB_PASSWORD_2=secret
DB_CONNECTION_3=mysql
DB_HOST_3=database_zone_franchise
DB_PORT_3=3306
DB_DATABASE_3=Kguru_melor
DB_USERNAME_3=root
DB_PASSWORD_3=secret
DB_CONNECTION_4=mysql
DB_HOST_4=database_zone_franchise
DB_PORT_4=3306
DB_DATABASE_4=kguru_tumpat
DB_USERNAME_4=root
DB_PASSWORD_4=secret
DB_CONNECTION_7=mysql
DB_HOST_7=database_zone_franchise
DB_PORT_7=3306
DB_DATABASE_7=master_koopguru
DB_USERNAME_7=root
DB_PASSWORD_7=secret
CACHE_DRIVER=file
QUEUE_CONNECTION=database
WABOT_API=https://app.wabot.my/api/send.php
WABOT_INSTANCES_ID=67B69A20D329B
WABOT_TOKEN_KEYS=66a08339284bc
ACTIVE_JOB_SERVER=true
-54
View File
@@ -1,54 +0,0 @@
APP_NAME=Lumen
APP_ENV=localhost
APP_KEY=WbPGkYNmXZ6ZQplGlvl0iZ7zyW1b09xa
APP_DEBUG=true
APP_URL=http://apiujrah.arrahn
APP_TIMEZONE=Asia/Kuala_Lumpur
LOG_CHANNEL=stack
LOG_SLACK_WEBHOOK_URL=
#tukar 12-09-23
#DB_CONNECTION=mysql
#DB_HOST=127.0.0.1
#DB_PORT=3306
#DB_DATABASE=arrahn_kb2
#DB_USERNAME=root
#DB_PASSWORD=secret
DB_CONNECTION_3=mysql
DB_HOST_3=database-zone-franchise
DB_PORT_3=3306
DB_DATABASE_3=krk_losong
DB_USERNAME_3=root
DB_PASSWORD_3=secret
DB_CONNECTION_4=mysql
DB_HOST_4=database-zone-franchise
DB_PORT_4=3306
DB_DATABASE_4=krk_kemaman
DB_USERNAME_4=root
DB_PASSWORD_4=secret
DB_CONNECTION_5=mysql
DB_HOST_5=database-zone-franchise
DB_PORT_5=3306
DB_DATABASE_5=krk_tokbali
DB_USERNAME_5=root
DB_PASSWORD_5=secret
DB_CONNECTION_7=mysql
DB_HOST_7=database-zone-franchise
DB_PORT_7=3306
DB_DATABASE_7=master_krk
DB_USERNAME_7=root
DB_PASSWORD_7=secret
CACHE_DRIVER=file
QUEUE_CONNECTION=database
WABOT_API=https://app.wabot.my/api/send.php
WABOT_INSTANCES_ID=67B69A20D329B
WABOT_TOKEN_KEYS=66a08339284bc
ACTIVE_JOB_SERVER=true
+8 -1
View File
@@ -25,7 +25,10 @@ $router->get('/health', function () {
return response()->json(['status' => 'ok']);
});
$router->group(['namespace' => '\Rap2hpoutre\LaravelLogViewer'], function() use ($router) {
$router->group([
'namespace' => '\Rap2hpoutre\LaravelLogViewer',
'middleware' => 'logviewer.password',
], function () use ($router) {
$router->get('logs', 'LogViewerController@index');
});
@@ -699,6 +702,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('initiate/modal-online', ['uses' => 'ModalOnlineController@initiate']);
// Operasi kelulusan pembiayaan online (must be before {kodcaw} routes)
$router->get('whatsapp/webhook', ['uses' => 'WhatsappWebhookController@verify']);
$router->post('whatsapp/webhook', ['uses' => 'WhatsappWebhookController@handle']);
$router->get('pembiayaan-online/operasi/batches', ['uses' => 'PembiayaanOnlineController@operasiListBatches']);
$router->get('pembiayaan-online/operasi/{kodcaw}/batches/{batchId}', ['uses' => 'PembiayaanOnlineController@operasiShowBatch']);
$router->post('pembiayaan-online/operasi/{kodcaw}/lines/{id}/approve', ['uses' => 'PembiayaanOnlineController@operasiApproveLine']);
@@ -717,6 +723,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->post('pembiayaan-online/{kodcaw}/lines/{id}/unverify', ['uses' => 'PembiayaanOnlineController@unverifyLine']);
$router->get('pembiayaan-online/{kodcaw}/lines/{id}/bukti', ['uses' => 'PembiayaanOnlineController@getBukti']);
$router->get('pembiayaan-online/{kodcaw}/lines/{id}/bukti-akaun', ['uses' => 'PembiayaanOnlineController@getBuktiAkaun']);
$router->get('pembiayaan-online/{kodcaw}/lines/{id}/borang', ['uses' => 'PembiayaanOnlineController@getBorang']);
$router->get('pembiayaan-online/{kodcaw}/lines/{id}', ['uses' => 'PembiayaanOnlineController@showLine']);
$router->get('pembiayaan-online/{kodcaw}/batches', ['uses' => 'PembiayaanOnlineController@listBatches']);
$router->get('pembiayaan-online/{kodcaw}/batches/{batchId}', ['uses' => 'PembiayaanOnlineController@showBatch']);