Merge remote-tracking branch 'origin/main' into feature/shoraka-integration

2026-10-05 11:02:54 +08:00
parent 50cf966da7 aac29bc199
commit 5d208f7a79
51 changed files with 2270 additions and 8518 deletions
@@ -26,6 +26,7 @@ class CawanganController extends Controller

        $data = $cawangan->toArray();
        $data['features'] = Feature::mapFor($code_cawangan);
+        $data['api_arrahnbid'] = Feature::arrahnbidUrl($code_cawangan);

        return response()->json($data);
    }
@@ -537,7 +537,7 @@ class GadaiController extends Controller

    public function getLaporanGadai($kodcaw,$tarikh){
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent')
+        $gadai_data = Gadai::on($cawangan['mysql'])->select('cara_terima','t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent','kadarrebet','diskaun')
        ->where('t_gadai','=',$tarikh)
        ->orderBy('teller')
        ->orderBy('sirig')
@@ -551,6 +551,7 @@ class GadaiController extends Controller
                array_push($gadai,[
                    "t_gadai"=> $gadaiData['t_gadai'],
                    "norujukan"=> $gadaiData['norujukan'],
+                    "cara_terima"=> $gadaiData['cara_terima'],
                    "nama"=> $customer_info['nama'],
                    "nokp"=> $gadaiData['nokp'],
                    "semakbarcode"=> $gadaiData['semakbarcode'],
@@ -563,7 +564,9 @@ class GadaiController extends Controller
                    "alamat1"=> $customer_info['alamat1'],
                    "teller"=> $gadaiData['teller'],
                    "onepercent"=> $gadaiData['onepercent'],
-                    "ujrah"=> $gadaiData['ujrah']
+                    "ujrah"=> $gadaiData['ujrah'],
+                    "kadarrebet"=> $gadaiData['kadarrebet'],
+                    "diskaun"=> $gadaiData['diskaun']
                ]);
            }
        }
@@ -626,7 +629,7 @@ class GadaiController extends Controller
                "alamat1" => optional($customer)->alamat1,
                "t_gadai" => $g->t_gadai,
                "norujukan" => $g->norujukan,
-                "norujukan"=> $g->norujukan,
+                "cara_terima" => strtoupper((string) ($g->cara_terima ?: 'TUNAI')),
              
                "nokp"=> $g->nokp,
                "semakbarcode"=> $g->semakbarcode,
@@ -640,6 +643,8 @@ class GadaiController extends Controller
                "teller"=> $g->teller,
                "ujrah"=> $g->ujrah,
                "onepercent"=> $g->onepercent,
+                "kadarrebet"=> $g->kadarrebet,
+                "diskaun"=> $g->diskaun,
                "tagbaru"=> $g->tagbaru,
                "kodkerja"=> optional($customer)->kodkerja,
                "bangsa"=> optional($customer)->bangsa,
@@ -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){
@@ -11,6 +11,7 @@ use App\Negeri;
 use App\Lelong;
 use App\Transaction;
 use App\Cawangan;
+use App\Feature;
 use App\Gadai;
 use App\TuntutBaki;
 use App\WTD;
@@ -26,6 +27,7 @@ use App\Tunai;
 use App\Audit;
 use App\GlDetail;
 use App\Pembeli;
+use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use App\Services\RingkasanHarianServices;
@@ -604,16 +606,7 @@ class LelongController extends Controller
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();

        if($cawangan['tagarrahnbid'] == 1){
-            if(env('APP_ENV') != 'production'){
-                $link = 'https://adminbid-kopkb.erahn.com.my/api/portalApi';
-            }else{
-                $link = 'https://adminbid-kopkb.erahn.com.my/api/portalApi';
-            }
-
-            $lelong = Http::withOptions(['verify' => true])->get($link,[
-                'norujukan' => $request->norujukan
-            ])->json();
-            $lelong = ($lelong != null) ? $lelong['lelong'] : [];
+            $lelong = $this->fetchPortalLelong($request->kodcaw, $request->norujukan);
            if( $lelong == null )
            {
                $lelong = Lelong::on($cawangan['mysql'])
@@ -656,10 +649,7 @@ class LelongController extends Controller
        $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $request->kodcaw)->first();

        if ($cawangan['tagarrahnbid'] == 0){
-            $lelong = Http::withOptions(['verify' => true])->get(config('app_parameter.api_arrahnbid').'portalApi',[
-                'norujukan' => $request->norujukan
-            ])->json();
-            $lelong = ($lelong != null) ? $lelong['lelong'] : [];
+            $lelong = $this->fetchPortalLelong($request->kodcaw, $request->norujukan);
            if( $lelong == null )
            {
                $lelong = Lelong::on($cawangan['mysql'])
@@ -729,8 +719,8 @@ class LelongController extends Controller

        if($cawangan['tagarrahnbid'] == 1)
        {
-            $lelong = Http::withOptions(['verify' => true])->get(config('app_parameter.api_arrahnbid').'portalApi',['norujukan' => $request->norujukan])->json();
-            $lelong = ($lelong != null) ? $lelong['lelong'] : [];
+            $lelong = $this->fetchPortalLelong($request->kodcaw, $request->norujukan);
+            $lelong = ($lelong != null) ? $lelong : [];
        }else{
            $lelong = Lelong::on($cawangan['mysql'])->where([['norujukan',$request->norujukan]])->first();
        }
@@ -2009,4 +1999,31 @@ class LelongController extends Controller
            ], 200);
    }

+    /**
+     * Fetch lelong status from arrahnbid. Returns null when the portal is
+     * unreachable so callers can fall back to the local lelong table.
+     */
+    private function fetchPortalLelong($kodcaw, $norujukan)
+    {
+        try {
+            $payload = Http::withOptions(['verify' => true])
+                ->timeout(5)
+                ->get(Feature::arrahnbidUrl($kodcaw).'portalApi', [
+                    'norujukan' => $norujukan,
+                ])
+                ->json();
+
+            return ($payload != null) ? ($payload['lelong'] ?? null) : null;
+        } catch (ConnectionException $e) {
+            Log::warning('Arrahnbid portal unreachable; falling back to local lelong.', [
+                'kodcaw' => $kodcaw,
+                'norujukan' => $norujukan,
+                'url' => Feature::arrahnbidUrl($kodcaw).'portalApi',
+                'error' => $e->getMessage(),
+            ]);
+
+            return null;
+        }
+    }
+
 }
@@ -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);
    }
@@ -35,6 +35,14 @@ class PembiayaanOnlineController extends Controller
        return $this->respond($this->service->show($kodcaw, $norujukan));
    }

+    /**
+     * GET /api/pembiayaan-online/{kodcaw}/lines/{id}
+     */
+    public function showLine($kodcaw, $id)
+    {
+        return $this->respond($this->service->showLine($kodcaw, $id));
+    }
+
    /**
     * GET /api/pembiayaan-online/{kodcaw}/queue
     */
@@ -53,6 +61,7 @@ class PembiayaanOnlineController extends Controller
        foreach ([
            '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',
        ] as $key) {
            if ($request->has($key)) {
                $input[$key] = $request->input($key);
@@ -62,6 +71,26 @@ class PembiayaanOnlineController extends Controller
        return $this->respond($this->service->updateLine($kodcaw, $id, $input));
    }

+    /**
+     * POST /api/pembiayaan-online/{kodcaw}/lines/{id}/verify
+     */
+    public function verifyLine($kodcaw, $id, Request $request)
+    {
+        return $this->respond($this->service->verifyLine(
+            $kodcaw,
+            $id,
+            $request->input('pc_verified_by', '')
+        ));
+    }
+
+    /**
+     * POST /api/pembiayaan-online/{kodcaw}/lines/{id}/unverify
+     */
+    public function unverifyLine($kodcaw, $id)
+    {
+        return $this->respond($this->service->unverifyLine($kodcaw, $id));
+    }
+
    /**
     * GET /api/pembiayaan-online/{kodcaw}/batches
     */
@@ -177,6 +206,14 @@ class PembiayaanOnlineController extends Controller
        return $this->respond($this->service->getBukti($kodcaw, $id));
    }

+    /**
+     * GET /api/pembiayaan-online/{kodcaw}/lines/{id}/bukti-akaun
+     */
+    public function getBuktiAkaun($kodcaw, $id)
+    {
+        return $this->respond($this->service->getBuktiAkaun($kodcaw, $id));
+    }
+
    /**
     * GET /api/pembiayaan-online/{kodcaw}/paid?blast_sent=0
     */
@@ -20,6 +20,7 @@ use App\Panjar;
 use App\HargaEmas;
 use App\Moratorium;
 use App\Audit;
+use App\Feature;
 use App\LookupWakil;

 use App\StokAudit1;
@@ -193,7 +194,7 @@ class TebusController extends Controller
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

        $tebus_data = Tebus::on($cawangan['mysql'])
-                ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg','tebus.ujrah','tebus.onepercent','gad.tagbaru')
+                ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','gad.nokp','tebus.jbg','tebus.ujrah','tebus.onepercent','gad.tagbaru','tebus.diskaun_rebate')
                ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
               // ->join('online_arrahn.customer as cust', function($join)
               // {
@@ -232,7 +233,8 @@ class TebusController extends Controller
                    "nokp"=>$tebusData['nokp'],
                    "jbg"=>$tebusData['jbg'],
                    "ujrah"=>$trans['ujrah_rebet'],
-                    "onepercent"=>$trans['onepercent_rebet']
+                    "onepercent"=>$trans['onepercent_rebet'],
+                    "diskaun_rebate"=>$tebusData['diskaun_rebate'],

                ]);
            }
@@ -274,7 +276,8 @@ class TebusController extends Controller
        'tebus.jbg',
        'tebus.ujrah',
        'tebus.onepercent',
-        'gad.tagbaru'
+        'gad.tagbaru',
+        'tebus.diskaun_rebate'
    )
    ->join('gadai as gad', 'gad.norujukan', '=', 'tebus.norujukan')
    ->where('tebus.t_tebus', '>=', $request->mula)
@@ -310,7 +313,8 @@ class TebusController extends Controller
                    "jbg"=>$tebusData['jbg'],
                    "ujrah"=>$trans['ujrah_rebet'],
                    "onepercent"=>$trans['onepercent_rebet'],
-                    "tagbaru"=>$tebusData['tagbaru']
+                    "tagbaru"=>$tebusData['tagbaru'],
+                    "diskaun_rebate"=>$tebusData['diskaun_rebate'],

                ]);
            }
@@ -1672,6 +1676,53 @@ class TebusController extends Controller
        return response($rebet);
    }

+    public function RebetPromoCalculation($kodcaw, Request $request)
+    {
+        $kodcaw = $request->kodcaw ?: $kodcaw;
+        if (!Feature::enabled($kodcaw, Feature::REBET_ANNUR)) {
+            return response(0);
+        }
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
+
+        $rebet = Tebus::on($cawangan['mysql'])
+                ->join('gadai as db2', 'tebus.norujukan', '=', 'db2.norujukan')
+                ->where('tebus.t_tebus', '<=', $request->tarikh)
+                ->where('db2.hargajualan', '>', '0')
+                ->whereNotNull('db2.hargajualan')
+                ->sum('diskaun_rebate');
+
+        return response($rebet);
+    }
+
+    public function PelarasanRebate($kodcaw, Request $request)
+    {
+        $kodcaw = $request->kodcaw ?: $kodcaw;
+        if (!Feature::enabled($kodcaw, Feature::REBET_ANNUR)) {
+            return response(0);
+        }
+
+        $cawangan = Cawangan::on('mysql7')
+            ->where('kodcaw', $kodcaw)
+            ->first();
+
+        $tarikhLaporan = Carbon::parse($request->tarikh)->toDateString();
+        $tarikhTamatPelarasan = '2026-09-02';
+        $tarikhAkhir = $tarikhLaporan > $tarikhTamatPelarasan
+            ? $tarikhTamatPelarasan
+            : $tarikhLaporan;
+
+        $rebet = Tebus::on($cawangan['mysql'])
+            ->join('gadai as db2', 'tebus.norujukan', '=', 'db2.norujukan')
+            ->whereDate('tebus.t_tebus', '>=', '2025-05-13')
+            ->whereDate('tebus.t_tebus', '<=', $tarikhAkhir)
+            ->where('db2.hargajualan', '>', 0)
+            ->whereDate('db2.t_gadai', '>', '2023-05-21')
+            ->sum('tebus.diskaun_rebate');
+
+        return response($rebet);
+    }
+
    public function RebetCalculationLejer($kodcaw,Request $request)
    {
        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
@@ -1687,6 +1738,26 @@ class TebusController extends Controller
        return response($rebet);
    }

+    public function RebetPromoCalculationLejer($kodcaw, Request $request)
+    {
+        $kodcaw = $request->kodcaw ?: $kodcaw;
+        if (!Feature::enabled($kodcaw, Feature::REBET_ANNUR)) {
+            return response(0);
+        }
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
+
+        $rebet = Tebus::on($cawangan['mysql'])
+                ->join('gadai as db2', 'tebus.norujukan', '=', 'db2.norujukan')
+                ->where('tebus.t_tebus', '>=', $request->mula)
+                ->where('tebus.t_tebus', '<=', $request->hingga)
+                ->where('db2.hargajualan', '>', '0')
+                ->whereNotNull('db2.hargajualan')
+                ->sum('diskaun_rebate');
+
+        return response($rebet);
+    }
+
    public function getUpahLamaToday($kodcaw,$norujukan)
    {
        $current = Carbon::now();
@@ -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();
@@ -12,6 +12,7 @@ use App\GlDetail;
 use App\imbangdugalama;
 use App\GlCode;
 use App\Panjar;
+use App\ModalOnline;

 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -168,37 +169,64 @@ class VaultController extends Controller
   return response()->json($updateVault, 200);
 }

- public function updateVaultDeletePendahuluanSerahan($kodcaw, Request $request)
- {
-   $current = Carbon::now();
-   $current = new Carbon();
-   $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

-   $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->where('tarikh','=',$current->toDateString())->orderby('tarikh','desc')->first();
+public function updateVaultDeletePendahuluanSerahan($kodcaw, Request $request)
+{
+    $current = new Carbon();

-   $bakiawal = $vault['bakiawal'];
-   $keluar = $vault['keluar'];
-   $masuk = $vault['masuk'];
-   $bakiakhir = $vault['bakiakhir'];
-   $bakieod = $vault['bakieod'];
-   $pendahuluan = $vault['pendahuluan'];
-   $serahan = $vault['serahan'];
-   $totpanjaran = $vault['totpanjar'];
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();

-   $glpend = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->sum('pendahuluan');
-   $glser = GlDetail::on($cawangan['mysql'])->where('tarikh','=', $current->toDateString())->where('teller','<>','ONLINE')->sum('serahan');
+    if (!$cawangan) {
+        return response()->json(['message' => 'Cawangan tidak dijumpai'], 404);
+    }

-   $bakiakhir = $bakiawal - $keluar + $masuk + $glpend - $glser - $totpanjaran;
+    $vault = Vault::on($cawangan['mysql'])
+        ->where('kodcaw', '=', $kodcaw)
+        ->where('tarikh', '=', $current->toDateString())
+        ->first();

-   $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
-      'pendahuluan' => $glpend,
-      'serahan' => $glser,
-      'bakiakhir'=>$bakiakhir,
-      'bakieod'=>$bakiakhir
-   ));
+    if (!$vault) {
+        return response()->json(['message' => 'Rekod vault hari ini tidak dijumpai'], 404);
+    }

-   return response()->json($updateVault, 200);
- }
+    $bakiawal    = $vault['bakiawal'];
+    $keluar      = $vault['keluar'];
+    $masuk       = $vault['masuk'];
+    $totpanjaran = $vault['totpanjar'];
+
+    // Pendahuluan HQ (dari GL)
+    $glpend = GlDetail::on($cawangan['mysql'])
+        ->where('tarikh', '=', $current->toDateString())
+        ->sum('pendahuluan');
+
+    // Serahan (GL, exclude teller ONLINE)
+    $glser = GlDetail::on($cawangan['mysql'])
+        ->where('tarikh', '=', $current->toDateString())
+        ->where('teller', '<>', 'ONLINE')
+        ->sum('serahan');
+
+    // Pendahuluan Online (had yang diluluskan hari ini)
+    $modalOnlineHad = ModalOnline::on($cawangan['mysql'])
+        ->where('kodcaw', '=', $kodcaw)
+        ->where('tarikh', '=', $current->toDateString())
+        ->value('had') ?? 0;
+
+    // Gabungan pendahuluan HQ + pendahuluan online
+    $totalPendahuluan = $glpend + $modalOnlineHad;
+
+    $bakiakhir = $bakiawal - $keluar + $masuk + $totalPendahuluan - $glser - $totpanjaran;
+
+    $updateVault = Vault::on($cawangan['mysql'])
+        ->where([['tarikh', '=', $current->toDateString()], ['kodcaw', '=', $kodcaw]])
+        ->update([
+            'pendahuluan' => $totalPendahuluan,
+            'serahan'     => $glser,
+            'bakiakhir'   => $bakiakhir,
+            'bakieod'     => $bakiakhir,
+        ]);
+
+    return response()->json($updateVault, 200);
+}

 public function create($kodcaw,Request $request)
 {
@@ -481,25 +509,24 @@ class VaultController extends Controller
   }

   public function CalculationPendahuluanSerahan($kodcaw,Request $request)
-   {
-      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+{
+   $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

-      $serahanpkb = '1000/020';
-      $serahanjmc = '1000/026';
-      $pendahuluanpkb = '7000/102';
-      $pendahuluanjmc = '7000/106';
-      $serahankoperasi = '1000/090';
+   $serahanpkb = '1000/020';
+   $serahanjmc = '1000/026';
+   $pendahuluanpkb = '7000/102';
+   $pendahuluanjmc = '7000/106';
+   $serahankoperasi = '1000/090';

-      //Selepas Tawarruq
+   //Selepas Tawarruq

-      $serahanpkbTawarruq = GlDetail::on($cawangan['mysql'])
-         ->where('ktacct','=',$serahanpkb)
-         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2021-03-24')
-         ->sum('serahan');
+   $serahanpkbTawarruq = GlDetail::on($cawangan['mysql'])
+      ->where('ktacct','=',$serahanpkb)
+      ->where('tarikh','<=', $request->tarikh)
+      ->where('tarikh','>','2021-03-24')
+      ->sum('serahan');

-
-      //Sebelum Tawarruq
+       //Sebelum Tawarruq
      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915' || $kodcaw == '020303')
      {
         $serahanpkb = GlDetail::on($cawangan['mysql'])
@@ -546,47 +573,53 @@ class VaultController extends Controller



-      //Selepas Tawarruq
+   //Selepas Tawarruq

-      $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql'])
+   $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql'])
      ->where('ktacct','=',$pendahuluanpkb)
      ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2021-03-24']])
      ->sum('pendahuluan');

-      //Sebelum Tawarruq
+   //Sebelum Tawarruq

-      $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
-         ->where('ktacct','=',$pendahuluanpkb)
-         ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
-         ->sum('amaun');
-
-      $pendahuluanJMC = GlDetail::on($cawangan['mysql'])
-         ->where('ktacct','=','7000/106')
-         ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
-         ->sum('amaun');
-
-      $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
-         ->sum('pendahuluan_pkb');
-
-      $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
-         ->sum('pendahuluan_jmc');
-
-      $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
-
-      $pindahkekpkb = GlCode::on($cawangan['mysql'])
-      ->where('glcode','=',$serahankoperasi)
+   $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
+      ->where('ktacct','=',$pendahuluanpkb)
+      ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
      ->sum('amaun');

-      if($kodcaw == '011229')
-         $totalserahan -= 0.10;
+   $pendahuluanJMC = GlDetail::on($cawangan['mysql'])
+      ->where('ktacct','=','7000/106')
+      ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
+      ->sum('amaun');

-      if($kodcaw == '011013')
-         $totalserahan += 641000;
+   $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
+      ->sum('pendahuluan_pkb');

-      $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
+   $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
+      ->sum('pendahuluan_jmc');

-      return response()->json($arraypend);
-   }
+   //Pendahuluan Online (had)
+   $modalOnlineHad = ModalOnline::on($cawangan['mysql'])
+      ->where('kodcaw','=', $kodcaw)
+      ->where('tarikh','=', $request->tarikh)
+      ->value('had') ?? 0;
+
+   $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC + $modalOnlineHad;
+
+   $pindahkekpkb = GlCode::on($cawangan['mysql'])
+   ->where('glcode','=',$serahankoperasi)
+   ->sum('amaun');
+
+   if($kodcaw == '011229')
+      $totalserahan -= 0.10;
+
+   if($kodcaw == '011013')
+      $totalserahan += 641000;
+
+   $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
+
+   return response()->json($arraypend);
+}


   public function CalculationPendahuluanSerahanLejer($kodcaw,Request $request)
@@ -732,5 +765,19 @@ class VaultController extends Controller

      return response()->json($vault);
   }
+public function CalculationModalOnlineLejer($kodcaw, Request $request)
+{
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();

+    $tarikh = $request->hingga;
+
+    $modal_online = ModalOnline::on($cawangan['mysql'])
+        ->where('kodcaw', '=', $kodcaw)
+        ->where('tarikh', '=', $tarikh)
+        ->first();
+
+    return response()->json([
+        'had' => $modal_online ? floatval($modal_online->had) : 0,
+    ]);
+}
 }
@@ -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,
+                    ]);
+                }
+            }
+        }
+    }
+}