diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index f88e879..3bf3069 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Hash; use Carbon\Carbon; use PDF; +use DateTime; class KhazanahController extends Controller { @@ -1209,7 +1210,6 @@ class KhazanahController extends Controller $bakiperubatan = 0; - switch ($request->jenismodal) { case "selenggara": $kategori = "Baiki dan Selenggara"; @@ -1289,6 +1289,9 @@ class KhazanahController extends Controller 'jumlahkeping' => "0" ]); + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil); + $tarikhbil = $myDateTime->format('dmY'); + $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ 'deskripsi' => $request->deskripsi, @@ -1298,7 +1301,7 @@ class KhazanahController extends Controller 'id' => $auth_user['name'], 'bakiperubatan' => $bakiperubatan, 'nobaucer' => $request->baucer, - 'nobil' => "3213231", + 'nobil' => $tarikhbil, 'tuntutoleh' => $request->tuntutan ])->json(); @@ -1321,9 +1324,9 @@ class KhazanahController extends Controller $keterangan=$get_glCode_Details[0]['descpt']; //keterangan glcode $actype=$get_glCode_Details[0]['acttype']; //keterangan acctype - $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json(); - if(sizeof($get_Panjar_AM)==0) - { + $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json(); + if(sizeof($get_Panjar_AM)==0) + { $jumlah=0.0; $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json(); if(sizeof($getGLedjer_Semalam)==0) @@ -1433,28 +1436,28 @@ class KhazanahController extends Controller 'kelmarin'=>$kelmarin_panjar, - ]); + ]); - $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); - $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; - $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; - $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; - $debit_Tunai=$LejerTunaiDitangan[0]['debit']; - $recno_Tunai=$LejerTunaiDitangan[0]['recno']; - $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; - - $kredit_Tunai=$kredit_Tunai+$request->bayaran; - $hariini_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; + $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); + $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; + $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; + $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; + $debit_Tunai=$LejerTunaiDitangan[0]['debit']; + $recno_Tunai=$LejerTunaiDitangan[0]['recno']; + $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; + + $kredit_Tunai=$kredit_Tunai+$request->bayaran; + $hariini_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_Tunai, - 'debit'=>$debit_Tunai, - 'kredit'=>$kredit_Tunai, - 'hariini'=>$hariini_Tunai, - 'kelmarin'=>$kelmarin_Tunai, - - ]); + $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariini_Tunai, + 'kelmarin'=>$kelmarin_Tunai, + + ]); } @@ -1471,62 +1474,62 @@ class KhazanahController extends Controller $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); if(sizeof($get_Panjar_AM)==0) { - $jumlah=0.0; - $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); - if(sizeof($getGLedjer_Semalam)==0) - { - $jumlah=0.0; - } - else - { + $jumlah=0.0; + $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); + if(sizeof($getGLedjer_Semalam)==0) + { + $jumlah=0.0; + } + else + { - $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; - $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; - $jumlah=$jumlah_semalam+$hariIniSemalam; - } - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); - - if( sizeof($get_GlejerBulan_Tahun)==0) - { - $jumlahBulan_ini=0.0; - } - else - { - $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; - $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; - - }//end bulan tahun - $Jumlah_TahunIni=0.0; - $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); - if(sizeof($get_Glejer_Tahun)==0) - { - $Jumlah_TahunIni=0.0; - } - else - { + $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; + $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; + $jumlah=$jumlah_semalam+$hariIniSemalam; + } + $jumlahBulan_ini=0.0; + $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); + + if( sizeof($get_GlejerBulan_Tahun)==0) + { + $jumlahBulan_ini=0.0; + } + else + { + $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; + $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; + + }//end bulan tahun + $Jumlah_TahunIni=0.0; + $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json(); + if(sizeof($get_Glejer_Tahun)==0) + { + $Jumlah_TahunIni=0.0; + } + else + { + + $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; + $Jumlah_TahunIni=$jumlah-$JumTahunIni; - $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; - $Jumlah_TahunIni=$jumlah-$JumTahunIni; - - } + } - $HariIni=0.00-$request->bayaran; - $kelmarin=$jumlah-$HariIni; - - //insert glejer untuk current date /hari ini - $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$KERAIAN, - 'descpt'=>$keterangan, - 'debit'=>$request->bayaran, - 'kredit'=>0.0, - 'hariini'=>$HariIni, - 'kelmarin'=>$kelmarin, - 'jumlah'=>$jumlah, - 'bulanini'=>$jumlahBulan_ini, - 'tahunini'=>$Jumlah_TahunIni, - 'acttype'=> $actype + $HariIni=0.00-$request->bayaran; + $kelmarin=$jumlah-$HariIni; + + //insert glejer untuk current date /hari ini + $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ + 'kodcaw'=>$auth_user['cawangan'], + 'glcode'=>$KERAIAN, + 'descpt'=>$keterangan, + 'debit'=>$request->bayaran, + 'kredit'=>0.0, + 'hariini'=>$HariIni, + 'kelmarin'=>$kelmarin, + 'jumlah'=>$jumlah, + 'bulanini'=>$jumlahBulan_ini, + 'tahunini'=>$Jumlah_TahunIni, + 'acttype'=> $actype ]); @@ -1551,54 +1554,50 @@ class KhazanahController extends Controller ]); - - } else { - $hariini_panjar= $get_Panjar_AM[0]['hariini']; - $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; - $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; - $debit_panjar= $get_Panjar_AM[0]['debit']; - $recno_panjar= $get_Panjar_AM[0]['recno']; - $kredit_panjar= $get_Panjar_AM[0]['kredit']; + $hariini_panjar= $get_Panjar_AM[0]['hariini']; + $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; + $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; + $debit_panjar= $get_Panjar_AM[0]['debit']; + $recno_panjar= $get_Panjar_AM[0]['recno']; + $kredit_panjar= $get_Panjar_AM[0]['kredit']; - $debit_panjar=$debit_panjar+$request->bayaran; - $harini_panjar=$debit_panjar-$kredit_panjar; - $kelmarin_panjar=$jumlah_panjar-$harini_panjar; + $debit_panjar=$debit_panjar+$request->bayaran; + $harini_panjar=$debit_panjar-$kredit_panjar; + $kelmarin_panjar=$jumlah_panjar-$harini_panjar; - $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_panjar, - 'debit'=>$debit_panjar, - 'kredit'=>$kredit_panjar, - 'hariini'=>$hariini_panjar, - 'kelmarin'=>$kelmarin_panjar, + $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_panjar, + 'debit'=>$debit_panjar, + 'kredit'=>$kredit_panjar, + 'hariini'=>$hariini_panjar, + 'kelmarin'=>$kelmarin_panjar, + ]); - - ]); + $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); + $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; + $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; + $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; + $debit_Tunai=$LejerTunaiDitangan[0]['debit']; + $recno_Tunai=$LejerTunaiDitangan[0]['recno']; + $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; + + $kredit_Tunai=$kredit_Tunai+$request->bayaran; + $hariini_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); - $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; - $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; - $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; - $debit_Tunai=$LejerTunaiDitangan[0]['debit']; - $recno_Tunai=$LejerTunaiDitangan[0]['recno']; - $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; - - $kredit_Tunai=$kredit_Tunai+$request->bayaran; - $hariini_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - - $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_Tunai, - 'debit'=>$debit_Tunai, - 'kredit'=>$kredit_Tunai, - 'hariini'=>$hariini_Tunai, - 'kelmarin'=>$kelmarin_Tunai, - - ]); + $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariini_Tunai, + 'kelmarin'=>$kelmarin_Tunai, + + ]); } @@ -1612,51 +1611,52 @@ class KhazanahController extends Controller $keterangan=$get_glCode_Details[0]['descpt']; //keterangan glcode $actype=$get_glCode_Details[0]['acttype']; //keterangan acctype - $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + if(sizeof($get_Panjar_AM)==0) { - $jumlah=0.0; - $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); - if(sizeof($getGLedjer_Semalam)==0) - { - $jumlah=0.0; - } - else - { + $jumlah=0.0; + $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + if(sizeof($getGLedjer_Semalam)==0) + { + $jumlah=0.0; + } + else + { - $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; - $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; - $jumlah=$jumlah_semalam+$hariIniSemalam; - } - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); - - if( sizeof($get_GlejerBulan_Tahun)==0) - { - $jumlahBulan_ini=0.0; - } - else - { - $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; - $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; - - }//end bulan tahun - $Jumlah_TahunIni=0.0; - $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); - if(sizeof($get_Glejer_Tahun)==0) - { - $Jumlah_TahunIni=0.0; - } - else - { + $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah']; + $hariIniSemalam=$getGLedjer_Semalam[0]['hariini']; + $jumlah=$jumlah_semalam+$hariIniSemalam; + } + $jumlahBulan_ini=0.0; + $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + + if( sizeof($get_GlejerBulan_Tahun)==0) + { + $jumlahBulan_ini=0.0; + } + else + { + $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; + $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; + + }//end bulan tahun + $Jumlah_TahunIni=0.0; + $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); + if(sizeof($get_Glejer_Tahun)==0) + { + $Jumlah_TahunIni=0.0; + } + else + { + + $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; + $Jumlah_TahunIni=$jumlah-$JumTahunIni; - $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; - $Jumlah_TahunIni=$jumlah-$JumTahunIni; - - } + } - $HariIni=0.0-$request->bayaran; - $kelmarin=$jumlah-$HariIni; + $HariIni=0.0-$request->bayaran; + $kelmarin=$jumlah-$HariIni; //insert glejer untuk current date /hari ini $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ @@ -1704,45 +1704,45 @@ class KhazanahController extends Controller else { - $hariini_panjar= $get_Panjar_AM[0]['hariini']; - $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; - $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; - $debit_panjar= $get_Panjar_AM[0]['debit']; - $recno_panjar= $get_Panjar_AM[0]['recno']; - $kredit_panjar= $get_Panjar_AM[0]['kredit']; - $debit_panjar=$debit_panjar+$request->bayaran; - $harini_panjar=$debit_panjar-$kredit_panjar; - $kelmarin_panjar=$jumlah_panjar-$harini_panjar; - $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_panjar, - 'debit'=>$debit_panjar, - 'kredit'=>$kredit_panjar, - 'hariini'=>$hariini_panjar, - 'kelmarin'=>$kelmarin_panjar, + $hariini_panjar= $get_Panjar_AM[0]['hariini']; + $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin']; + $jumlah_panjar= $get_Panjar_AM[0]['jumlah']; + $debit_panjar= $get_Panjar_AM[0]['debit']; + $recno_panjar= $get_Panjar_AM[0]['recno']; + $kredit_panjar= $get_Panjar_AM[0]['kredit']; + $debit_panjar=$debit_panjar+$request->bayaran; + $harini_panjar=$debit_panjar-$kredit_panjar; + $kelmarin_panjar=$jumlah_panjar-$harini_panjar; + $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_panjar, + 'debit'=>$debit_panjar, + 'kredit'=>$kredit_panjar, + 'hariini'=>$hariini_panjar, + 'kelmarin'=>$kelmarin_panjar, - - ]); + + ]); - $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); - $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; - $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; - $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; - $debit_Tunai=$LejerTunaiDitangan[0]['debit']; - $recno_Tunai=$LejerTunaiDitangan[0]['recno']; - $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; - - $kredit_Tunai=$kredit_Tunai+$request->bayaran; - $hariini_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; + $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); + $hariini_Tunai=$LejerTunaiDitangan[0]['hariini']; + $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin']; + $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah']; + $debit_Tunai=$LejerTunaiDitangan[0]['debit']; + $recno_Tunai=$LejerTunaiDitangan[0]['recno']; + $kredit_Tunai=$LejerTunaiDitangan[0]['kredit']; + + $kredit_Tunai=$kredit_Tunai+$request->bayaran; + $hariini_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai; - $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[ - 'recno'=>$recno_Tunai, - 'debit'=>$debit_Tunai, - 'kredit'=>$kredit_Tunai, - 'hariini'=>$hariini_Tunai, - 'kelmarin'=>$kelmarin_Tunai, - - ]); + $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariini_Tunai, + 'kelmarin'=>$kelmarin_Tunai, + + ]); } }//end perbelanjaan Selanggara @@ -1762,7 +1762,7 @@ class KhazanahController extends Controller { return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.'); }else{ - return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah UntukDisimpan.'); + return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.'); } return response($updateVault); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index e61b57d..fac24d0 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -914,4 +914,24 @@ class PenebusanController extends Controller return $totalnilaimarhun; } + public function PenebusanKhazanah($norujukan){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + $noic = $gadaidetail[0][0]['nokp']; + $customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json(); + + $marhun = $marhundetail[0]; + $nama = $customerdetail[0]['nama']; + + $gadai = $gadaidetail[0][0]; + + $nilaihargasemasa = $this->tukaranhargaemas($norujukan); + + return view('penebusan.index-khazanah',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa')); + } + } diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 3738a37..69d348c 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -522,7 +522,7 @@ gadai_detail['t_matang'], 'RM '+formatter.format(gadai_detail['pinjaman']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['jbg'] + gadai_detail['tempoh'] ]).draw(); }else{ tablegadai.row.add([ @@ -545,7 +545,7 @@ gadai_detail['t_update'], 'RM '+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['jbg'] + gadai_detail['tempoh'] ]).draw(); }else if(jenistebus == "lelong"){ var urlroute = '{{ route("lelongan", ":id") }}'; diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index c70cbe4..6b9214b 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -174,7 +174,7 @@
- Pelanggan + Pelanggan
Laporan diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index 581340f..6bd0e42 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -465,7 +465,7 @@ url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'], success:function(upahsemasa){ if(jenistebus == "belum_tebus"){ - var urlroute = '{{ route("penebusan", ":id") }}'; + var urlroute = '{{ route("penebusan.khazanah", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); if(gadai_detail["bakihargajualan"] == null){ xtawarruq.row.add([ diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php index cf40376..5799299 100644 --- a/resources/views/layouts/app_operasi.blade.php +++ b/resources/views/layouts/app_operasi.blade.php @@ -131,9 +131,23 @@ $('#linkz').text(data.namateller + " Pohon Kelulusan"); $("#linkz").attr("href", "{{ url('kelulusan') }}"); - audio.play(); - audio.muted = false; - + if(window.location.pathname === '/operasi/kelulusan') + { + location.reload(); + }else{ + console.log('luar kelulusan'); + audio.play(); + audio.muted = false; + var countlagu = 1; + audio.onended = function() { + if(countlagu <= 3){ + countlagu++; + console.log(countlagu); + this.play(); + } + } + } + const Toast = Swal.mixin({ toast: true, position: 'top-end', diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 79fb0a2..9a69fbd 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -159,6 +159,23 @@ minimumFractionDigits: 2 }); + var audio = new Audio("{{ asset('sound/3.wav') }}"); + // audio.muted = true; + + if (tablekelulusan.data().any()) { + audio.play(); + audio.addEventListener('ended', function() { + this.currentTime = 0; + this.play(); + }, false); + console.log('betul'); + + }else{ + audio.loop = false; + audio.muted = true; + } + + $('#kelulusanmodal').on('show.bs.modal', function(event) { let button = $(event.relatedTarget); let norujukan = $(button).data('norujukan'); diff --git a/resources/views/penebusan/index-khazanah.blade.php b/resources/views/penebusan/index-khazanah.blade.php new file mode 100644 index 0000000..6145168 --- /dev/null +++ b/resources/views/penebusan/index-khazanah.blade.php @@ -0,0 +1,1080 @@ +@extends('layouts.app') +@section('content') +@include('modal.historybayaran') +@include('modal.wakil') + + +
+
+
+ + + +
+ +
+
+
+ NAMA +
+
+ +
+
+
+
+
+
+ NO PELANGGGAN +
+
+ +
+
+
+
+
+
+ NO RUJUKAN +
+
+ +
+
+
+
+
+
+ NO KAD PENGENALAN +
+
+ +
+
+
+
+
+
+ JENIS TEBUS +
+
+ +
+
+
+ {{--
+
+
+ NO SIRI TEBUS +
+
+ +
+
+
--}} +
+ {{--
+
+ WAKIL +
+
+ +
+
+ +
+
--}} +
+
+ +
+
+ + + + + + + + + + + + + + + @php $count = 0; @endphp + @foreach ($marhun as $index=>$m) + + @php + $karatbaru = str_replace('.','-',$m['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); + @endphp + + @php + $marhunperibadi = Http::get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json(); + @endphp + + + + + + + + + @php $count++; @endphp + @endforeach + + + + + + + + + +
BilMarhunN. MarhunN. Marhun SemasaBerat/gramKaratHargaHarga Semasa
{{ $index+1 }}{{ $marhunperibadi['descpt'] }}RM {{ number_format($m['n_marhun'],2) }}@php + echo "RM " . number_format($hargaemassemasa,2); + @endphp{{ $m['berat'] }}{{ $m['karat'] }}RM {{ $m['harga'] }}RM {{ number_format(floatval($hargabaru['harga']),2) }} @php if($m['harga'] > $hargabaru['harga']) echo ''; if($m['harga'] < $hargabaru['harga']) echo ''; + if($m['harga'] === $hargabaru['harga']) echo ''; + + @endphp
JUMLAHRM {{ number_format($gadai['nilaimarhun'],2) }}RM {{ number_format($nilaihargasemasa,2) }}{{ number_format($gadai['berat'],2) }}
+
+
+ {{-- {{dd($gadai)}} --}} +
+
+
+
+ {{--
--}} +
+ +
+
+ BAKI HARGA JUALAN(RM) +
+
+ +
+
+ +
+
+ BAKI PEMBIAYAAN(RM) +
+
+ +
+
+
+ +
+ +
+
+ PEMBIAYAAN ASAL(RM) +
+
+ +
+
+
+ +
+
+
+ JUMLAH KEUNTUNGAN +
+
+ +
+
+ +
+
+ PEMBIAYAAN H. ASAL (RM) +
+ @php + $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100; + @endphp +
+ +
+ {{ number_format($percent_asal,2) }} +
+
+
+ +
+
+ TELAH DIBAYAR(RM) +
+
+ +
+
+
+
+
+
+ BAYARAN PEMBIAYAAN(RM) +
+
+ +
+
+
+
+ TAMBAH PEMBIAYAAN(RM) +
+
+ +
+
+ +
+
+ +
+ +
+
+
+ PEMBIAYAAN BARU(RM) +
+
+ +
+ +
+
+
+
+ +
+
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
+
+ + +
+ +
+
+ PEMBIAYAAN BARU(RM) +
+ @php + $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100; + @endphp +
+ +
+ {{ number_format($percent_hargaemassemasa,2) }} +
+
+
+
+
+
+
+ BAYARAN DITERIMA(RM) +
+
+ +
+
+
+ + +
+ +
+
+
+
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 579693b..c59f39d 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -298,6 +298,22 @@ +

Laporan Transaksi Gadaian

+
+ + + + + + + + + + + + +
BilJenisPenebusan(RM)
0 Rugi Lelong 0.00
+ diff --git a/resources/views/print/laporan_marhunterkumpul.blade.php b/resources/views/print/laporan_marhunterkumpul.blade.php index 19eb078..0def30c 100644 --- a/resources/views/print/laporan_marhunterkumpul.blade.php +++ b/resources/views/print/laporan_marhunterkumpul.blade.php @@ -260,7 +260,7 @@ @endif @endif - @php $counter++; $masuk = true;@endphp + @php $counter++; $masuk = true;$totalnm += floatval($item['n_marhun']);$totalberat += floatval($item['berat']); @endphp @else @if($item['norujukan'] == $marhun[$index-1]['norujukan']) {{-- masuk 1 --}} diff --git a/routes/web.php b/routes/web.php index eefb395..840d5cc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -127,6 +127,7 @@ Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahCo Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah'); Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); +Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);