diff --git a/app/Helper.php b/app/Helper.php index a43ca4f..386b6b5 100644 --- a/app/Helper.php +++ b/app/Helper.php @@ -1,20 +1,83 @@ format("d-m-Y"); } + + public static function terbilangBm(int $number): string + { + $units = [ + 0 => 'kosong', + 1 => 'satu', + 2 => 'dua', + 3 => 'tiga', + 4 => 'empat', + 5 => 'lima', + 6 => 'enam', + 7 => 'tujuh', + 8 => 'lapan', + 9 => 'sembilan', + 10 => 'sepuluh', + 11 => 'sebelas' + ]; + + if ($number < 0) return 'negatif ' . self::terbilangBm(abs($number)); + if ($number < 12) return $units[$number]; + if ($number < 20) return self::terbilangBm($number - 10) . ' belas'; + if ($number < 100) { + $tens = intdiv($number, 10); + $rest = $number % 10; + return self::terbilangBm($tens) . ' puluh' . ($rest ? ' ' . self::terbilangBm($rest) : ''); + } + if ($number < 200) return 'seratus' . ($number > 100 ? ' ' . self::terbilangBm($number - 100) : ''); + if ($number < 1000) { + $hundreds = intdiv($number, 100); + $rest = $number % 100; + return self::terbilangBm($hundreds) . ' ratus' . ($rest ? ' ' . self::terbilangBm($rest) : ''); + } + if ($number < 2000) return 'seribu' . ($number > 1000 ? ' ' . self::terbilangBm($number - 1000) : ''); + if ($number < 1000000) { + $thousands = intdiv($number, 1000); + $rest = $number % 1000; + return self::terbilangBm($thousands) . ' ribu' . ($rest ? ' ' . self::terbilangBm($rest) : ''); + } + if ($number < 1000000000) { + $millions = intdiv($number, 1000000); + $rest = $number % 1000000; + return self::terbilangBm($millions) . ' juta' . ($rest ? ' ' . self::terbilangBm($rest) : ''); + } + return 'terlalu besar'; + } + + public static function ringgitTerbilang($amount, bool $tambahSahaja = true): string + { + $formatted = number_format((float)$amount, 2, '.', ''); + [$ringgitStr, $senStr] = explode('.', $formatted); + + $ringgit = (int)$ringgitStr; + $sen = (int)$senStr; + + $parts = []; + $parts[] = self::terbilangBm($ringgit) . ' ringgit'; + + if ($sen > 0) { + $parts[] = 'dan ' . self::terbilangBm($sen) . ' sen'; + } elseif ($tambahSahaja) { + $parts[] = 'sahaja'; + } + + return trim(preg_replace('/\s+/', ' ', implode(' ', $parts))); + } } diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 32acd64..06b0820 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -2,12 +2,14 @@ namespace App\Http\Controllers; +use App\User; +use App\Cawangan; +use Carbon\Carbon; use Illuminate\Http\Request; use App\Services\CustomerService; -use Illuminate\Support\Facades\Session; -use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; -use Carbon\Carbon; +use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Session; class AliranTunaiController extends Controller @@ -599,7 +601,7 @@ class AliranTunaiController extends Controller return response($updateTunai); } - public function LaporanAliranTunai($teller) + public function LaporanAliranTunai($teller, Request $request) { $auth_user = Auth::user(); $api_url = config('api.url'); @@ -611,8 +613,6 @@ class AliranTunaiController extends Controller $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - $tarikh_cetak = $current->toDateString(); - $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $alirantunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json(); @@ -621,7 +621,67 @@ class AliranTunaiController extends Controller $teller = $auth_user['name']; - return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller')); + $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[ + 'tarikh' => $request->datetimepicker1 + ])->json(); + + return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller', 'bakiLelong')); + } + + public function laporanAliranTunaiTeller() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + return view('khazanah.laporan.alirantunai', compact('api_url', 'cawangan_info')); + } + + public function cetakLaporanAliranTunaiTeller(Request $request) + { + $api_url = config('api_url'); + $auth_user = Auth::user(); + + $current = Carbon::now(); + $current = new Carbon(); + + $tarikh_cetak = $current->toDateString(); + if($request->datetimepicker1 == null){ + $tarikh = $current->toDateString(); + }else{ + $split_date = explode('-',$request->datetimepicker1); + $tarikh = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $addtunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json(); + + $teller = $auth_user['name']; + + $bakiLelong = Http::withOptions(['verify' =>config('app.api_verify')])->get(config('api.url') . '/api/lelong/bakilelongbyteller/'.$auth_user['cawangan'],[ + 'tarikh' => $tarikh, + 'kodlaluan' => $auth_user['name'] + ])->json(); + + $tunai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getTunaiByTarikh/',[ + 'kodlaluan' => $auth_user['name'], + 'kodcaw' => $auth_user['cawangan'], + 'tarikh' => $tarikh + ])->json(); + + if(!$tunai) + { + return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.'); + } + + $jumlahTambah = $tunai['tambah'] + $tunai['masuk'] + $bakiLelong['rugi_lelong']; + $jumlahTolak = $tunai['kurang'] + $tunai['keluar'] + $bakiLelong['baki_lelong']; + + return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','tunai','teller', 'bakiLelong', 'jumlahTambah', 'jumlahTolak')); } public function LaporanTunaiTeller(Request $request){ diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index e69b3a1..03e7252 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4417,4 +4417,274 @@ class KhazanahController extends Controller } -} + public function pampasanDetail($id) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/cawangan/' . $auth_user['cawangan']) + ->json(); + + $gadai = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/gadai/norujukan/' . '011237' . '/' . $id) + ->json(); + + $gadai_info = is_array($gadai) && isset($gadai[0]) ? $gadai[0] : $gadai; + + $customer_info = null; + if(isset($gadai_info['nokp'])) { + $customer = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp']) + ->json(); + + $customer_info = null; + if (isset($gadai_info['nokp'])) { + $customer = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp']) + ->json(); + + $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer; + } + + + $barang_kes = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/palsu/laporan/', ['kodcaw' => $auth_user['cawangan']]) + ->json(); + + // You may need to adjust the array index if the API returns an array of results + $gadai_info = is_array($gadai) && isset($gadai[0]) ? $gadai[0] : $gadai; + // $pampasan_info = is_array($pampasan) && isset($pampasan[0]) ? $pampasan[0] : $pampasan; + + $barang_kes_collection = collect($barang_kes); + $barang_kes_info = $barang_kes_collection->where('norujukan', '=', $id)->first(); + + $customer_info = null; + if (isset($gadai_info['nokp'])) { + $customer = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp']) + ->json(); + + $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer; + } + + $denominasi = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/DenominasiController/' . $auth_user['cawangan'])->json(); + + if (sizeof($denominasi) == 0) { + $denominasi = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/DenominasiCreate/' . $auth_user['cawangan'])->json(); + } else { + $denominasi = $denominasi[0]; + } + + $pampasan = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/pampasan', ['kodcaw' => '011237', 'norujukan' => $id]) + ->json()['data'][0]; + + $baucerno = $pampasan['baucerno']; + $nilaimarhun = $barang_kes_info['nilaimarhun'] ?? 0; + $pembiayaan = $barang_kes_info['pembiayaan'] ?? 0; + $untung = $barang_kes_info['untung'] ?? 0; + + + $jumlah_tebus = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/tebus/norujukan/' . $auth_user['cawangan'] . '/' . $id) + ->json()[0]['bakipjm']; + + $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung; + + $jumlahPanjar = $jumlah_tebus + $jumlah_pampasan; + + return view('khazanah.pampasan_detail', compact('gadai_info', 'barang_kes_info', 'cawangan_info', 'customer_info', 'baucerno', 'denominasi', 'jumlah_pampasan', 'jumlah_tebus', 'jumlahPanjar')); + } + } + + public function initiatePampasan(Request $request) + { + $norujukan = $request->input('norujukan'); + $teller = auth()->user()->name; + $kodcaw = auth()->user()->cawangan; + $baucerno = $this->generateBaucer($kodcaw); + + $response = Http::post(config('api.url') . '/api/pampasan/initiatePampasan', [ + 'norujukan' => $norujukan, + 'kodcaw' => $kodcaw, + 'teller' => $teller, + 'baucerno' => $baucerno, + ]); + + if ($response->failed()) { + throw new \Exception("HTTP error! status: " . $response->status(), 1); + } + + $result = $response->json(); + + // $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung; + // $jumlahTebus = $pembiayaan + $untung; + // $jumlahPanjar = $jumlah_pampasan + $jumlahTebus; + + //return view('khazanah.pampasan_detail', compact('gadai_info', 'pampasan_info', 'cawangan_info', 'customer_info','baucerno', 'denominasi','jumlah_pampasan', 'jumlahTebus', 'jumlahPanjar') ); + return response()->json($result); + } + + public function generateBaucer($kodcaw) + { + $data = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url').'/api/SenaraiPanjar/list/' . $kodcaw) + ->json(); + + $today = now(); + $dd = $today->format('d'); + $mm = $today->format('m'); + $yy = $today->format('y'); + + $recno = $data['recno'] ?? 0; + + $baucerno = 'B' . $yy . $mm . $dd . '-' . str_pad($recno, 4, '0', STR_PAD_LEFT); + + return $baucerno; + } + + public function terimaPampasan(Request $request) + { + $responsePampasan = Http::withOptions(['verify' => config('app.api_verify')]) + ->post(config('api.url') . '/api/pampasan/terimaPampasan',[ + "norujukan" => $request->norujukan, + "kodcaw" => auth()->user()->cawangan, + "jumlah_pampasan" => $request->jumlahpampasan, + "teller" => auth()->user()->name, + "denominasi" => $request->denominasi, + ] + )->json(); + + $jumlahTebus = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/tebus/norujukan/' . auth()->user()->cawangan .'/'.$request->norujukan)->json()[0]['bakipjm']; + $bayaranPanjar = $request->jumlahpampasan + $jumlahTebus; + + + $responsePanjar = Http::withOptions(['verify' => config('app.api_verify')]) + ->post( + config('api.url') . '/api/panjar/createpanjar/' . auth()->user()->cawangan, + array_merge( + [ + 'tarikhbil' => now()->format('Y-m-d'), + 'jenismodal' => 'belanjaam', + 'deskripsi' => 'BAYARAN PAMPASAN ' . '(' . $request->norujukan . ')', + 'bayaran' => $bayaranPanjar, + 'kodlaluan' => auth()->user()->name, + 'baucer' => $responsePampasan['data']['baucerno'], + 'tuntutan' => auth()->user()->name + ], + $request->denominasi + + ) + )->json(); + + if ($responsePampasan['success'] == true) { + return redirect()->route('pampasan.resit', ["pampasan" => $responsePampasan['data']]); + } else + return redirect()->route('khazanah.panjar')->with('pampasaninformation', ['status' => 'error', 'message' => 'Baki perubatan tidak mencukupi.']); + } + + public function resitPampasan(Request $request) + { + $pampasan = $request->pampasan; + $kodcaw = $pampasan['kodcaw']; + $norujukan = $pampasan['norujukan'] ?? null; + + if ($norujukan) { + $gadai_info = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/gadai/norujukan/' . $kodcaw . '/' . $norujukan) + ->json(); + + $gadai_info = is_array($gadai_info) && isset($gadai_info[0]) ? $gadai_info[0] : $gadai_info; + + $customer_info = null; + if (isset($gadai_info['nokp'])) { + $customer = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp']) + ->json(); + + $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer; + } + + $pampasan_info = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/palsu/laporan/', ['kodcaw' => $kodcaw]) + ->json(); + + $norujukan = $norujukan; + + $pampasan_info = collect($pampasan_info)->firstWhere('norujukan', $norujukan); + + $nilaimarhun = $pampasan_info['nilaimarhun'] ?? 0; + $pembiayaan = $pampasan_info['pembiayaan'] ?? 0; + $untung = $pampasan_info['untung'] ?? 0; + + $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung; + + $status = Http::withOptions(['verify' => config('app.api_verify')]) + ->put(config('api.url') . '/api/pampasan/updateStatusPampasan', ['kodcaw' => $kodcaw, 'norujukan' => $norujukan]) + ->json(); + + // dd($pampasan_info, $nilaimarhun, $pembiayaan, $untung, $jumlah_pampasan); + + // dd($norujukan); + + return view('print.resit.resitpampasan', compact( + 'pampasan', + 'gadai_info', + 'customer_info', + 'pampasan_info', + 'nilaimarhun', + 'pembiayaan', + 'untung', + 'jumlah_pampasan', + 'status' + )); + } + } + + public function suratPampasan(Request $request, $norujukan) + { + $auth_user = Auth::user(); + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json(); + + $gadai = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/gadai/norujukan/' . '011237' . '/' . $norujukan) + ->json(); + + $gadai_info = is_array($gadai) && isset($gadai[0]) ? $gadai[0] : $gadai; + + $customer_info = null; + if(isset($gadai_info['nokp'])) { + $customer = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/customers/' . $gadai_info['nokp']) + ->json(); + + $customer_info = is_array($customer) && isset($customer[0]) ? $customer[0] : $customer; + } + + $pampasan = Http::withOptions(['verify' => config('app.api_verify')]) + ->get(config('api.url') . '/api/palsu/laporan/' , ['kodcaw'=>'011237']) + ->json(); + + $pampasan_collection = collect($pampasan); + + $pampasan_info = $pampasan_collection->where('norujukan', '=', $norujukan)->first(); + + + if (!$pampasan_info) { + abort(404, 'Maklumat pampasan tidak dijumpai untuk no rujukan tersebut.'); + } + + $nilaimarhun = $pampasan_info['nilaimarhun'] ?? 0; + $pembiayaan = $pampasan_info['pembiayaan'] ?? 0; + $untung = $pampasan_info['untung'] ?? 0; + + $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung; + $jumlah = $pampasan_info['jumlah_pampasan'] ?? 0; + $jumlah_pampasan_terbilang = Helper::ringgitTerbilang($jumlah_pampasan); + + return view('print.surat_pampasan', compact('cawangan_info', 'gadai', 'gadai_info', 'customer_info', 'pampasan', 'pampasan_info','jumlah_pampasan_terbilang', 'jumlah_pampasan')); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0f2f558..eb861af 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -99,6 +99,15 @@ class LelongController extends Controller public function transaksituntutbaki(Request $request){ $auth_user = Auth::user(); + + $aliranTunaiController = new AliranTunaiController(); + $checkCashBox = $aliranTunaiController->periksaAliranTunai($request); + + if($checkCashBox->getContent() !== 'sama') + { + return response('kemaskini', 200); + } + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $request->norujukan)->json(); if($lelong) @@ -106,6 +115,18 @@ class LelongController extends Controller return response('Berjaya'); } + $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json(); + + $keluar = $getTunai2['keluar']; + $baki = $getTunai2['baki']; + $masuk = $getTunai2['masuk']; + + $bakiakhir = $baki; + + if(($bakiakhir < $request->jumlah) && $request->jenis == 'T'){ + return response('Baki tidak mencukupi', 200); + } + $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [ 'batchno' => $request->batchno, 'jenis' => $request->jenis, @@ -122,14 +143,6 @@ class LelongController extends Controller $updatetuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan); - $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json(); - - $keluar = $getTunai2['keluar']; - $baki = $getTunai2['baki']; - $masuk = $getTunai2['masuk']; - - $bakiakhir = $baki; - if($request->jenis == 'T') { $bakiakhir -= $request->jumlah; diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 652b7e7..32ef7f7 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -46,7 +46,10 @@ class PenebusanController extends Controller $nilaihargasemasa = $this->tukaranhargaemas($norujukan); $pertambahpinjaman = 0.80; - return view('penebusan.' . $cawangan_info['version'] . '.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa','pertambahpinjaman')); + + $pampasan = $this->getPampasanByNorujukan($norujukan); + + return view('penebusan.' . $cawangan_info['version'] . '.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa','pertambahpinjaman', 'pampasan')); } public function tebuspenuh(Request $request) @@ -786,4 +789,26 @@ class PenebusanController extends Controller return view($view, compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa')); } + public function getPampasanByNorujukan($norujukan) + { + $auth_user = Auth::user(); + + $pampasanListResponse = Http::get(config('api.url'). '/api/palsu/laporan', [ + 'kodcaw' => $auth_user['cawangan'], + 'status' => 'all', + ]); + + if($pampasanListResponse->failed()){ + throw new \Exception("Something wrong with API", 1); + } + + $pampasanList = array_filter($pampasanListResponse->json(), function($pampasan) use($norujukan){ + return $pampasan['norujukan'] == $norujukan; + }); + + $pampasan = sizeof($pampasanList) == 0 ? null : array_pop($pampasanList); + + return $pampasan; + } + } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 37bb7be..7356ee1 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -72,5 +72,6 @@ class Kernel extends HttpKernel 'admin' => 'App\Http\Middleware\Admin', 'audit' => 'App\Http\Middleware\Audit', 'masteradmin' => 'App\Http\Middleware\Masteradmin', + 'role' => 'App\Http\Middleware\RoleAccess', ]; } diff --git a/app/Http/Middleware/RoleAccess.php b/app/Http/Middleware/RoleAccess.php new file mode 100644 index 0000000..74c33c9 --- /dev/null +++ b/app/Http/Middleware/RoleAccess.php @@ -0,0 +1,71 @@ +roles; + $userRoleHarian = $user->role_harian ?? null; + + // Check each allowed role + foreach ($roles as $role) { + switch ($role) { + case 'teller': + if ($userRoleHarian == 'teller' || $userRole == 'teller') { + return $next($request); + } + break; + + case 'khazanah': + if ($userRole == 'pc' || $userRole == 'ppc') { + return $next($request); + } + break; + + case 'admin': + if ($userRole == 'admin') { + return $next($request); + } + break; + + case 'penilai': + if ($userRole == 'penilai') { + return $next($request); + } + break; + + case 'operasi': + if ($userRole == 'operasi') { + return $next($request); + } + break; + + case 'audit': + if ($userRole == 'audit') { + return $next($request); + } + break; + } + } + + // If no roles matched, deny access + abort(403, 'Access denied. Required roles: ' . implode(', ', $roles)); + } +} \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js new file mode 100644 index 0000000..2dee074 --- /dev/null +++ b/resources/js/app.js @@ -0,0 +1,30 @@ +/** + * First we will load all of this project's JavaScript dependencies which + * includes Vue and other libraries. It is a great starting point when + * building robust, powerful web applications using Vue and Laravel. + */ + +require('./bootstrap'); + +window.Vue = require('vue'); + +/** + * The following block of code may be used to automatically register your + * Vue components. It will recursively scan this directory for the Vue + * components and automatically register them with their "basename". + * + * Eg. ./components/ExampleComponent.vue -> + */ + +// const files = require.context('./', true, /\.vue$/i) +// files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default)) + +/** + * Next, we will create a fresh Vue application instance and attach it to + * the page. Then, you may begin adding components to this application + * or customize the JavaScript scaffolding to fit your unique needs. + */ + +const app = new Vue({ + el: '#app', +}); \ No newline at end of file diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index 937d7b9..61a0929 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -35,7 +35,7 @@ window.Pusher = require('pusher-js'); window.Echo = new Echo({ broadcaster: 'pusher', - key: '26b0ec2f297f94b7aa9b', - cluster: 'ap1', - forceTLS: true + key: process.env.MIX_PUSHER_APP_KEY, + cluster: process.env.MIX_PUSHER_APP_CLUSTER, + forceTLS: false }); diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index d1ebd87..9459d54 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -558,15 +558,12 @@ function cetaklaporanalirantunai() { - let teller = "{{ Auth::user()->name }}"; - - let urlroute = '{{ route("laporan.alirantunai", ":id") }}'; - urlroute = urlroute.replace(':id', teller); - - window.open(urlroute, '_blank'); - + let urlroute = '{{ route("laporan.alirantunai") }}'; + + window.location.href = urlroute; } + function cetakserahankeseluruhan() { let urlroute = '{{ route("laporan.serahanteller") }}'; diff --git a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php index c977e37..2334ec2 100644 --- a/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php +++ b/resources/views/aliran_tunai/laporan/laporanalirantunai.blade.php @@ -1,211 +1,298 @@ - - - - - - -
SULIT DAN PERSENDIRIAN
- - - - - - - - - - - - - - - - - - - - -
PENYATA ALIRAN TUNAI : {{ $teller }}
- -
-
-

Baki Awal

- RM {{ number_format($alirantunai['bakiawal'], 2) }} -
- -
-

Pendahuluan

- RM {{ number_format($alirantunai['tambah'], 2) }} -
- -
-

Penyelesaian Pem.

- RM {{ number_format($alirantunai['masuk'], 2) }} -
-
- -
-
-

Baki Tunai Semasa

- RM {{ number_format($alirantunai['baki'], 2) }} -
- -
-

Serahan

- RM {{ number_format($alirantunai['kurang'], 2) }} -
- -
-

Pembiayaan

- RM {{ number_format($alirantunai['keluar'], 2) }} -
-
- - -
KEMASUKAN TUNAI
-
- - - - - - - - - @php $totaltambah = 0; $totalkurang = 0; @endphp - @foreach($addtunai as $index=>$ad) - @php $totaltambah += $ad['tambah']; $totalkurang += $ad['kurang']; @endphp - - - - - - - @endforeach - - - - - - -
TARIKHDEBIT (RM)KREDIT (RM)NOTA
{{ $ad['tarikh'] }}{{ number_format($ad['tambah'],2) }}{{ number_format($ad['kurang'],2) }}{{ $ad['nota'] }}
JUMLAH{{ number_format($totaltambah,2) }}{{ number_format($totalkurang,2) }}
- - - - - - \ No newline at end of file diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php index 5bdfe89..896014e 100644 --- a/resources/views/customers/v2/index.blade.php +++ b/resources/views/customers/v2/index.blade.php @@ -102,7 +102,7 @@
-
+ @csrf
@@ -373,7 +373,7 @@
- + @csrf
@@ -1394,6 +1394,21 @@ var api_url = @json($api_url ?? ''); $('#pekerjaan-lain').val(''); lainContainer.hide(); } + }); + +document.getElementsByName('form-store')[0].addEventListener('keypress', function(e) { + // Jika tekan Enter + if (e.key === 'Enter') { + + // Jika bukan butang submit dan bukan textarea + const tag = e.target.tagName.toLowerCase(); + const type = e.target.type ? e.target.type.toLowerCase() : ''; + + if (tag !== 'textarea' && type !== 'submit') { + e.preventDefault(); + return false; + } + } }); @push('additional_scripts') diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index 712488f..5de41c2 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -24,6 +24,9 @@
+
@@ -53,6 +56,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -511,7 +541,21 @@ "visible": false, "searchable": false } - ] + ], + "language": { + "lengthMenu": "Papar _MENU_ rekod setiap halaman", + "zeroRecords": "Tiada rekod dijumpai", + "info": "Memapar halaman _PAGE_ dari _PAGES_", + "infoEmpty": "Tiada rekod tersedia", + "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)", + "search": "Cari:", + "paginate": { + "first": "Pertama", + "last": "Akhir", + "next": "Seterusnya", + "previous": "Sebelumnya" + } + } }); $(".select2").select2({ @@ -567,6 +611,7 @@ total_berat = 0; total_kuantiti = 0; var marhun_details = ''; + var array_mutu = []; tablemarhun.clear().draw(); $.each(data,function(index,marhun){ $.each(marhun,function(index,marhun_detail){ @@ -576,6 +621,7 @@ jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; total_kuantiti += Number(marhun_detail['bil']); + array_mutu.push([marhun_detail['karat'], marhun_detail['n_marhun']]); tablemarhun.row.add([ counter, marhun_detail['recno'], @@ -588,7 +634,7 @@ marhun_detail['harga'], status_tag_permata, marhun_detail['berat_batu_permata'], - "
" + "
" ]).draw(); count++; counter = counter + 1; @@ -601,7 +647,7 @@ $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti)); $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); if (count == 1){ - $('.buttonpunya').html(""); + $('.buttonpunya').html(" "); } // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){ @@ -656,25 +702,32 @@ $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2))); $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2))); + var max_teller = 0; + var max_pelulus = 0; + $.ajax({ method:'GET', url: api_url + '/api/maxpinjaman', + data: { + 'mutu': array_mutu, + 'total_nilai_marhun': total_nilai_marhun, + }, success:function(data){ $.each(data,function(index,pinjaman){ - if(pinjaman['user_type'] == 'teller'){ + if (pinjaman['user_type'] == 'teller') { pinjaman_teller = Number(pinjaman['max']); + max_teller = pinjaman['teller_pinjaman']; } - if(pinjaman['user_type'] == 'khazanah'){ + if (pinjaman['user_type'] == 'khazanah') { pinjaman_pelulus = Number(pinjaman['max']); + max_pelulus = pinjaman['pc_pinjaman']; } }); $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %'); $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %'); - var max_teller = total_nilai_marhun * (pinjaman_teller/100); - var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100); $('#pembiayaan_max_teller').val(formatter.format(max_teller)); - $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2))); + $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus)); } }); } @@ -701,6 +754,103 @@ }); } + function viewmarhun(e){ + let selectedrow = $(e).closest('tr'); + let recno = tablemarhun.row(selectedrow).data(); + let nm = recno[3]; + let karat = recno[4]; + let berat = recno[5]; + let harga = recno[8]; + let nota = recno[7]; + let kuantiti = recno[6]; + let jenismarhun = recno[2]; + let beratpermata = recno[10]; + + // Call API to get specific MaxMutuEmas data by karat + $.ajax({ + url: '{{ config("api.url") }}/api/maxmutuemas/specific', + type: 'GET', + data: { karat: karat, nilaimarhun: nm }, + success: function(response) { + let marginInfo = ''; + let marginTable = ''; + if (response && response.karat) { + marginTable = ` + + + + + + + + + + +
Maklumat Margin
Margin Teller${response.teller}%
Margin PC${response.pc}%
Nilai Marhun TellerRM${parseFloat(response.maxteller).toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}
Nilai Marhun PCRM${parseFloat(response.maxpc).toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})}
+ `; + } + + let details = ` + + + + + + + + + + + + + + +
Maklumat Marhun
Jenis Marhun${jenismarhun}
Nilai Marhun Asal${nm}
Karat${karat}
Berat${berat}g
Kuantiti${kuantiti}
HargaRM${harga}
Nota${nota}
Berat Batu Permata${beratpermata}g
+ ${marginTable} + `; + + Swal.fire({ + title: 'Maklumat Marhun & Margin', + html: details, + icon: 'info', + confirmButtonText: 'OK', + width: '600px' + }); + }, + error: function(xhr) { + // If API call fails, show basic marhun info only + let details = ` + + + + + + + + + + + + + + +
Maklumat Marhun
Jenis Marhun${jenismarhun}
Nama${nm}
Karat${karat}
Berat${berat}g
Kuantiti${kuantiti}
HargaRM${harga}
Nota${nota}
Berat Batu Permata${beratpermata}g
+
+ Maklumat margin tidak tersedia +
+ `; + + Swal.fire({ + title: 'Maklumat Marhun', + html: details, + icon: 'info', + confirmButtonText: 'OK', + width: '600px' + }); + } + }); + } + function editmarhun(e){ let norujuk = $('#norujukan').val(); let selectedrow = $(e).closest('tr'); @@ -1502,7 +1652,7 @@ swalWithBootstrapButtons.fire({ title: 'Dapatkan Pengesahan Daripada Khazanah?', - text: "Tetapan margin melebihi" + pinjaman_teller + "% untuk Khazanah!", + text: "Tetapan Margin Melebihi Limit Maksima Teller!", icon: 'info', showCancelButton: true, confirmButtonText: 'Hantar', @@ -1514,7 +1664,7 @@ let norujukan = $('#norujukan').val(); let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); // let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|"; - let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%"; + let status = "Tetapan Margin Melebihi Limit Maksima Teller: " + pinjaman_teller + "%"; let jumpinjam = $('#pinjaman').val(); let teller = "{{ Auth::user()->name }}"; @@ -1618,5 +1768,153 @@ } } } + + // Toggle Table Functionality + let isMarginTableVisible = false; + + $('#toggleTableBtn').on('click', function() { + if (!isMarginTableVisible) { + // Show margin table, hide main table + $('#myTable_wrapper').hide(); + $('#marginTable').show(); + $(this).html(' Papar Marhun'); + loadMarginData(); + isMarginTableVisible = true; + } else { + // Show main table, hide margin table + $('#marginTable_wrapper').hide(); + $('#myTable_wrapper').show(); + $(this).html(' Papar Margin'); + isMarginTableVisible = false; + } + }); + + function loadMarginData() { + let marginData = []; + let totalNilaiMarhun = 0; + let totalNilaiTeller = 0; + let totalNilaiPC = 0; + + // Process each individual row from the main table + let rowsData = []; + tablemarhun.rows().data().each(function(row, index) { + let recno = row[1]; // Recno column + let karat = row[4]; // Karat column + let nilaiMarhun = parseFloat(row[3].replace(/[^0-9.-]+/g, "")); // Nilai Marhun column + rowsData.push({ + index: index, + recno: recno, + karat: karat, + nilaiMarhun: nilaiMarhun + }); + }); + + let bil = 1; + let processedCount = 0; + let totalEntries = rowsData.length; + + rowsData.forEach((rowData) => { + // Call API to get margin data for each individual item + $.ajax({ + url: '{{ config("api.url") }}/api/maxmutuemas/specific', + type: 'GET', + data: { karat: rowData.karat, nilaimarhun: rowData.nilaiMarhun }, + success: function(response) { + if (response && response.karat) { + let nilaiTeller = parseFloat(response.maxteller) || 0; + let nilaiPC = parseFloat(response.maxpc) || 0; + + marginData.push({ + index: rowData.index, + bil: rowData.index + 1, + recno: rowData.recno, + karat: rowData.karat, + nilaiMarhun: rowData.nilaiMarhun, + marginTeller: response.teller, + marginPC: response.pc, + nilaiTeller: nilaiTeller, + nilaiPC: nilaiPC + }); + + totalNilaiMarhun += rowData.nilaiMarhun; + totalNilaiTeller += nilaiTeller; + totalNilaiPC += nilaiPC; + } + + processedCount++; + if (processedCount === totalEntries) { + // Sort by original index to maintain order + marginData.sort((a, b) => a.index - b.index); + populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC); + } + }, + error: function() { + processedCount++; + if (processedCount === totalEntries) { + // Sort by original index to maintain order + marginData.sort((a, b) => a.index - b.index); + populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC); + } + } + }); + }); + } + + let marginDataTable = null; + + function populateMarginTable(data, totalMarhun, totalTeller, totalPC) { + // If DataTable already exists, destroy it first + if (marginDataTable !== null) { + marginDataTable.destroy(); + marginDataTable = null; + } + + let tbody = $('#marginTableBody'); + tbody.empty(); + + data.forEach(function(item) { + let row = ` + + ${item.bil} + ${item.karat} + RM${item.nilaiMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + ${item.marginTeller}% + ${item.marginPC}% + RM${item.nilaiTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + RM${item.nilaiPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + + `; + tbody.append(row); + }); + + // Initialize DataTable + marginDataTable = $('#marginTable').DataTable({ + "pageLength": 10, + "ordering": false, + "order": [[ 0, "asc" ]], + "responsive": true, + "language": { + "lengthMenu": "Papar _MENU_ rekod setiap halaman", + "zeroRecords": "Tiada rekod dijumpai", + "info": "Memapar halaman _PAGE_ dari _PAGES_", + "infoEmpty": "Tiada rekod tersedia", + "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)", + "search": "Cari:", + "paginate": { + "first": "Pertama", + "last": "Akhir", + "next": "Seterusnya", + "previous": "Sebelumnya" + } + }, + "footerCallback": function (row, data, start, end, display) { + // Update footer totals + $('#totalNilaiMarhunMargin').text('RM' + totalMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})); + $('#totalNilaiTellerMargin').text('RM' + totalTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})); + $('#totalNilaiPCMargin').text('RM' + totalPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})); + } + }); + } + @endsection diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index ec262f2..d6d352f 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -14,7 +14,7 @@ @endphp @if($gadai_session != null) -
+
@@ -63,6 +63,14 @@
+ +
+ +
+ + @@ -89,6 +97,35 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -473,21 +510,34 @@ }) } - var tablemarhun = $('#myTable').DataTable({ - "ordering": false, - "columnDefs": [ - { - "targets": [ 1 ], - "visible": false, - "searchable": false + var tablemarhun = $('#myTable').DataTable({ + "ordering": false, + "columnDefs": [{ + "targets": [1], + "visible": false, + "searchable": false + }, + { + "targets": [7], + "visible": true, + "searchable": false + } + ], + "language": { + "lengthMenu": "Papar _MENU_ rekod setiap halaman", + "zeroRecords": "Tiada rekod dijumpai", + "info": "Memapar halaman _PAGE_ dari _PAGES_", + "infoEmpty": "Tiada rekod tersedia", + "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)", + "search": "Cari:", + "paginate": { + "first": "Pertama", + "last": "Akhir", + "next": "Seterusnya", + "previous": "Sebelumnya" + } }, - { - "targets": [ 7 ], - "visible": false, - "searchable": false - } - ] - }); + }); $(".select2").select2({ dropdownParent: $('#daftar_marhun'), @@ -527,60 +577,57 @@ closeOnSelect: false }); - var total_nilai_marhun = 0; - var total_berat = 0; - var total_kuantiti = 0; - var kadarupah = 0; - var jumlah_marhun = 0; - var jumlah_nilai_marhun = 0; - var pinjaman_pelulus = 0; - var pinjaman_teller = 0; - function marhuntable(data){ - var counter = 1; - total_nilai_marhun = 0; - total_berat = 0; - total_kuantiti = 0; - var marhun_details = ''; - jumlah_nilai_marhun = 0; - tablemarhun.clear().draw(); - $.each(data,function(index,marhun){ - $.each(marhun,function(index,marhun_detail){ - total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']); - total_berat = total_berat + Number(marhun_detail['berat']); - marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +","; - jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); - status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; - total_kuantiti += Number(marhun_detail['bil']); - tablemarhun.row.add([ - counter, - marhun_detail['recno'], - marhun_detail['marhun'], - formatter.format(marhun_detail['n_marhun']), - marhun_detail['karat'], - formatter.format(marhun_detail['berat']), - marhun_detail['bil'], - marhun_detail['nota'], - marhun_detail['harga'], - status_tag_permata, - marhun_detail['berat_batu_permata'], - "
" - ]).draw(); - counter = counter + 1; + var total_nilai_marhun = 0; + var total_berat = 0; + var total_kuantiti = 0; + var kadarupah = 0; + var jumlah_marhun = 0; + var jumlah_nilai_marhun = 0; + var pinjaman_pelulus = 0; + var pinjaman_teller = 0; + + function marhuntable(data) { + var counter = 1; + total_nilai_marhun = 0; + total_berat = 0; + total_kuantiti = 0; + var marhun_details = ''; + var array_mutu = []; + jumlah_nilai_marhun = 0; + tablemarhun.clear().draw(); + $.each(data, function(index, marhun) { + $.each(marhun, function(index, marhun_detail) { + total_nilai_marhun = total_nilai_marhun + Number(marhun_detail['n_marhun']); + total_berat = total_berat + Number(marhun_detail['berat']); + marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] + ","; + jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); + status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; + total_kuantiti += Number(marhun_detail['bil']); + array_mutu.push([marhun_detail['karat'], marhun_detail['n_marhun']]); + tablemarhun.row.add([ + counter, + marhun_detail['recno'], + marhun_detail['marhun'], + formatter.format(marhun_detail['n_marhun']), + marhun_detail['karat'], + formatter.format(marhun_detail['berat']), + marhun_detail['bil'], + marhun_detail['nota'], + marhun_detail['harga'], + status_tag_permata, + marhun_detail['berat_batu_permata'], + "
" + ]).draw(); + counter = counter + 1; + }); }); - }); - $('#totalberattable').text(formatter.format(total_berat)); - $('#totalkuantititable').text(total_kuantiti); - $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun)); - $('#bilangan_marhun').val(formatter.format(counter-1)); - $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti)); - $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); - // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){ - // kadarupah = 1.2/100; - // }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){ - // kadarupah = 1.5/100; - // }else if(total_nilai_marhun >= 2001 ){ - // kadarupah = 1.7/100; - // } + $('#totalberattable').text(formatter.format(total_berat)); + $('#totalkuantititable').text(total_kuantiti); + $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun)); + $('#bilangan_marhun').val(formatter.format(counter - 1)); + $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti)); + $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); + $.ajax({ method:'GET', @@ -596,33 +643,40 @@ } }); - $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun)); - $('#marhun_detail').val(marhun_details); - $('#total_berat').val(formatter.format(total_berat)); - $('#kadarkeuntungan').val(formatter.format(kadarupah)); - $('#kuantiti_marhun').val(formatter.format(jumlah_marhun)); + $('#total_nilai_marhun').val(formatter.format(total_nilai_marhun)); + $('#marhun_detail').val(marhun_details); + $('#total_berat').val(formatter.format(total_berat)); + $('#kadarkeuntungan').val(formatter.format(kadarupah)); + $('#kuantiti_marhun').val(formatter.format(jumlah_marhun)); - $.ajax({ - method:'GET', - url: api_url + '/api/maxpinjaman', - success:function(data){ - $.each(data,function(index,pinjaman){ - if(pinjaman['user_type'] == 'teller'){ - pinjaman_teller = Number(pinjaman['max']); - } - if(pinjaman['user_type'] == 'khazanah'){ - pinjaman_pelulus = Number(pinjaman['max']); - } - }); - $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %'); - $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %'); - var max_teller = total_nilai_marhun * (pinjaman_teller/100); - var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100); - $('#pembiayaan_max_teller').val(formatter.format(max_teller.toFixed(2))); - $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus.toFixed(2))); - } - }); - } + var max_teller = 0; + var max_pelulus = 0; + + $.ajax({ + method: 'GET', + url: api_url + '/api/maxpinjaman', + data: { + 'mutu': array_mutu, + 'total_nilai_marhun': total_nilai_marhun, + }, + success: function(data) { + $.each(data, function(index, pinjaman) { + if (pinjaman['user_type'] == 'teller') { + pinjaman_teller = Number(pinjaman['max']); + max_teller = pinjaman['teller_pinjaman']; + } + if (pinjaman['user_type'] == 'khazanah') { + pinjaman_pelulus = Number(pinjaman['max']); + max_pelulus = pinjaman['pc_pinjaman']; + } + }); + $('.span-pinjaman-max-pelulus').text(formatter.format(pinjaman_pelulus) + ' %'); + $('.span-pinjaman-max').text(formatter.format(pinjaman_teller) + ' %'); + $('#pembiayaan_max_teller').val(formatter.format(max_teller)); + $('#pembiyaan_max_pelulus').val(formatter.format(max_pelulus)); + } + }); + } $('#pinjaman').on('input',function(){ var pinjaman = Number(this.value); @@ -865,8 +919,9 @@ var batu_permata_array = $('#batupermata').val(); var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0; - var beratpermata = $('#beratpermata').val(); - var kuantiti = $('#kuantiti').val(); + var beratpermata = $('#beratpermata').val(); + var kuantiti = $('#kuantiti').val(); + if(kuantiti > 10) { @@ -1431,22 +1486,24 @@ buttonsStyling: false }); - swalWithBootstrapButtons.fire({ - title: 'Dapatkan Pengesahan Khazanah', - text: "Tetapan margin melebihi " + pinjaman_teller + "% untuk Khazanah!", - icon: 'info', - showCancelButton: true, - confirmButtonText: 'Hantar', - cancelButtonText: 'Batal', - reverseButtons: true - }).then((result) => { - if (result.isConfirmed) { + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Khazanah', + text: "Tetapan Margin Melebihi Limit Maksima Teller!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Hantar', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { - let norujukan = $('#norujukan').val(); - let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g,""));let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); - let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%"; - let jumpinjam = $('#pinjaman').val(); - let teller = "{{ Auth::user()->name }}"; + let norujukan = $('#norujukan').val(); + let nm = parseFloat($('#total_nilai_marhun').val().replace(/[^0-9.-]+/g, "")); + let ber = $('#total_berat').val(); + let marg = $('.span-pinjaman').text(); + let status = "Tetapan Margin Melebihi Limit Maksima Teller: " + pinjaman_teller + "%"; + let jumpinjam = $('#pinjaman').val(); + let teller = "{{ Auth::user()->name }}"; Swal.fire({ title: 'Tunggu Pengesahan Daripada Khazanah.', @@ -1604,23 +1661,24 @@ let marhun = $(e).closest('tr').children('td:eq(1)').text();let selectedrow = $(e).closest('tr');let recnozz = tablemarhun.row(selectedrow).data(); let norujuk = $('#norujukan').val(); - $.ajax({ - method: 'put', - url: '{{ route("gadai.editmarhun") }}', - data: { - "_token": "{{ csrf_token() }}", - "norujukan" : norujuk, - "recno" : recnozz[1], - "teller": "{{ Auth::user()->name }}" - }, - success:function(data){ - location.reload(); - },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); - } + $.ajax({ + method: 'put', + url: '{{ route("gadai.editmarhun") }}', + data: { + "_token": "{{ csrf_token() }}", + "norujukan": norujuk, + "recno": recnozz[1], + "teller": "{{ Auth::user()->name }}" + }, + success: function(data) { + location.reload(); + }, + error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + } function editmarhun(e){ let norujuk = $('#norujukan').val(); @@ -1858,5 +1916,169 @@ } }); + // Toggle Table Functionality + let isMarginTableVisible = false; + + $('#toggleTableBtn').on('click', function() { + if (!isMarginTableVisible) { + // Check if main table has data before showing margin table + let tableData = $('#myTable').DataTable().data(); + if (tableData.length === 0) { + Swal.fire({ + icon: 'warning', + title: 'Amaran!', + text: 'Tiada data marhun untuk papar margin. Sila daftar marhun terlebih dahulu.' + }); + return; + } + + // Show margin table, hide main table + $('#myTable_wrapper').hide(); + $('#marginTable').show(); + $(this).html(' Papar Marhun'); + loadMarginData(); + isMarginTableVisible = true; + + // Disable Daftar Marhun button when margin table is visible + $('button[data-target="#daftar_marhun"]').prop('disabled', true); + } else { + // Show main table, hide margin table + $('#marginTable_wrapper').hide(); + $('#myTable_wrapper').show(); + $(this).html(' Papar Margin'); + isMarginTableVisible = false; + + // Enable Daftar Marhun button when main table is visible + $('button[data-target="#daftar_marhun"]').prop('disabled', false); + } + }); + + function loadMarginData() { + let marginData = []; + let totalNilaiMarhun = 0; + let totalNilaiTeller = 0; + let totalNilaiPC = 0; + + // Process each individual row from the main table + let rowsData = []; + tablemarhun.rows().data().each(function(row, index) { + console.log(row); + let recno = row[1]; // Recno column + let karat = row[4]; // Karat column + let nilaiMarhun = parseFloat(row[3].replace(/[^0-9.-]+/g, "")); // Nilai Marhun column + rowsData.push({ + index: index, + recno: recno, + karat: karat, + nilaiMarhun: nilaiMarhun + }); + }); + + let bil = 1; + let processedCount = 0; + let totalEntries = rowsData.length; + + rowsData.forEach((rowData) => { + // Call API to get margin data for each individual item + $.ajax({ + url: '{{ config("api.url") }}/api/maxmutuemas/specific', + type: 'GET', + data: { karat: rowData.karat, nilaimarhun: rowData.nilaiMarhun }, + success: function(response) { + if (response && response.karat) { + let nilaiTeller = parseFloat(response.maxteller) || 0; + let nilaiPC = parseFloat(response.maxpc) || 0; + + marginData.push({ + index: rowData.index, + bil: rowData.index + 1, + recno: rowData.recno, + karat: rowData.karat, + nilaiMarhun: rowData.nilaiMarhun, + marginTeller: response.teller, + marginPC: response.pc, + nilaiTeller: nilaiTeller, + nilaiPC: nilaiPC + }); + + totalNilaiMarhun += rowData.nilaiMarhun; + totalNilaiTeller += nilaiTeller; + totalNilaiPC += nilaiPC; + } + + processedCount++; + if (processedCount === totalEntries) { + // Sort by original index to maintain order + marginData.sort((a, b) => a.index - b.index); + populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC); + } + }, + error: function() { + processedCount++; + if (processedCount === totalEntries) { + // Sort by original index to maintain order + marginData.sort((a, b) => a.index - b.index); + populateMarginTable(marginData, totalNilaiMarhun, totalNilaiTeller, totalNilaiPC); + } + } + }); + }); + } + + let marginDataTable = null; + function populateMarginTable(data, totalMarhun, totalTeller, totalPC) { + // If DataTable already exists, destroy it first + if (marginDataTable !== null) { + marginDataTable.destroy(); + marginDataTable = null; + } + + let tbody = $('#marginTableBody'); + tbody.empty(); + + data.forEach(function(item) { + let row = ` + + ${item.bil} + ${item.karat} + RM${item.nilaiMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + ${item.marginTeller}% + ${item.marginPC}% + RM${item.nilaiTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + RM${item.nilaiPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})} + + `; + tbody.append(row); + }); + + // Initialize DataTable + marginDataTable = $('#marginTable').DataTable({ + "pageLength": 10, + "ordering": false, + "order": [[ 0, "asc" ]], + "responsive": true, + "language": { + "lengthMenu": "Papar _MENU_ rekod setiap halaman", + "zeroRecords": "Tiada rekod dijumpai", + "info": "Memapar halaman _PAGE_ dari _PAGES_", + "infoEmpty": "Tiada rekod tersedia", + "infoFiltered": "(ditapis dari _MAX_ jumlah rekod)", + "search": "Cari:", + "paginate": { + "first": "Pertama", + "last": "Akhir", + "next": "Seterusnya", + "previous": "Sebelumnya" + } + }, + "footerCallback": function (row, data, start, end, display) { + // Update footer totals + $('#totalNilaiMarhunMargin').text('RM' + totalMarhun.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})); + $('#totalNilaiTellerMargin').text('RM' + totalTeller.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})); + $('#totalNilaiPCMargin').text('RM' + totalPC.toLocaleString('en-MY', {minimumFractionDigits: 2, maximumFractionDigits: 2})); + } + }); + } + @endsection diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php index 2bfb972..8c73baf 100644 --- a/resources/views/homepage/operasi/home.blade.php +++ b/resources/views/homepage/operasi/home.blade.php @@ -20,7 +20,9 @@ Parameter Komoditi Perubatan + Laporan Audit
+
diff --git a/resources/views/homepage/operasi/laporan-audit.blade.php b/resources/views/homepage/operasi/laporan-audit.blade.php new file mode 100644 index 0000000..afffb68 --- /dev/null +++ b/resources/views/homepage/operasi/laporan-audit.blade.php @@ -0,0 +1,46 @@ +@extends('layouts.app_operasi') + +@section('content') +
+
+
+
+ + +
+

Laporan Audit

+
+ +
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+ +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/khazanah/laporan/alirantunai.blade.php b/resources/views/khazanah/laporan/alirantunai.blade.php new file mode 100644 index 0000000..4d89333 --- /dev/null +++ b/resources/views/khazanah/laporan/alirantunai.blade.php @@ -0,0 +1,63 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ + + @if(session()->has('errormessage')) +
+ {{ session()->get('errormessage') }} +
+ @endif + +
+
+
+
+
+
+
+
+
+
+ @csrf +
+
+ Tarikh +
+ + +
+
+
+
+
+
+
+
+
+ +@endsection + diff --git a/resources/views/khazanah/pampasan_detail.blade.php b/resources/views/khazanah/pampasan_detail.blade.php new file mode 100644 index 0000000..3059e8b --- /dev/null +++ b/resources/views/khazanah/pampasan_detail.blade.php @@ -0,0 +1,282 @@ +@extends('layouts.app') + +@section('content') +
+

PAMPASAN

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + @php + $nilaimarhun = floatval($barang_kes_info['nilaimarhun'] ?? 0); + $pembiayaan = floatval($barang_kes_info['pembiayaan'] ?? 0); + $untung = floatval($barang_kes_info['untung'] ?? 0); + $jumlah_pampasan = $nilaimarhun - $pembiayaan - $untung; + @endphp + +
+
+ + +
+ +
+
+ + +
+
+ +
+
+
+
+ Cara Pengiraan Jumlah Pampasan:
+ + Jumlah Pampasan = Nilai Marhun - Baki Pembiayaan - Keuntungan + +
+
+
+
+
+ + + +
+
+
+
+ + + + @include('modal.denopampasan') +@endsection diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index c144ae3..a478c57 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -9,38 +9,55 @@
- + +
@if(Session::has('messageinformation')) @php - $session = Session::get("messageinformation"); + $session = Session::get("messageinformation"); @endphp - @endif - -
-
-
-
-
-
+ + @if(Session::has('pampasaninformation')) + @php + $session = Session::get("pampasaninformation"); + @endphp + + @endif + + -
+
@@ -54,34 +71,62 @@
-
+
- - - - - - + + + + + + - + @if(isset($cawangan_info['kodcaw']) && $cawangan_info['kodcaw'] === '011237') + + @endif + +
- - - - - - - - - - - -
biltarikhdeskripsikategoribayarantindakan
+ +
+ + + + + + + + + + + +
biltarikhdeskripsikategoribayarantindakan
+
+ +
- +
@@ -89,44 +134,40 @@
-@endsection + +@endsection \ No newline at end of file diff --git a/resources/views/khazanah/v2/info.blade.php b/resources/views/khazanah/v2/info.blade.php index 1be8e8a..d466358 100644 --- a/resources/views/khazanah/v2/info.blade.php +++ b/resources/views/khazanah/v2/info.blade.php @@ -13,7 +13,7 @@ @include('modal.agh') -
+
@@ -171,7 +171,7 @@
+
+ + + + + +
+
+ + +
+ +
+
+
+ + diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php index a40407c..5b95402 100644 --- a/resources/views/modal/editmarhun.blade.php +++ b/resources/views/modal/editmarhun.blade.php @@ -63,7 +63,7 @@ @endforeach
-
Berat
+
Berat Bersih
Harga
diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index e0ea373..053fb51 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -1,4 +1,4 @@ - + - - \ No newline at end of file + + + + diff --git a/resources/views/operasi/edit_marginmutu.blade.php b/resources/views/operasi/edit_marginmutu.blade.php new file mode 100644 index 0000000..ae1333e --- /dev/null +++ b/resources/views/operasi/edit_marginmutu.blade.php @@ -0,0 +1,148 @@ +@extends('layouts.app_operasi') +@section('content') + +
+
+
+
+ + +
+

Edit Margin Mutu Emas

+ +
+ @csrf + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + Cancel +
+
+
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 399628d..a521f97 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -2,27 +2,97 @@ @section('content') -