diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 8599c88..8216fa4 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -651,7 +651,7 @@ class KhazanahController extends Controller $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "operasi", 'siri' => $request->siri, - 'namaoperasi' => $request->namaoperasi + "namakhazanah" => $request->namakhazanah ])->json(); }else{ @@ -660,7 +660,7 @@ class KhazanahController extends Controller "pengesahan" => "operasi", 'siri' => $request->siri, "pembatalan" => "batal", - 'namaoperasi' => $request->namaoperasi + "namakhazanah" => $request->namakhazanah ])->json(); event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$request->teller)); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 47f0aa5..0031a46 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -145,279 +145,14 @@ class LelongController extends Controller $serahan = $getTunai2['kurang']; $bakiakhir = $baki; - $jumlah_byr=$request->jumlah; if($request->jenis == 'T') { $bakiakhir -= $request->jumlah; - - - - $KOD_TUNAI='1000/010'; - $BAKI_LELONG='7000/090'; - - $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); - $hariIni_Tunai=$get_lejerTunai[0]['hariini']; - $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; - $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; - $kredit_Tunai=$get_lejerTunai[0]['kredit']; - $debit_Tunai=$get_lejerTunai[0]['debit']; - $recno_Tunai=$get_lejerTunai[0]['recno']; - - - $kredit_Tunai=$kredit_Tunai+$jumlah_byr; - $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; - $updateGlejer_Tunai=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, - - ]); - - - $get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - $gl_cdetails_bl= $get_KOD_BL[0]; - $keterangan_bl= $get_KOD_BL[0]['descpt']; //keterangan glcode - $actype_bl= $get_KOD_BL[0]['acttype']; - - - $get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - if(sizeof($get_current_GLejer_Baki_Lelong)==0) - { - $jumlah_bl=0.0; - - $getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - if(sizeof($getGLedjer_bl_Semalam)==0) - { - $jumlah_bl=0.0; - } - else - { - - $jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah']; - - $hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini']; - $jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl; - - } - $jumlahBulan_ini_bl=0.0; - $get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - if( sizeof($get_GlejerBulan_Tahun_bl)==0) - { - $jumlahBulan_ini_bl=0.0; - } - else - { - - $jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah']; - $jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl; - - } - - - $Jumlah_TahunIni_bl=0.0; - $get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); - - if(sizeof($get_Glejer_Tahun_bl)==0) - { - $Jumlah_TahunIni_bl=0.0; - } - else - { - $JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah']; - $Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl; - - } - - - $HariIni_bl=0.0; - $kelmarin_bl=$jumlah_bl-$HariIni_bl; - $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$BAKI_LELONG, - 'descpt'=>$keterangan_bl, - 'debit'=>$jumlah_byr, - 'kredit'=>0.0, - 'hariini'=>$HariIni_bl, - 'kelmarin'=>$kelmarin_bl, - 'jumlah'=>$jumlah_bl, - 'bulanini'=>$jumlahBulan_ini_bl, - 'tahunini'=>$Jumlah_TahunIni_bl, - 'acttype'=> $actype_bl - - ]); - - - } - else - { - - $hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini']; - $kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin']; - $jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah']; - $kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit']; - $debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit']; - $recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno']; - - $debit_BL=$debit_BL+$jumlah_byr; - $hariIni_Tunai=$debit_BL-$kredit_BL; - $kelmarin_BL=$jumlah_BL-$hariIni_BL; - - $updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_BL, - 'debit'=>$debit_BL, - 'kredit'=>$kredit_BL, - 'hariini'=>$hariIni_BL, - 'kelmarin' =>$kelmarin_BL, - - ]); - - } - - - } else { $bakiakhir += -($request->jumlah); - - - $KOD_TUNAI='1000/010'; - $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); - $hariIni_Tunai=$get_lejerTunai[0]['hariini']; - $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; - $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; - $kredit_Tunai=$get_lejerTunai[0]['kredit']; - $debit_Tunai=$get_lejerTunai[0]['debit']; - $recno_Tunai=$get_lejerTunai[0]['recno']; - - - $debit_Tunai=$debit_Tunai+$jumlah_byr; - $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; - $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; - $updateGlejer_Tunai=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, - - ]); - - - - $RUGI_LELONG='3000/020'; - - $get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - $gl_cdetails_rl= $get_KOD_RL[0]; - $keterangan_rl= $get_KOD_RL[0]['descpt']; //keterangan glcode - $actype_rl= $get_KOD_RL[0]['acttype']; - - - $get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - if(sizeof($get_current_GLejer_Rugi_Lelong)==0) - { - $jumlah_rl=0.0; - - $getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - if(sizeof($getGLedjer_rl_Semalam)==0) - { - $jumlah_rl=0.0; - } - else - { - - $jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah']; - - $hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini']; - $jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl; - - } - $jumlahBulan_ini_rl=0.0; - $get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - if( sizeof($get_GlejerBulan_Tahun_rl)==0) - { - $jumlahBulan_ini_rl=0.0; - } - else - { - - $jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah']; - $jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl; - - } - - - $Jumlah_TahunIni_rl=0.0; - $get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); - - if(sizeof($get_Glejer_Tahun_rl)==0) - { - $Jumlah_TahunIni_rl=0.0; - } - else - { - $JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah']; - $Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl; - - } - - - $HariIni_rl=0.0; - $kelmarin_rl=$jumlah_rl-$HariIni_rl; - $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw'=>$auth_user['cawangan'], - 'glcode'=>$RUGI_LELONG, - 'descpt'=>$keterangan_rl, - 'debit'=>0.0, - 'kredit'=>$jumlah_byr, - 'hariini'=>$HariIni_rl, - 'kelmarin'=>$kelmarin_rl, - 'jumlah'=>$jumlah_rl, - 'bulanini'=>$jumlahBulan_ini_rl, - 'tahunini'=>$Jumlah_TahunIni_rl, - 'acttype'=> $actype_rl - - ]); - - - } - else - { - - $hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini']; - $kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin']; - $jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah']; - $kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit']; - $debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit']; - $recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno']; - - $kredit_RL=$kredit_RL+$jumlah_byr; - $hariIni_Tunai=$debit_RL-$kredit_RL; - $kelmarin_BL=$jumlah_RL-$hariIni_RL; - - $updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno_RL, - 'debit'=>$debit_RL, - 'kredit'=>$kredit_RL, - 'hariini'=>$hariIni_RL, - 'kelmarin' =>$kelmarin_RL, - - ]); - - } - - - } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index e8aaece..b150a4e 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -1237,10 +1237,10 @@ return 'Masukkan No Kad Pengenalan yang betul!'; } - if(isNaN(value)) - { - return 'Kad Pengenalan hendaklah dalam bentuk nombor!' - } + // if(isNaN(value)) + // { + // return 'Kad Pengenalan hendaklah dalam bentuk nombor!' + // } } }); diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index dc83920..0a403f2 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -86,9 +86,9 @@
Aging Kawalan Stok
-
- Imbang Duga -
+ {{--
+ // Imbang Duga +
--}}
Peti Besi
diff --git a/resources/views/khazanah/laporan/tuntutbaki.blade.php b/resources/views/khazanah/laporan/tuntutbaki.blade.php index fae7641..08255b7 100644 --- a/resources/views/khazanah/laporan/tuntutbaki.blade.php +++ b/resources/views/khazanah/laporan/tuntutbaki.blade.php @@ -49,11 +49,9 @@ - TOTAL - - - - + TOTAL + + @@ -116,15 +114,16 @@ function gadaitable(data){ var counter = 1; - var total_pinjaman = 0; - var total_upah12 = 0; - var total_nm = 0; - var total_berat = 0; + var totaljumlah = 0; + var totalcajlelong = 0; tabletuntutbaki.clear().draw(); $.each(data,function(index,tb){ + totaljumlah += tb['jumlah']; + totalcajlelong += tb['cajlelong']; + $.ajax({ method:'get', url: api_url + '/api/gadai/norujukan/' + tb['norujukan'], @@ -136,7 +135,7 @@ tabletuntutbaki.row.add([ counter, - customer[0]['nama'], + customer['nama'], gadai[0][0]['nokp'], tb['norujukan'], tb['teller'], @@ -144,6 +143,9 @@ tb['jumlah'] ]).draw(); + counter = counter + 1; + $('#totalcajlelong').text(formatter.format(totalcajlelong)); + $('#totaljumlah').text(formatter.format(totaljumlah)); } }); } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index 1a98a03..1955d43 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -252,6 +252,9 @@ alert(xhr.responseText); } }); + + return false; + const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', diff --git a/resources/views/modal/wakil.blade.php b/resources/views/modal/wakil.blade.php index 5b80b00..229b7ae 100644 --- a/resources/views/modal/wakil.blade.php +++ b/resources/views/modal/wakil.blade.php @@ -88,6 +88,7 @@ + diff --git a/resources/views/print/laporan_tuntutbaki.blade.php b/resources/views/print/laporan_tuntutbaki.blade.php index d034fc5..cfc1e65 100644 --- a/resources/views/print/laporan_tuntutbaki.blade.php +++ b/resources/views/print/laporan_tuntutbaki.blade.php @@ -233,7 +233,7 @@ $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json(); $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json(); - echo $customer_detail[0]['nama']; + echo $customer_detail['nama']; @endphp {{$gadaidetail[0][0]['nokp']}}