fix resit tebus (diskaun promosi)

enable kadar anggota for all branches

.envy

@@ -0,0 +1,50 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=base64:WRTHcFTq5YARKVdA8YDUzsh9Ue8vD63ivgZgXNNBiGo=
+APP_DEBUG=true
+APP_URL=http://ujrahkopkb.erahn.com.my
+API_URL=http://apiujrah-kopkb.erahn.com.my
+#API_ARRAHNBID=http://lelong.test/api/
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=kaunter_erahn
+DB_USERNAME=spider
+DB_PASSWORD=G0dz!ll4
+
+BROADCAST_DRIVER=pusher
+CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+PUSHER_APP_ID=1132718
+PUSHER_APP_KEY=26b0ec2f297f94b7aa9b
+PUSHER_APP_SECRET=421b61fb5a8ecce477a6
+
+MAIL_MAILER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+MYKAD_READER_PORT=8085
+MYKAD_READER_ENABLED_CAWANGAN=''    # IF NO CAWANGAN STATED, ALL CAWANGAN IS ENABLED

app/Http/Controllers/GadaianController.php

@@ -201,6 +201,8 @@ class GadaianController extends Controller
             'onepercent' => $onepercent,
             'margin_semasa' => $margin_pinjaman,
             'nokp' => $request->nokp,
+            'kadar_rebate' => $request->kadar_rebate,
+            'rebate' => $request->rebate
         ])->json();
 
 

app/Http/Controllers/KhazanahController.php

@@ -2459,6 +2459,7 @@ class KhazanahController extends Controller
         $penghutangkaki = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $untungrugi = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/UntungRugiCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $bayaranpendahuluan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/BayaranPendahuluan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $rebetpromo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/RebetPromoCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
         //Tanggungan Semasa
         $panjar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
@@ -2469,6 +2470,8 @@ class KhazanahController extends Controller
         $cajperkhidmatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $hapuskira = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $xtra = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/Xtra/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $rebetpromo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/RebetPromoCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $pelarasanrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/PelarasanRebate/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
 
         //TunaiDitangan Sementara Upah
@@ -2520,6 +2523,8 @@ class KhazanahController extends Controller
         if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
         if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
         if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
+        if($rebetpromo > 0) array_push($hartasemasa,['glcode' => '5000/242','descpt' => 'Diskaun Promosi', 'amaun' => ($rebetpromo * -1)]);
+
 
         $totalhartasemasa = 0;
         foreach($hartasemasa as $index => $hs)
@@ -2551,6 +2556,8 @@ class KhazanahController extends Controller
         if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
         if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
         if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
+        if($rebetpromo > 0) array_push($tanggungansemasa,['glcode' => '5000/242','descpt' => 'Diskaun Promosi', 'amaun' => ($rebetpromo * -1)]);
+        if($pelarasanrebate > 0) array_push($tanggungansemasa,['glcode' => '5000/243','descpt' => 'Pelarasan Rebate', 'amaun' => ($pelarasanrebate * -1)]);
 
         $totaltanggungansemasa = 0;
         foreach($tanggungansemasa as $index => $ts)

app/Http/Controllers/PenebusanController.php

@@ -278,167 +278,6 @@ class PenebusanController extends Controller
         $auth_user = Auth::user();
 
 
-        ////////////////////////
-       /// UPDATE TEBUS API////
-       ///////////////////////
-        $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
-            'nopelanggan' => $request->nopelanggan,
-            'jenistebus' => $request->jenistebus,
-            'jbg' => $request->jbg,
-            'kadarupah' => $request->kadarupah,
-            'nilai_marhun' => $request->nilai_marhun,
-            'pinjaman' => $request->pinjaman_lama,
-            'ansuran' => $request->ansuran,
-            'nowakil' => $request->nowakil,
-            'addpinjaman'=> $request->addpinjaman,
-            'bakipinjaman' => $request->bakipinjaman,
-            'bakiupah' => $request->bakiupah,
-            'historygadaian' => $request->historygadaian,
-            'marhun' => $request->marhun,
-            'jenisbayarantebus' => $request->jenisbayarantebus,
-            'jeniskeuntungan' => $request->jeniskeuntungan,
-            'teller' => $request->teller,
-            "duitpelanggan" => $request->bayaran,
-            "bakipelanggan" => $request->bakipelanggan,
-        ])->json();
-
-        if($updatetebus == 'duplicate'){
-            return response()->json('duplicate');
-        }
-
-        //////////////////////
-        /// MAKING NEW SAG////
-        /////////////////////
-
-        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
-        if($gadai_transaction){
-            $new_sirig = $gadai_transaction['sirig'] + 1;
-
-        }else{
-            $new_sirig = 1;
-        }
-
-        $new_transaction = sprintf("%04d",$new_sirig);
-        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
-
-        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
-            'norujukan' => $norujukanbaru,
-            'nopelanggan' => $request->nopelanggan,
-            'nokp' => $request->noic,
-            'sirig' => $new_sirig
-        ]);
-
-        ///////////////////////////
-        /// MARHUN UPDATE TABLE////
-        //////////////////////////
-
-
-        $arraymarhunbaru = [];
-
-        $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
-
-        $marhunyangdiambil = $marhunsediada[0];
-        foreach($marhunyangdiambil as $index=>$marhunloop)
-        {
-            $karatbaru = str_replace('.','-',$marhunloop['karat']);
-            $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
-
-            $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
-
-            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
-        }
-
-        foreach($arraymarhunbaru as $array1){
-            $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
-                'norujukan' => $norujukanbaru,
-                'marhun' => $array1['marhun'],
-                'nota' => $array1['nota'],
-                'karat' => $array1['karat'],
-                'berat_emas' => $array1['berat'],
-                'harga' => $array1['harga'],
-                'tag_permata' => $array1['tag_permata'],
-                'berat_batu_permata' => $array1['berat_batu_permata'],
-		'kuantiti' => $array1['bil']
-            ])->json();
-        }
-
-
-
-       //////////////////////
-      ////Update SAG BARU///
-      /////////////////////
-
-        $total_nilai_marhun = $request->nilai_marhun;
-        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
-        $kadarupah = $request->kadarkeuntungan * 100;
-
-        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
-            'pembiayaan' => $request->pinjaman,
-            'nilaimarhun' => $total_nilai_marhun,
-            'kadarujrah' => $request->kadarkeuntungan,
-            'margin' => ($margin_pinjaman*100),
-            'kodcaw' => Auth::user()->cawangan
-        ])->json();
-
-        $keuntungan_sebln = $onepercent['keuntungan'];
-        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
-        $keuntungan6bulan = $keuntungan_sebln * 6;
-        $keuntungan12bulan = $keuntungan_sebln * 12;
-        $hargajualan = $request->pinjaman + $keuntungan12bulan;
-
-
-
-
-        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-            'kodcaw' => $auth_user['cawangan'],
-            'nilaimarhun' => round($total_nilai_marhun, 2),
-            'berat' => round($request->total_berat, 2),
-            'pinjaman' => round($request->pinjaman, 2),
-            'kadarupah' => round($kadarupah, 2),
-            'marhun' => $request->marhun,
-            'percentpinj' => $margin_pinjaman,
-            'teller'=> $auth_user['name'],
-            'upah6' => $keuntungan6bulan,
-            'upah12' => $keuntungan12bulan,
-            'hargajualan' => $hargajualan,
-            'kuantiti_marhun' => $request->kuantiti_marhun
-        ])->json();
-
-        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
-            'unit_komuditi' => round($request->pinjaman, 2),
-            'norujukan' => $norujukanbaru,
-            'kodcaw' => $auth_user['cawangan'],
-            'teller' => $auth_user['name']
-        ]);
-
-        ////////////////////////////
-        ////Update History Gadaian///
-        ////////////////////////////
-
-        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
-            'historygadaian' => $request->norujukan,
-            'jenistebus' => $request->jenistebus,
-        ])->json();
-
-
-        event(new TebusNotify('lulus',Auth::user()->cawangan));
-        event(new GadaiNotify('lulus',Auth::user()->cawangan));
-        $this->AliranTunaiController->alirantunaiTebus($request);
-
-    }
-
-    public function tambahpinjaman_latest(Request $request)
-    {
-        $api_url = config('api.url');
-        $current = Carbon::now();
-        $current = new Carbon();
-        $curent_year = substr($current->year,2,2);
-        $curent_month = sprintf("%02d", $current->month);
-        $current_day = sprintf("%02d", $current->day);
-
-        $auth_user = Auth::user();
-
-
         ////////////////////////
        /// UPDATE TEBUS API////
        ///////////////////////
@@ -509,16 +348,252 @@ class PenebusanController extends Controller
             'totalbayaran' => $request->totalbayaran,
             "duitpelanggan" => $request->bayaran,
             "bakipelanggan" => $request->bakipelanggan,
-            "noic" => $request->noic,
-            "jenisAT" => $request->jenisAT,
         ])->json();
-        if($updatetebus['result'] == 'success'){
-            $alirantunai = new AliranTunaiController();
-            event(new TebusNotify('lulus',Auth::user()->cawangan));
-            event(new GadaiNotify('lulus',Auth::user()->cawangan));
-            $alirantunai->alirantunaiTebusAutoTawarruq($request);
+
+        if($updatetebus == 'duplicate'){
+            return response()->json('duplicate');
         }
-        return response()->json($updatetebus['result'],200);
+
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+       $arraymarhunbaru = [];
+
+       $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+           $karatbaru = str_replace('.','-',$marhunloop['karat']);
+           $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+           $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
+           $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
+
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
+       }
+
+       foreach($arraymarhunbaru as $array1){
+           $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+               'norujukan' => $norujukanbaru,
+               'marhun' => $array1['marhun'],
+               'nota' => $array1['nota'],
+               'karat' => $array1['karat'],
+               'berat_emas' => $array1['berat'],
+               'harga' => $array1['harga'],
+               'nilai_marhun' => $array1['n_marhun'],
+               'tag_permata' => $array1['tag_permata'],
+               'berat_batu_permata' => $array1['berat_batu_permata'],
+               'jenisAT' => $request->jenisAT,
+               'kuantiti' => $array1['bil']
+           ])->json();
+       }
+
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+        ]);
+
+
+        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+       ////Update History Gadaian///
+       ////////////////////////////
+
+        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan,
+            'jenistebus' => $request->jenistebus,
+        ])->json();
+
+        if($updatetebus == 'duplicate'){
+            return response()->json('duplicate');
+        }
+
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+       $arraymarhunbaru = [];
+
+       $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+       $marhunyangdiambil = $marhunsediada[0];
+       foreach($marhunyangdiambil as $index=>$marhunloop)
+       {
+           $karatbaru = str_replace('.','-',$marhunloop['karat']);
+           $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+
+           $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
+           $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
+
+           array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
+       }
+
+       foreach($arraymarhunbaru as $array1){
+           $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+               'norujukan' => $norujukanbaru,
+               'marhun' => $array1['marhun'],
+               'nota' => $array1['nota'],
+               'karat' => $array1['karat'],
+               'berat_emas' => $array1['berat'],
+               'harga' => $array1['harga'],
+               'nilai_marhun' => $array1['n_marhun'],
+               'tag_permata' => $array1['tag_permata'],
+               'berat_batu_permata' => $array1['berat_batu_permata'],
+               'jenisAT' => $request->jenisAT,
+	       'kuantiti' => $array1['bil']
+           ])->json();
+       }
+
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun);
+
+        $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[
+            'pembiayaan' => $request->pinjaman,
+            'nilaimarhun' => $total_nilai_marhun,
+            'kadarujrah' => $request->kadarkeuntungan,
+            'margin' => ($margin_pinjaman*100),
+            'kodcaw' => Auth::user()->cawangan
+        ])->json();
+
+        $keuntungan_sebln = $onepercent['keuntungan'];
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+        $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+        ]);
+
+
+        $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+       ////Update History Gadaian///
+       ////////////////////////////
+
+        $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan,
+            'jenistebus' => $request->jenistebus,
+        ])->json();
+
+
+        $alirantunai = new AliranTunaiController();
+        event(new TebusNotify('lulus',Auth::user()->cawangan));
+        event(new GadaiNotify('lulus',Auth::user()->cawangan));
+        $alirantunai->alirantunaiTebusAutoTawarruq($request);
+
+        return response()->json($updatemarhun,200);
+
     }
 
     public function tebusseparuh(Request $request)
@@ -618,7 +693,7 @@ class PenebusanController extends Controller
                 'tag_permata' => $array1['tag_permata'],
                 'berat_batu_permata' => $array1['berat_batu_permata'],
                 'nilai_marhun' => $array1['n_marhun'],
-                'kuantiti' => $array1['bil']
+		'kuantiti' => $array1['bil']
             ])->json();
 
         }

config/api.php

@@ -1,6 +1,6 @@
 <?php
 return [
   'url' => env('API_URL'),
-  'url_koop' => env('API_URL_KOOP','http://localhost:8000'),
+  'url_koop' => env('API_URL_KOOP','https://apiujrah.erahn.com.my'),
   'url_pkb' => env('API_URL_PKB','http://localhost:8000'),
 ];

resources/views/customers/v2/index.blade.php

@@ -525,38 +525,36 @@ var api_url = @json($api_url ?? '');
         });
 
         // Logik amaran SweetAlert
-        if("{{ auth()->user()->cawangan }}"  == 'X0301'){
-            if (search === true) {
-                if (blacklist_search === true) {
-                    Swal.fire({
-                        icon: 'warning',
-                        title: 'Amaran!',
-                        text: 'Pelanggan telah disenarai hitamkan dari Pembiayaan.'
-                    });
-                } 
-                else if (isAnggota && !isPelanggan) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'Anggota Belum Didaftarkan!',
-                        text: 'Pelanggan ini adalah anggota koperasi tetapi belum berdaftar sebagai pelanggan.'
-                    });
-                } 
-                else if (isPelanggan && !isAnggota) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'Pelanggan Bukan Anggota!',
-                        text: 'Pelanggan ini berdaftar tetapi belum menjadi anggota koperasi.'
-                    });
-                } 
-                else if (!isAnggota && !isPelanggan) {
-                    Swal.fire({
-                        icon: 'info',
-                        title: 'Pelanggan Tiada Dalam Rekod!',
-                        text: 'Sila Daftar Pelanggan.'
-                    });
-                }
-            }
-        }
+        if (search === true) {
+    if (blacklist_search === true) {
+        Swal.fire({
+            icon: 'warning',
+            title: 'Amaran!',
+            text: 'Pelanggan telah disenarai hitamkan dari Pembiayaan.'
+        });
+    } 
+    else if (isAnggota && !isPelanggan) {
+        Swal.fire({
+            icon: 'info',
+            title: 'Anggota Belum Didaftarkan!',
+            text: 'Pelanggan ini adalah anggota koperasi tetapi belum berdaftar sebagai pelanggan.'
+        });
+    } 
+    else if (isPelanggan && !isAnggota) {
+        Swal.fire({
+            icon: 'info',
+            title: 'Pelanggan Bukan Anggota!',
+            text: 'Pelanggan ini berdaftar tetapi belum menjadi anggota koperasi.'
+        });
+    } 
+    else if (!isAnggota && !isPelanggan) {
+        Swal.fire({
+            icon: 'info',
+            title: 'Pelanggan Tiada Dalam Rekod!',
+            text: 'Sila Daftar Pelanggan.'
+        });
+    }
+}
 
     });
 

resources/views/customers/v2/info.blade.php

@@ -75,7 +75,8 @@
                                             ->json();
                                     @endphp
                                     <input type="text" class="form-control" name="outstanding_semasa"
-                                        id="outstanding_semasa" readonly value="{{ number_format($outstanding_semasa, 2) }}">
+                                        id="outstanding_semasa" readonly
+                                        value="{{ number_format($outstanding_semasa, 2) }}">
                                 </div>
                             </div>
 
@@ -157,7 +158,7 @@
 
 
                         <!-- Butang Assign Sebagai Anggota -->
-                        @if (isset($showAssignAnggotaBtn) && $showAssignAnggotaBtn && auth()->user()->cawangan == 'X0301')
+                        @if (isset($showAssignAnggotaBtn) && $showAssignAnggotaBtn)
                             <div class="m-0 p-2">
                                 <button type="button" class="btn btn-success d-flex align-items-center"
                                     data-noic="{{ $noic }}" onclick="assignAnggota(this)">
@@ -363,31 +364,31 @@
                                     data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq"
                                     aria-selected="{{ $aria_selected_SAG_baru }}">SAG Baru</a>
                                 <a class="nav-item nav-link {{ $activate_tab_SAG_lama }}" " id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="{{ $aria_selected_SAG_lama }}"><span id="textnavsag">SAG Lama</span></a>
-                            </div>
-                        </nav>
-                        <div class="tab-content" id="navtawarruqdannottawarruq">
-                            <div class="tab-pane fade {{ $activate_pane_SAG_baru }}" id="nav-tawarruq" role="tabpanel" aria-labelledby="nav-tawarruq-tab">
-                                <table class="table table-striped table-hover" id="myTable">
-                                    <thead class="thead-dark">
-                                        <tr>
-                                            <th>Bil</th>
-                                            <th>No Rujukan</th>
-                                            <th>Tarikh Pembiayaan</th>
-                                            <th>Tarikh Matang</th>
-                                            <th>Baki Harga Jualan</th>
-                                            <th>Baki Pembiayaan</th>
-                                            <th>Margin</th>
-                                            <th>Tempoh</th>
-                                            <th>Keuntungan</th>
-                                            <th>Lelong</th>
-                                        </tr>
-                                    </thead>
-                                </table>
-                            </div>
-                            <div class="tab-pane fade {{ $activate_pane_SAG_lama }}" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
-                                <table id="xtawarruq" class="table table-striped table-hover">
-                                    <thead class="thead-dark">
-                                        {{-- <tr>
+                                </div>
+                            </nav>
+                            <div class="tab-content" id="navtawarruqdannottawarruq">
+                                <div class="tab-pane fade {{ $activate_pane_SAG_baru }}" id="nav-tawarruq" role="tabpanel" aria-labelledby="nav-tawarruq-tab">
+                                    <table class="table table-striped table-hover" id="myTable">
+                                        <thead class="thead-dark">
+                                            <tr>
+                                                <th>Bil</th>
+                                                <th>No Rujukan</th>
+                                                <th>Tarikh Pembiayaan</th>
+                                                <th>Tarikh Matang</th>
+                                                <th>Baki Harga Jualan</th>
+                                                <th>Baki Pembiayaan</th>
+                                                <th>Margin</th>
+                                                <th>Tempoh</th>
+                                                <th>Keuntungan</th>
+                                                <th>Lelong</th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                </div>
+                                <div class="tab-pane fade {{ $activate_pane_SAG_lama }}" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
+                                    <table id="xtawarruq" class="table table-striped table-hover">
+                                        <thead class="thead-dark">
+                                            {{-- <tr>
                                         <th>Bil</th>
                                         <th>No Rujukan</th>
                                         <th>Tarikh Gadai</th>
@@ -397,139 +398,139 @@
                                         <th>Tempoh</th>
                                         <th>Lelong</th>
                                     </tr> --}}
-                                        <tr>
-                                            <th>Bil</th>
-                                            <th>No Rujukan</th>
-                                            <th>Tarikh Pembiayaan</th>
-                                            <th>Tarikh Matang</th>
-                                            <th>Baki Harga Jualan</th>
-                                            <th>Baki Pembiayaan</th>
-                                            <th>Margin</th>
-                                            <th>Tempoh</th>
-                                            <th>Keuntungan</th>
-                                            <th>Lelong</th>
-                                        </tr>
-                                    </thead>
-                                </table>
+                                            <tr>
+                                                <th>Bil</th>
+                                                <th>No Rujukan</th>
+                                                <th>Tarikh Pembiayaan</th>
+                                                <th>Tarikh Matang</th>
+                                                <th>Baki Harga Jualan</th>
+                                                <th>Baki Pembiayaan</th>
+                                                <th>Margin</th>
+                                                <th>Tempoh</th>
+                                                <th>Keuntungan</th>
+                                                <th>Lelong</th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                </div>
                             </div>
+
+                            {{-- Sudah Tebus --}}
+
+                            <table id="dahtebusTable" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Penyelesaian Pembiayaan</th>
+                                        <th>Baki Pembiayaan</th>
+                                        <th>Margin</th>
+                                        <th>Tempoh</th>
+                                    </tr>
+                                </thead>
+                            </table>
+
+                            <table id="lelongTable" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh Lelong</th>
+                                        <th>Tarikh Tuntut</th>
+                                        <th>Pembiayaan</th>
+                                        <th>Harga Jual</th>
+                                        <th>Jum Tuntut/Bayar</th>
+                                        <th>Keuntungan</th>
+                                        <th>Caj Lelong</th>
+                                        <th>Status Tuntutan</th>
+                                        <th>Cetak</th>
+                                    </tr>
+                                </thead>
+                            </table>
+
+                            <div class="text-center">
+                                <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button>
+                                <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
+                                <button class="btn btn-primary" onclick="histfunc()">Rekod Pembiayaan</button>
+                                <button class="btn btn-primary" onclick="removeansuran(this)" id="button-remove-ansuran">Hapus Ansuran</button>
+                            </div>
+
                         </div>
-
-                        {{-- Sudah Tebus --}}
-
-                        <table id="dahtebusTable" class="table table-striped table-hover">
-                            <thead class="thead-dark">
-                                <tr>
-                                    <th>Bil</th>
-                                    <th>No Rujukan</th>
-                                    <th>Tarikh Penyelesaian Pembiayaan</th>
-                                    <th>Baki Pembiayaan</th>
-                                    <th>Margin</th>
-                                    <th>Tempoh</th>
-                                </tr>
-                            </thead>
-                        </table>
-
-                        <table id="lelongTable" class="table table-striped table-hover">
-                            <thead class="thead-dark">
-                                <tr>
-                                    <th>Bil</th>
-                                    <th>No Rujukan</th>
-                                    <th>Tarikh Lelong</th>
-                                    <th>Tarikh Tuntut</th>
-                                    <th>Pembiayaan</th>
-                                    <th>Harga Jual</th>
-                                    <th>Jum Tuntut/Bayar</th>
-                                    <th>Keuntungan</th>
-                                    <th>Caj Lelong</th>
-                                    <th>Status Tuntutan</th>
-                                    <th>Cetak</th>
-                                </tr>
-                            </thead>
-                        </table>
-
-                        <div class="text-center">
-                            <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button>
-                            <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button>
-                            <button class="btn btn-primary" onclick="histfunc()">Rekod Pembiayaan</button>
-                            <button class="btn btn-primary" onclick="removeansuran(this)" id="button-remove-ansuran">Hapus Ansuran</button>
-                        </div>
-
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-    </div>
+        </div>
 
-    <!-- Modal -->
-    <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-xl">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title" id="customer_detailLabel">Maklumat Pelanggan</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <form id="kemaskiniform">
-                        <div class='row form-group'>
-                            <div class='col-md-6'>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        Nama
+        <!-- Modal -->
+        <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="customer_detailLabel">Maklumat Pelanggan</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <form id="kemaskiniform">
+                            <div class='row form-group'>
+                                <div class='col-md-6'>
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            Nama
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='nama' id='nama' value="{{ $customer_info['nama'] }}" class='form-control'>
+                                        </div>
                                     </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='nama' id='nama' value="{{ $customer_info['nama'] }}" class='form-control'>
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No KP
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No KP
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No Pelanggan
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='nopelanggan' id='nopelanggan' value="{{ $customer_info['nopelanggan'] }}" class='form-control'>
+                                        </div>
                                     </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No Telefon 1
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : '' }}" class='form-control'>
+                                            <span id="errortelefon" style="color:red;"></span>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No Pelanggan
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            No Telefon 2
+                                        </div>
+                                        <div class='col-md-7'>
+                                            <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : '' }}" class='form-control'>
+                                            <span id="errortelefon2" style="color:red;"></span>
+                                        </div>
                                     </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='nopelanggan' id='nopelanggan' value="{{ $customer_info['nopelanggan'] }}" class='form-control'>
-                                    </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No Telefon 1
-                                    </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : '' }}" class='form-control'>
-                                        <span id="errortelefon" style="color:red;"></span>
-                                    </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        No Telefon 2
-                                    </div>
-                                    <div class='col-md-7'>
-                                        <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : '' }}" class='form-control'>
-                                        <span id="errortelefon2" style="color:red;"></span>
-                                    </div>
-                                </div>
-                                <div class='form-group row col-md-12'>
-                                    <div class='col-md-5'>
-                                        Bank
-                                    </div>
-                                    <div class='col-md-7'>
-                                        @php
-                                            $bank = Http::withOptions(['verify' => config('app.api_verify')])
-                                                ->get($api_url . '/api/bank')
-                                                ->json();
-                                        @endphp
-                                        <select class="form-control" name="kodbank" data-placeholder="Pilih Bank" id="kodbank" disabled="true">
-                                            <option value="-" selected disabled>-</option>
-                                             @foreach ($bank as $banks)
+                                    <div class='form-group row col-md-12'>
+                                        <div class='col-md-5'>
+                                            Bank
+                                        </div>
+                                        <div class='col-md-7'>
+                                            @php
+                                                $bank = Http::withOptions(['verify' => config('app.api_verify')])
+                                                    ->get($api_url . '/api/bank')
+                                                    ->json();
+                                            @endphp
+                                            <select class="form-control" name="kodbank" data-placeholder="Pilih Bank" id="kodbank" disabled="true">
+                                                <option value="-" selected disabled>-</option>
+                                                  @foreach ($bank as $banks)
                                     <option value="{{ $banks['abbreviation'] }}"
                                         {{ $banks['abbreviation'] == $customer_info['kodbank'] ? 'selected' : '' }}>
                                         {{ $banks['name'] }}</option>
@@ -971,7 +972,7 @@
                                                 var channel = pusher.subscribe(
                                                     'notice-kelulusan');
                                                 channel.bind('my-kelulusan', function(
-                                                data) {
+                                                    data) {
 
 
                                                     if (data.norujukan ==
@@ -995,7 +996,7 @@
                                                                     },
                                                                     success: function(
                                                                         data
-                                                                        ) {
+                                                                    ) {
                                                                         location
                                                                             .reload();
 
@@ -1004,17 +1005,18 @@
                                                                         xhr,
                                                                         status,
                                                                         error
-                                                                        ) {
+                                                                    ) {
                                                                         var err =
                                                                             eval(
                                                                                 "(" +
                                                                                 xhr
                                                                                 .responseText +
                                                                                 ")"
-                                                                                );
+                                                                            );
                                                                         alert
                                                                             (xhr
-                                                                                .responseText);
+                                                                                .responseText
+                                                                                );
                                                                     }
                                                                 });
                                                             });
@@ -1242,7 +1244,7 @@
                                 'RM ' + formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman']) / Number(gadai_detail[
                                     'nilaimarhun'])) * 100).toFixed(2)).toLocaleString(
-                                "en-GB") + '%',
+                                    "en-GB") + '%',
                                 gadai_detail['tempoh']
                             ]).draw();
                         } else if (jenistebus == "lelong") {
@@ -1273,7 +1275,7 @@
                                     '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' +
                                     gadai_detail['norujukan'] + ' data-tarikhtuntut=' +
                                     gadai_detail['trkhtuntut'] + '>' + gadai_detail[
-                                    'norujukan'] + '</a>',
+                                        'norujukan'] + '</a>',
                                     gadai_detail['t_lelong'],
                                     gadai_detail['trkhtuntut'],
                                     'RM ' + formatter.format(gadai_detail['pinjaman']),
@@ -1290,7 +1292,7 @@
                                     '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' +
                                     gadai_detail['norujukan'] + ' data-tarikhtuntut=' +
                                     gadai_detail['trkhtuntut'] + '>' + gadai_detail[
-                                    'norujukan'] + '</a>',
+                                        'norujukan'] + '</a>',
                                     gadai_detail['t_lelong'],
                                     gadai_detail['trkhtuntut'],
                                     'RM ' + formatter.format(gadai_detail['pinjaman']),
@@ -2164,10 +2166,10 @@
                                                                 cancelButtonText: 'Salah',
                                                                 reverseButtons: true
                                                             }).then((
-                                                            result) => {
+                                                                result) => {
                                                                 if (result
                                                                     .isConfirmed
-                                                                    ) {
+                                                                ) {
 
                                                                     $.ajax({
                                                                         method: 'put',
@@ -2181,11 +2183,11 @@
                                                                         },
                                                                         success: function(
                                                                             data
-                                                                            ) {
+                                                                        ) {
 
                                                                             if (data ===
                                                                                 1
-                                                                                ) {
+                                                                            ) {
                                                                                 Swal.fire({
                                                                                         icon: 'success',
                                                                                         title: 'Berjaya!',
@@ -2220,7 +2222,7 @@
                                                                     Swal
                                                                     .DismissReason
                                                                     .cancel
-                                                                    ) {
+                                                                ) {
                                                                     PengesahanAkhirWakil
                                                                         .fire(
                                                                             'Batal',
@@ -2242,12 +2244,12 @@
                                                             daftarwakilfunction
                                                                 (amaun,
                                                                     norujukan
-                                                                    );
+                                                                );
                                                         });
                                                     }
                                                 },
                                                 error: function(xhr, status,
-                                                error) {
+                                                    error) {
                                                     var err = eval("(" + xhr
                                                         .responseText + ")");
                                                     alert(xhr.responseText);
@@ -2479,7 +2481,7 @@
                                             success: function(data) {},
                                             error: function(xhr, status, error) {
                                                 var err = eval("(" + xhr.responseText +
-                                                ")");
+                                                    ")");
                                                 alert(xhr.responseText);
                                             }
                                         });
@@ -2527,7 +2529,7 @@
                                                                                 location
                                                                                     .reload();
                                                                             }
-                                                                            );
+                                                                        );
                                                                 } else {
                                                                     swalWithBootstrapButtons
                                                                         .fire(
@@ -2540,7 +2542,7 @@
                                                                                 location
                                                                                     .reload();
                                                                             }
-                                                                            );
+                                                                        );
                                                                 }
 
 
@@ -2554,10 +2556,10 @@
                                                                         xhr
                                                                         .responseText +
                                                                         ")"
-                                                                        );
+                                                                    );
                                                                 alert(xhr
                                                                     .responseText
-                                                                    );
+                                                                );
                                                             }
                                                         });
                                                         return true;
@@ -2716,10 +2718,10 @@
                                                                 'Maklumat Pembiayaan telah dihapuskan.',
                                                                 'success'
                                                             ).then(
-                                                            function() {
-                                                                location
-                                                                    .reload();
-                                                            });
+                                                                function() {
+                                                                    location
+                                                                        .reload();
+                                                                });
                                                     }
                                                 })
                                             },

resources/views/gadaian/v2/index.blade.php

@@ -29,6 +29,7 @@
             <div class="form-group row col-12">
                 <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
                 <input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
+                <input type="hidden" name="tag_anggota" id="tag_anggota" value="{{ $customer_info['tag_anggota'] ?? 0 }}">
 
             </div>
             <div class="col-12 mb-2">
@@ -180,6 +181,17 @@
                                     </div>
                                 </diV>
                             </div>
+                            <div class="col-4">
+                                <div class="form-group row">
+                                    <div class="col-md-6">
+                                        Kadar Rebet
+                                    </div>
+                                    <div class="col-md-6">
+                                        <input type="text" class="form-control" readonly name="rebate" id="rebate">
+                                        <input type="text" class="form-control" readonly name="kadar_rebate" id="kadar_rebate">
+                                    </div>
+                                </div>
+                            </div>
                             <div class="col-12">
                                 <input type="text" name="norujukan_gadai" id="norujukan_gadai" value="{{ $norujukan }}" hidden>
                                 <input type="text" name="marhun_detail" id="marhun_detail" value="" hidden>
@@ -583,18 +595,23 @@
         // }
 
         $.ajax({
-            method:'GET',
-            url: api_url + '/api/kadarujrah',
-            async:false,
-            data:{
-                'nokp': $('#nokp').val(),
-                'nilaimarhun' : total_nilai_marhun,
-                'kodcaw' : kodcaw_ujrah
-            },
-            success:function(data){
-                kadarupah = data;
-            }
-        });
+    method:'GET',
+    url: api_url + '/api/kadarujrah',
+    async:false,
+    data:{
+        'nokp': $('#nokp').val(),
+        'nilaimarhun' : total_nilai_marhun,
+        'kodcaw' : kodcaw_ujrah
+    },
+    success:function(data){
+        kadarupah = data;
+
+        // Jika anggota (tag_anggota = 1), kadar ujrah dipaksa 0.00
+        if(Number($('#tag_anggota').val()) === 1){
+            kadarupah = 0;
+        }
+    }
+});
 
         $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
         $('#marhun_detail').val(marhun_details);
@@ -657,12 +674,35 @@
 
         var keuntungan_sebulan = getRoundedMethod(array_keuntungan['keuntungan']);
         var keuntungan_6bln = getRoundedMethod(keuntungan_sebulan * 6);
+        var ujrah = getRoundedMethod(array_keuntungan['ujrah']);
+            var onepercent = getRoundedMethod(array_keuntungan['onepercent']);
 
+            // **Rebate Calculation**
+            let rebate, kadar_rebate;
+            if (pinjaman < 20000) {
+                rebate = keuntungan_sebulan * 0.05;
+                kadar_rebate = 5;
+            } else if (pinjaman >= 20000 && pinjaman <= 50000) {
+                rebate = keuntungan_sebulan * 0.10;
+                kadar_rebate = 10;
+            } else if (pinjaman > 50000 && pinjaman <= 100000) {
+                rebate = keuntungan_sebulan * 0.15;
+                kadar_rebate = 15;
+            } else {
+                rebate = keuntungan_sebulan * 0.20;
+                kadar_rebate = 20;
+            }
+
+            rebate = getRoundedMethod(rebate); // ✅ Round rebate before displaying
+
+            // **Display values**
         $('.span-pinjaman').text(formatter.format(percent_pinjaman.toFixed(2)) + ' %');
         $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
         $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
         $('#ujrah').val(formatter.format(getRoundedMethod(array_keuntungan['ujrah']).toFixed(2)));
         $('#onepercent').val(formatter.format(getRoundedMethod(array_keuntungan['onepercent']).toFixed(2)));
+        $('#rebate').val(formatter.format(rebate.toFixed(2))); // Correctly displaying rebate
+        $('#kadar_rebate').val(formatter.format(kadar_rebate.toFixed(2)) + ' %');
 
     });
 

resources/views/penebusan/v2/index.blade.php

@@ -208,6 +208,15 @@
                                 </div>
                             </div>
 
+                            {{-- <div class="form-group row">
+                                <div class="col-4">
+                                    JUMLAH PERLU DIBAYAR SELEPAS DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahselepasdiskaun" class="form-control" readonly/>
+                                </div>
+                            </div>                             --}}
+
                             <div>
                                 <fieldset class="scheduler-border">
                                     <div class="form-group row" id="divduitPelanggan">
@@ -313,6 +322,16 @@
                                 </div>
                             </div>
 
+                            <div class="form-group row" id="divtelahdibayar">
+                                <div class="col-4">
+                                    REBET DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahDiskaun" value="{{ number_format($gadai['diskaun'],2) }}" class="form-control" readonly/>
+                                    
+                                </div>
+                            </div>
+                            
                         </div>
                     </div>
                     <div id="jenisS" class="col-12 form-group row">
@@ -328,6 +347,14 @@
                                 </div>
                             </div>
 
+                            <div class="form-group row">
+                                <div class="col-4">
+                                    JUMLAH PERLU DIBAYAR SELEPAS DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="perludibayarAkhir" class="form-control" readonly/>
+                                </div>
+                            </div>                            
 
                             <div>
                                 <fieldset class="scheduler-border">
@@ -428,6 +455,15 @@
                                 </div>
                             </div>
 
+                            <div class="form-group row" id="divtelahdibayar">
+                                <div class="col-4">
+                                    REBET DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahDiskaun"  value="{{ number_format($gadai['diskaun'],2) }}" class="form-control" readonly/>
+                                </div>
+                            </div>
+
                             <div id="divbakipinjaman">
                                 <div class="form-group row">
                                     <div class="col-4">
@@ -563,6 +599,16 @@
                                 </div>
                             </div>  
                             
+                            <div class="form-group row" id="divtelahdibayar">
+                                <div class="col-4">
+                                    REBET DISKAUN (RM)
+                                </div>
+                                <div class="col-8">
+                                    <input type="text" id="jumlahDiskaun" value="{{ number_format($gadai['diskaun'],2) }}" class="form-control" readonly/>
+                                    
+                                </div>
+                            </div>
+
                         </div>
 
                     </div>
@@ -1395,8 +1441,17 @@
                 dataType: 'json',
                 async:false,
                 success:function(harga_tebus){
-                    $('#perludibayar').val(formatter.format(harga_tebus));
-                }
+    // // Ambil nilai diskaun
+    // let diskaun = parseFloat($('#jumlahDiskaun').val().replace(/,/g, '')) || 0;
+
+    // // Tolak diskaun terus dari harga tebus
+    // let harga_tebus_akhir = parseFloat(harga_tebus) - diskaun;
+
+    // // Set balik ke input 'PERLU DIBAYAR'
+    $('#perludibayar').val(formatter.format(harga_tebus));
+}
+
+
             });
 
             // Telah dibayar
@@ -1554,69 +1609,76 @@
 
     function bayarkey(e){
 
-        $('#bakiPelanggan').val('0.00');
-        $('#duitPelanggan').val('');
+$('#bakiPelanggan').val('0.00');
+$('#duitPelanggan').val('');
 
-        if($('#sltjenistebus').find(":selected").val() == 'S'){
-            let byr = $(e).val().replace(/[^0-9.-]+/g,"");
-            let total = 0;
-            let pdbyr = 0;
-            let totalseparuh = 0;
-            let totalnilaimarhunseparuh = 0;
-            var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
-            let upah = parseFloat($('#jumlahupah').val());
-            let ujrahrebet = parseFloat($('#jumujrahrebet').val().replace(/[^0-9.-]+/g,""));
-            let onepercentrebet = parseFloat($('#jumonepercentrebet').val().replace(/[^0-9.-]+/g,""));
+if($('#sltjenistebus').find(":selected").val() == 'S'){
+    let byr = $(e).val().replace(/[^0-9.-]+/g,"");
+    let total = 0;
+    let pdbyr = 0;
+    let totalseparuh = 0;
+    let totalnilaimarhunseparuh = 0;
+    var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+    let upah = parseFloat($('#jumlahupah').val());
+    let ujrahrebet = parseFloat($('#jumujrahrebet').val().replace(/[^0-9.-]+/g,""));
+    let onepercentrebet = parseFloat($('#jumonepercentrebet').val().replace(/[^0-9.-]+/g,""));
 
-            let rebet = ujrahrebet + onepercentrebet;
+    let rebet = ujrahrebet + onepercentrebet;
 
-            $.each( array_nm, function( index, value ) {
-                totalnilaimarhunseparuh += parseFloat(value);
-            });
+    $.each( array_nm, function( index, value ) {
+        totalnilaimarhunseparuh += parseFloat(value);
+    });
 
-            pdbyr = parseFloat(byr);
-            total =  $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (pdbyr - upah + rebet);
-            let totaldibayar = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) + (upah - rebet);
+    pdbyr = parseFloat(byr);
+    total =  $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (pdbyr - upah + rebet);
+    let totaldibayar = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) + (upah - rebet);
 
-            let bakinm = nmsemasa - totalnilaimarhunseparuh;
+    let bakinm = nmsemasa - totalnilaimarhunseparuh;
 
-            let totalkurang = bayaranseparuhasal + (upah - rebet);
-            let tenpercentmarhun = bakinm * 0.1;
-            let tenpercentblock =  getRoundedMethod(tenpercentmarhun);
+    let totalkurang = bayaranseparuhasal + (upah - rebet);
+    let tenpercentmarhun = bakinm * 0.1;
+    let tenpercentblock =  getRoundedMethod(tenpercentmarhun);
 
 
-            var totalcalculate = ((total/bakinm)*100);
+    var totalcalculate = ((total/bakinm)*100);
 
-            if(byr < totalkurang){
-                let test = totalkurang - (upah + rebet);
+    if(byr < totalkurang){
+        let test = totalkurang - (upah + rebet);
 
-                let bakipjm = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - (bayaranseparuhasal);
-                totalcalculate = ((bakipjm/bakinm) * 100);
+        let bakipjm = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - (bayaranseparuhasal);
+        totalcalculate = ((bakipjm/bakinm) * 100);
         
-                $(e).val(formatter.format(totalkurang.toFixed(2)));
-                $('#bakipinjaman').val(formatter.format(bakipjm.toFixed(2)));
-                $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
-                return false;
-            }
-
-            if(total < tenpercentblock){
-                let temptotal = totaldibayar - tenpercentblock;
-                let tempbakipjm = $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (temptotal - upah + rebet);
-
-                totalcalculate = ((tempbakipjm/bakinm) * 100);
-                $(e).val(formatter.format(temptotal.toFixed(2)));
-                $('#bakipinjaman').val(formatter.format(tempbakipjm.toFixed(2)));
-                $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
-                return false;
-            }
-
-
-
-            $('#bakipinjaman').val(total.toFixed(2));
-            $('#basic-separuh').text(Number(totalcalculate.toFixed(2)));
-        }
+        $(e).val(formatter.format(totalkurang.toFixed(2)));
+        $('#bakipinjaman').val(formatter.format(bakipjm.toFixed(2)));
+        $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
+        return false;
     }
 
+    if(total < tenpercentblock){
+        let temptotal = totaldibayar - tenpercentblock;
+        let tempbakipjm = $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - (temptotal - upah + rebet);
+
+        totalcalculate = ((tempbakipjm/bakinm) * 100);
+        $(e).val(formatter.format(temptotal.toFixed(2)));
+        $('#bakipinjaman').val(formatter.format(tempbakipjm.toFixed(2)));
+        $('#basic-separuh').text(formatter.format(Number(totalcalculate.toFixed(2))));
+        return false;
+    }
+
+
+
+    $('#bakipinjaman').val(total.toFixed(2));
+    $('#basic-separuh').text(Number(totalcalculate.toFixed(2)));
+  }
+}
+
+function kiraPerluDibayarSelepasDiskaun() {
+    var perluDibayar = parseFloat(document.getElementById("perludibayar").value.replace(/,/g, '')) || 0;
+    var diskaun = parseFloat(document.getElementById("jumlahDiskaun").value.replace(/,/g, '')) || 0;
+
+    var akhir = perluDibayar - diskaun;
+    document.getElementById("perludibayarAkhir").value = akhir.toFixed(2);
+}
     function bayartawarruq(e){
         var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
         var bayaran = parseFloat(e.value);
@@ -1835,6 +1897,25 @@
                 jeniskeuntungan = "asal";
             }
 
+            //kira rebet diskaun
+            
+            // let diskaun
+            // if (pinjaman < 20000) {
+            //     diskaun = jumupah * 0.05;
+                
+            // } else if (pinjaman >= 20000 && pinjaman <= 50000) {
+            //     diskaun = jumupah * 0.10;
+                
+            // } else if (pinjaman > 50000 && pinjaman <= 100000) {
+            //     diskaun = jumupah * 0.15;
+                
+            // } else {
+            //     diskaun = jumupah * 0.20;
+                
+            // }
+
+            //$('#jumdiskaun').val(formatter.format(diskaun.toFixed(2)));
+
             var nopelanggan = "{{ $gadai['nopelanggan'] }}";
             var jenistebus = $('#sltjenistebus').find(":selected").val();
             var jbg = "{{ $gadai['tempoh'] }}";
@@ -1850,6 +1931,7 @@
             var nowakil = nw;
             var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,"");
             var bakipelanggan =  $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,"");
+            //var diskaun =  $('#diskaun').val().replace(/[^0-9.-]+/g,"");
 
 
             if(Number(duitpelanggan) < Number(bakipinjaman)){
@@ -1878,6 +1960,7 @@
                     "addpinjaman" : addpinjaman,
                     "bakipinjaman" : bakipinjaman,
                     "bakiupah" : bakiupah,
+                    //"diskaun": diskaun,
                     "historygadaian" : historygadaian,
                     "marhun" : marhun,
                     "nowakil" : nowakil,
@@ -1979,10 +2062,27 @@
 
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
+            //kira rebet diskaun
+            // let diskaun
+            // if (pinjaman < 20000) {
+            //     diskaun = jumupah * 0.05;
+                
+            // } else if (pinjaman >= 20000 && pinjaman <= 50000) {
+            //     diskaun = jumupah * 0.10;
+                
+            // } else if (pinjaman > 50000 && pinjaman <= 100000) {
+            //     diskaun = jumupah * 0.15;
+                
+            // } else {
+            //     diskaun = jumupah * 0.20;
+                
+            // }
+
             var bayar = Number(parseFloat($('#bayaran').val().replace(/[^0-9.-]+/g,"")).toFixed(2));
             var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran + jumupah;
             var duitpelanggan = parseFloat($('#duitPelanggan').val().replace(/[^0-9.-]+/g,""));
             var bakipelanggan = parseFloat($('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""));
+            //var diskaun = parseFloat($('#diskaun').val().replace(/[^0-9.-]+/g,""));
 
             if(isNaN(duitpelanggan)) duitpelanggan = 0;
 

resources/views/print/laporan_gadaian_ujrah.blade.php

@@ -230,6 +230,7 @@
         <th>Lain-Lain Caj (RM)</th>
         <th>Keuntungan 1% (RM)</th>
         <th>Keuntungan</th>
+        <th>Diskaun Rebet</th>
         <th>Peratus (%)</th>
       </tr>
       @php 
@@ -301,6 +302,7 @@
           <td>{{ number_format($item['ujrah']*12,2) }}</td>
           <td>{{ number_format($item['onepercent']*12,2) }}</td>
           <td>{{ number_format($item['upah12'],2) }}</td>
+          <td>{{ number_format($item['diskaun'],2) }}</td>
           <td>{{ $item['percentpinj'] }}</td>
         </tr>
         @php $counter++; @endphp

resources/views/print/laporan_tebus_ujrah.blade.php

@@ -241,6 +241,7 @@
         <th>B.Pembiayaan(RM)</th>
         <th>Lain-Lain Caj (RM)</th>
         <th>Untung 1% (RM)</th>
+        <th>Diskaun Rebet (RM)</th>
         <th>Pendapatan(RM)</th>
         <th>Bayaran(RM)</th>
         <th>Jumlah(RM)</th>
@@ -254,6 +255,7 @@
         $totalupah = 0;
         $totalujrah = 0;
         $totalonepercent = 0;
+        $totaldiskaunrebate = 0;
     @endphp
 
     @foreach ($tebus as $index => $item)
@@ -266,6 +268,7 @@
             $totalnm += $item['nilaimarhun'];
             $totalujrah += $item['ujrah'];
             $totalonepercent += $item['onepercent'];
+            $totaldiskaunrebate += $item['diskaun_rebate'];
 
         @endphp
 
@@ -282,6 +285,7 @@
                     $totalbayaranteller = 0;
                     $totalujrahteller = 0;
                     $totalonepercentteller = 0;
+                    $totaldiskaunrebateteller = 0;
                 @endphp
             @endif
         @else
@@ -297,6 +301,7 @@
                 $totaljumlahteller = 0;
                 $totalujrahteller = 0;
                 $totalonepercentteller = 0;
+                $totaldiskaunrebateteller = 0;
             @endphp
         @endif
 
@@ -337,6 +342,7 @@
             <td>{{ number_format($item['ujrah'], 2) }}</td>
             <td>{{ number_format($item['onepercent'], 2) }}</td>
             {{-- <td>{{ number_format($item['bakiupah'], 2) }}</td> --}}
+            <td>{{ number_format($item['diskaun_rebate'], 2) }}</td>
             <td>
               @php
                   if ($item['tagbaru']) {
@@ -371,6 +377,7 @@
             $totalbayaranteller += $item['bakipjm']; //
             $totalujrahteller += $item['ujrah'];
             $totalonepercentteller += $item['onepercent'];
+            $totaldiskaunrebateteller += $item['diskaun_rebate'];
         @endphp
 
         @php
@@ -388,6 +395,7 @@
                     <td><b>{{ number_format($totalpinjamanteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalujrahteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalonepercentteller, 2) }} </b></td>
+                    <td><b>{{ number_format($totaldiskaunrebateteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalupahteller, 2) }} </b></td>
                     <td><b>{{ number_format($totalbayaranteller, 2) }} </b></td>
                     <td><b>{{ number_format($totaljumlahteller, 2) }} </b></td>
@@ -402,6 +410,7 @@
                     $totaljumlahteller = 0;
                     $totalujrahteller = 0;
                     $totalonepercentteller = 0;
+                    $totaldiskaunrebateteller = 0;
                 @endphp
             @endif
         @else
@@ -412,6 +421,7 @@
                 <td><b>{{ number_format($totalpinjamanteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalujrahteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalonepercentteller, 2) }} </b></td>
+                <td><b>{{ number_format($totaldiskaunrebateteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalupahteller, 2) }} </b></td>
                 <td><b>{{ number_format($totalbayaranteller, 2) }} </b></td>
                 <td><b>{{ number_format($totaljumlahteller, 2) }} </b></td>

resources/views/print/resittebus_ujrah.blade.php

@@ -646,12 +646,18 @@
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
+              
             <tr>
                  <td style="width:10px">Jumlah Keuntungan + Lain-Lain Caj</td>
                  <td style="width:10px">: <strong>RM
                     {{ number_format($penebusan['onepercent'] + $penebusan['ujrah'], 2) }}</strong> 
                 </td>
             </tr>
+            <tr>
+                <td style="width:10px">(-) Diskaun Promosi</td>
+                <td style="width:10px">: RM
+                    {{ number_format($gadai['diskaun'], 2) }} </td>
+            </tr>
             <tr>
                 <td></td>
             </tr>
@@ -879,12 +885,18 @@
                 <td style="width:10px">: RM
                     {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
+            
             <tr>
                  <td style="width:10px">Jumlah Keuntungan + Lain-Lain Caj</td>
                  <td style="width:10px">: <strong>RM
                     {{ number_format($penebusan['onepercent'] + $penebusan['ujrah'], 2) }}</strong> 
                 </td>
             </tr>
+            <tr>
+                <td style="width:10px">(-) Diskaun Promosi</td>
+                <td style="width:10px">: RM
+                    {{ number_format($gadai['diskaun'], 2) }} </td>
+            </tr>
             <tr>
                 <td></td>
             </tr>

resources/views/print/sag_ujrah_3.blade.php

@@ -655,7 +655,7 @@
             </table>
             <table class="main-table text-center" style="border-top: none !important">
                 <tr>
-                    <th colspan="5">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ BERDASARKAN TEMPOH PEMBIAYAAN</th>
+                    <th colspan="5">JUMLAH KEUNTUNGAN BERDASARKAN TEMPOH PEMBIAYAAN</th>
                 </tr>
                 <tr>
                     <th>TEMPOH PEMBIAYAAN</th>
@@ -670,13 +670,13 @@
                     <td>{{ $formatted_t_matang_1 }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN (1%) DAN LAIN-LAIN CAJ YANG PERLU DIBAYAR</th>
+                    <th class="text-left">JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</th>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</b></td>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</b></td>
                     <td>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN (1%) DAN LAIN-LAIN CAJ TERKUMPUL<br> SEPANJANG TEMPOH
+                    <th class="text-left">JUMLAH KEUNTUNGAN TERKUMPUL<br> SEPANJANG TEMPOH
                         PEMBIAYAAN
                     </th>
                     <td>-</td>
@@ -717,7 +717,7 @@
                                 <tr>
                                     <td colspan="4">
                                         Pelanggan bersetuju dan dengan ini menggadaikan Marhun sebagai cagaran kepada
-                                        Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Lain-Lain Caj Terkumpul
+                                        Jumlah Pembiayaan termasuk Jumlah Keuntungan Terkumpul
                                         mengikut
                                         syarat-syarat pembiayaan dalam SAG ini. KoPKB dengan ini menerima gadaian Marhun
                                         tersebut.
@@ -731,14 +731,12 @@
                         <td style="vertical-align: top">
                             <table class="akad-table">
                                 <tr>
-                                    <td colspan="4"><b><u>AKAD (SIMPAN MARHUN)</u></b></td>
+                                    <td colspan="4"><b><u>KADAR KEUNTUNGAN BULANAN</u></b></td>
                                 </tr>
                                 <tr>
                                     <td colspan="4">
-                                        Pelanggan dengan ini bersetuju marhun disimpan oleh KoPKB dan bersetuju membayar
-                                        lain-lain caj
-                                        sebagaimana jadual dibawah bagi setiap
-                                        RM100.00 Jumlah Marhun Keseluruhan:
+                                        Kadar keuntungan Pembiayaan Ar-Rahn Tawarruq adalah berdasarkan jumlah
+                                        pembiayaan seperti berikut :
                                     </td>
                                 </tr>
                             </table>
@@ -746,35 +744,35 @@
                                 <table class="main-table text-center"
                                     style="font-size: 9px; width: 100%; margin-top: 5px;">
                                     <tr>
-                                        <th>KADAR LAIN-LAIN CAJ / RM100</th>
+                                        <th>KADAR KEUNTUNGAN SEBULAN (%)</th>
                                     </tr>
                                     <tr>
-                                        <td>RM{{ $kadar_ujrah[0]['kadarujrah'] }}/sebulan</td>
+                                        <td>1.00</td>
                                     </tr>
                                 </table>
                             @else
                                 <table class="main-table text-center"
                                     style="font-size: 9px; width: 100%; margin-top: 5px;">
                                     <tr>
-                                        <th>NILAI MARHUN KESELURUHAN</th>
+                                        <th>JUMLAH PEMBIAYAAN</th>
                                         <th></th>
-                                        <th>KADAR LAIN-LAIN CAJ / RM100</th>
+                                        <th>KADAR KEUNTUNGAN SEBULAN (%)</th>
                                     </tr>
                                     <tr>
                                         <td>
                                             < RM400.99</td>
                                         <td>-</td>
-                                        <td>RM{{ $kadar_ujrah[0]['kadarujrah'] }}/sebulan</td>
+                                        <td>{{ $kadar_ujrah[0]['kadarupdah'] }}</td>
                                     </tr>
                                     <tr>
                                         <td>RM401.00 - RM2000.99</td>
                                         <td>-</td>
-                                        <td>RM{{ $kadar_ujrah[1]['kadarujrah'] }}/sebulan</td>
+                                        <td>{{ $kadar_ujrah[1]['kadarupdah'] }}</td>
                                     </tr>
                                     <tr>
                                         <td>> RM2001.00</td>
                                         <td>-</td>
-                                        <td>RM{{ $kadar_ujrah[2]['kadarujrah'] }}/sebulan</td>
+                                        <td>{{ $kadar_ujrah[2]['kadarupdah'] }}</td>
                                     </tr>
                                 </table>
                             @endif
@@ -829,15 +827,15 @@
                                 <tr>
                                     <td></td>
                                     <td>e.</td>
-                                    <td colspan="2">Membayar Jumlah Pembiayaan termasuk Jumlah Keuntungan dan
-                                        Lain-Lain Caj Terkumpul yang diberi mengikut dalam tempoh seperti di SAG ini;
+                                    <td colspan="2">Membayar Jumlah Pembiayaan termasuk Jumlah Keuntungan yang diberi
+                                        mengikut dalam tempoh seperti di SAG ini;
                                     </td>
                                 </tr>
                                 <tr>
                                     <td></td>
                                     <td>f.</td>
                                     <td colspan="2">Tertakluk kepada pembayaran penuh Jumlah Pembiayaan termasuk
-                                        Jumlah Keuntungan dan Lain-Lain Caj Terkumpul, Pelanggan perlu hadir sendiri
+                                        Jumlah Keuntungan Terkumpul, Pelanggan perlu hadir sendiri
                                         menyelesaikan Pembiayaan;</td>
                                 </tr>
                                 <tr>
@@ -1066,8 +1064,7 @@
                                 <td colspan="1"></td>
                                 <td colspan="1">o.</td>
                                 <td colspan="2">KoPKB berhak menuntut Jumlah Pembiayaan termasuk Jumlah Keuntungan
-                                    dan
-                                    Lain-Lain Caj Terkumpul setelah tamat tempoh yang dinyatakan pada notis berkaitan;
+                                    setelah tamat tempoh yang dinyatakan pada notis berkaitan;
                                 </td>
                             </tr>
                             <tr>
@@ -1148,7 +1145,7 @@
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
-                                <td colspan="1">v.</td>
+                                <td colspan="1">u.</td>
                                 <td colspan="2">Jika berlaku kehilangan SAG ini, KoPKB hanya boleh mengeluarkan
                                     salinan
                                     yang disahkan,
@@ -1159,7 +1156,7 @@
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
-                                <td colspan="1">w.</td>
+                                <td colspan="1">v.</td>
                                 <td colspan="2">SAG ini sah diperlakukan sepanjang tempoh matang (daripada tarikh
                                     pembiayaan
                                     sehingga tempoh matang) atau sehingga tempoh lanjutan (sekiranya layak) dan;
@@ -1167,7 +1164,7 @@
                             </tr>
                             <tr>
                                 <td colspan="1"></td>
-                                <td colspan="1">x.</td>
+                                <td colspan="1">w.</td>
                                 <td colspan="2">KoPKB berhak mengubah, mengubahsuai, menambah atau mengeluarkan
                                     terma
                                     dan syarat ini atau
@@ -1212,8 +1209,7 @@
                                 <td colspan="1">a.</td>
                                 <td colspan="2">Marhun akan dilelong atau dijual. KoPKB akan membatalkan
                                     lelongan Marhun sekiranya Pelanggan membayar tunggakan Jumlah Pembiayaan
-                                    termasuk Jumlah Keuntungan dan
-                                    Lain-Lain Caj
+                                    termasuk Jumlah Keuntungan
                                     sepenuhnya tiga (3) hari sebelum tarikh lelongan;</td>
                             </tr>
                             <tr>
@@ -1233,7 +1229,7 @@
                                 <td colspan="1">c.</td>
                                 <td colspan="2">Sebarang lebihan hasil lelongan atau jualan (jika ada) setelah
                                     ditolak
-                                    Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Lain-Lain Caj Terkumpul
+                                    Jumlah Pembiayaan termasuk Jumlah Keuntungan Terkumpul
                                     yang tertunggak dan kos-kos berkaitan akan
                                     dikembalikan
                                     kepada Pelanggan dan;</td>
@@ -1264,7 +1260,7 @@
                                 <td>=</td>
                                 <td><b>BAKI TEMPOH PEMBIAYAAN <br></td>
                                 <td>X</td>
-                                <td><b>JUMLAH KEUNTUNGAN 1% DAN LAIN-LAIN CAJ YANG PERLU DIBAYAR</b></td>
+                                <td><b>JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</b></td>
                             </tr>
                         </table>
                         <br>
@@ -1280,7 +1276,7 @@
                                 <td colspan="1"></td>
                                 <td colspan="1">a.</td>
                                 <td colspan="2">Pelanggan gagal dan/ingkar menjelaskan Jumlah Pembiayaan,
-                                    Jumlah Keuntungan dan Lain-Lain Caj Terkumpul pada tarikh yang ditetapkan;
+                                    Jumlah Keuntungan Terkumpul pada tarikh yang ditetapkan;
                                 </td>
                             </tr>
                             <tr>
@@ -1306,6 +1302,45 @@
                             <tr>
                                 <td colspan="1"></td>
                                 <td colspan="1"><b>6.</b></td>
+                                <td colspan="2"><b>Pelanggan dengan ini bersetuju, memberi kuasa dan melantik
+                                        Ar-Rahn sebagai wakil (wakil di bawah prinsip Wakalah) untuk menguruskan baki
+                                        hasil lelongan yang menjadi hak Pelanggan,
+                                        sekiranya ada, yang bernilai RM10.00 (Ringgit Malaysia: Sepuluh) atau kurang,
+                                        dan tidak dituntut oleh Pelanggan dalam tempoh tuntutan yang ditetapkan oleh
+                                        Ar-Rahn setelah usaha munasabah telah diambil untuk memaklumkan kepada
+                                        Pelanggan.</b></td>
+                            </tr>
+                            <tr>
+                                <td colspan="1"></td>
+                                <td colspan="1"><b>7.</b></td>
+                                <td colspan="2">
+                                    <b>
+                                        Pelanggan selanjutnya bersetuju bahawa baki hasil lelongan tersebut boleh
+                                        disalurkan oleh Ar-Rahn, bagi pihak Pelanggan, sebagai infaq kepada mana-mana
+                                        institusi agama Islam, badan kebajikan atau institusi lain yang diluluskan
+                                        oleh Jawatankuasa Syariah dan/atau pihak berkuasa yang berkaitan, tanpa
+                                        sebarang liabiliti ke atas Ar-Rahn selepas penyaluran tersebut dibuat dengan
+                                        jumlah tidak melebihi RM10.00.
+                                    </b>
+
+                                    <div style="margin-top: 8px;">
+                                        <span
+                                            style="
+                display: inline-block;
+                width: 13px;
+                height: 13px;
+                border: 1px solid #000;
+                margin-right: 6px;
+                vertical-align: middle;
+            "></span>
+                                        <b>Tandakan (✓) jika tidak bersetuju.</b>
+                                    </div>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td colspan="1"></td>
+                                <td colspan="1"><b>8.</b></td>
                                 <td colspan="2"><b>Sekiranya Pelanggan mempunyai sebarang pertanyaan atau
                                         aduan, Pelanggan boleh menghubungi KoPKB sebagaimana berikut:</b></td>
                             </tr>
@@ -1607,7 +1642,7 @@
                         <p>{{ $cawangan_detail['namacaw'] }}</p>
                         <p>{{ $cawangan_detail['alamat1'] }}</p>
                         <p>{{ $cawangan_detail['alamat2'] }}</p>
-                        <p>{{ $cawangan_detail['notel'] }}</p>
+                        <p>No Tel: {{ $cawangan_detail['notel'] }}</p>
                     </div>
                 </div>
                 <div class="header-center">
@@ -1713,6 +1748,7 @@
             {{-- MARHUN DETAIL SECTION --}}
             <div class="main-marhun">
                 <table class="main-table text-center" style="width: 75%">
+
                     <tr>
                         <th>BIL</th>
                         <th>JENIS MARHUN</th>
@@ -1846,7 +1882,7 @@
             </table>
             <table class="main-table text-center" style="border-top: none !important">
                 <tr>
-                    <th colspan="5">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ BERDASARKAN TEMPOH PEMBIAYAAN</th>
+                    <th colspan="5">JUMLAH KEUNTUNGAN BERDASARKAN TEMPOH PEMBIAYAAN</th>
                 </tr>
                 <tr>
                     <th>TEMPOH PEMBIAYAAN</th>
@@ -1861,19 +1897,27 @@
                     <td>{{ $formatted_t_matang_1 }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ YANG PERLU DIBAYAR BULANAN</th>
+                    <th class="text-left">JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR BULANAN</th>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</b></td>
                     <td style="font-size:12px"><b>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</b></td>
                     <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                 </tr>
                 <tr>
-                    <th class="text-left">JUMLAH KEUNTUNGAN DAN LAIN-LAIN CAJ TERKUMPUL <br> SEPANJANG TEMPOH
+                    <th class="text-left">JUMLAH KEUNTUNGAN TERKUMPUL <br> SEPANJANG TEMPOH
                         PEMBIAYAAN</th>
                     <td>-</td>
                     <td>RM{{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                     <td>RM{{ number_format($gadai_detail['upah12'], 2) }}</td>
                 </tr>
             </table>
+
+            <div style="color: black; font-weight: bold; margin-top: 0px; width: 100%;"> 
+                <span>PENGURUSAN HASIL LELONGAN YANG TIDAK DITUNTUT</span>
+
+                <span>
+                    <input type="checkbox" name="hasil_lelongan_tidak_dituntut">
+                </span>
+            </div>
             {{-- SIGNATURE SECTION --}}
             <table class="main-table mt-10">
                 <tr>
@@ -2138,8 +2182,8 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                     <td style="width: 50px;">Nama:</td>
-                                     <td>
+                                    <td style="width: 50px;">Nama:</td>
+                                    <td>
                                         {{ $customer_detail['nama'] }}
                                     </td>
                                 </tr>
@@ -2171,12 +2215,12 @@
                                 </tr>
                                 <tr>
                                     <td style="width: 50px;">Nama:</td>
-                                        <td>
-                                            @if ($gadai_detail['penilai'] == '')
-                                                {{ $auth_username }}
-                                            @else
-                                                {{ $gadai_detail['penilai'] }}
-                                            @endif
+                                    <td>
+                                        @if ($gadai_detail['penilai'] == '')
+                                            {{ $auth_username }}
+                                        @else
+                                            {{ $gadai_detail['penilai'] }}
+                                        @endif
                                     </td>
                                 </tr>
                                 <tr>