Co-authored-by: ISMAIL MASSERAN <topaz@Mac.dlinkrouter.local> Co-authored-by: ISMAIL MASSERAN <topaz@ISMAILs-Macbook.local> Reviewed-on: #16
This commit was merged in pull request #16.
This commit is contained in:
@@ -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){
|
||||
|
||||
@@ -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,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user