diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index b11525c..c44ee73 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -109,8 +109,10 @@ class AliranTunaiController extends Controller $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json(); $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json(); - - return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai')); + + $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json(); + + return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai','tunaipast')); } public function alirantunaiGadai(Request $request,$teller){ @@ -581,5 +583,30 @@ class AliranTunaiController extends Controller return response($updateTunai); } + public function LaporanAliranTunai($teller) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $tarikh_cetak = $current->toDateString(); + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + + $alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json(); + + $addtunai = Http::get(config('api.url') . '/api/getAddTunai/' . $auth_user['cawangan'] . '/kodlaluan/',['kodlaluan' => $auth_user['name']])->json(); + + $teller = $auth_user['name']; + + return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller')); + } + } diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 7feb8bb..4365020 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -349,13 +349,13 @@ class GadaianController extends Controller // if(sizeof($customers_info) != 0) // $customers_info = $customers_info[0]; - $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); - - // dd($wakil); - if(sizeof($wakil) != 0) - $wakil = $wakil[0]; - - + if($penebusan['nowakil']) + { + $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); + if(sizeof($wakil) != 0) + $wakil = $wakil[0]; + } + return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil')); } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index b1780d2..d5d32bf 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -317,16 +317,17 @@ class KhazanahController extends Controller $arraytuntutbaki = []; $arrayaddtunai = []; - $listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get(); - foreach($listUser as $index1 => $ls) + $teller = Http::get( config('api.url') .'/api/get/tellerwork/'. $auth_user['cawangan'])->json(); + + foreach($teller as $index1 => $ls) { - $tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json(); - $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json(); + $tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls['kodlaluan']])->json(); + $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls['kodlaluan']])->json(); - $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'].'/teller/',['tarikh' => $harini->toDateString(),'teller' => $ls->name])->json(); - $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'].'/teller/',['teller' => $ls->name])->json(); - $addtunai = Http::get(config('api.url').'/api/getAddTunai/'.$auth_user['cawangan'].'/kodlaluan/',['kodlaluan' => $ls->name])->json(); + $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'].'/teller/',['tarikh' => $harini->toDateString(),'teller' => $ls['kodlaluan']])->json(); + $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'].'/teller/',['teller' => $ls['kodlaluan']])->json(); + $addtunai = Http::get(config('api.url').'/api/getAddTunai/'.$auth_user['cawangan'].'/kodlaluan/',['kodlaluan' => $ls['kodlaluan']])->json(); array_push($arraygadaitebus,$gadai_tebus); array_push($arraytuntutbaki,$tuntutbaki); @@ -340,7 +341,7 @@ class KhazanahController extends Controller $petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json(); - return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai')); + return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','teller','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai')); } @@ -2997,4 +2998,27 @@ class KhazanahController extends Controller return view('print.laporan_upah', compact('advansur','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } + public function lelongan($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(); + $nama = $customerdetail['nama']; + + $lelong = Http::get(config('api.url') . '/api/lelong/cawangan/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); + + if(sizeof($lelong) > 0) + { + $lelong = $lelong[0]; + } + + $gadai = $gadaidetail[0][0]; + + return view('lelongan.index-khazanah',compact('cawangan_info','api_url','gadai','nama','lelong')); + } + } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0031a46..b785ae0 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -56,7 +56,13 @@ class LelongController extends Controller $lelong=Http::get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); - return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url','lelong')); + $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $lelong['nowakil'])->json(); + + // dd($wakil); + if(sizeof($wakil) != 0) + $wakil = $wakil[0]; + + return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url','lelong','wakil')); } diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 1db168c..d4b11be 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -115,7 +115,7 @@
- +
@@ -125,8 +125,10 @@ +
+ +
- +
@@ -143,7 +143,7 @@ Ar-Rahn -
+
- +
@@ -273,7 +274,7 @@ No Telefon 2
- +
@@ -750,17 +751,34 @@ }else if(jenistebus == "lelong"){ var urlroute = '{{ route("lelongan", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); - tablelelong.row.add([ - counter, - '' + gadai_detail['norujukan'] + '', - gadai_detail['t_lelong'], - gadai_detail['trkhtuntut'], - 'RM '+ formatter.format(gadai_detail['pinjaman']), - 'RM '+formatter.format(gadai_detail['hargajual']), - 'RM '+formatter.format(gadai_detail['baki']), - 'RM '+formatter.format(gadai_detail['bakiupah']), - 'RM '+formatter.format(gadai_detail['cajlelong']) - ]).draw(); + + if(gadai_detail['trkhtuntut'] == null){ + tablelelong.row.add([ + counter, + '' + gadai_detail['norujukan'] + '', + gadai_detail['t_lelong'], + gadai_detail['trkhtuntut'], + 'RM '+ formatter.format(gadai_detail['pinjaman']), + 'RM '+formatter.format(gadai_detail['hargajual']), + 'RM '+formatter.format(gadai_detail['baki']), + 'RM '+formatter.format(gadai_detail['bakiupah']), + 'RM '+formatter.format(gadai_detail['cajlelong']), + '' + ]).draw(); + }else{ + tablelelong.row.add([ + counter, + '' + gadai_detail['norujukan'] + '', + gadai_detail['t_lelong'], + gadai_detail['trkhtuntut'], + 'RM '+ formatter.format(gadai_detail['pinjaman']), + 'RM '+formatter.format(gadai_detail['hargajual']), + 'RM '+formatter.format(gadai_detail['baki']), + 'RM '+formatter.format(gadai_detail['bakiupah']), + 'RM '+formatter.format(gadai_detail['cajlelong']), + '' + ]).draw(); + } } counter = counter + 1; } @@ -768,6 +786,19 @@ }); } + function cetaktuntutbaki(e) + { + let norujukan = $(e).data('norujukan'); + + console.log(norujukan); + let urlroute = '{{ route("resit.tuntutbaki", ":id") }}'; + urlroute = urlroute.replace(':id', norujukan); + + window.open(urlroute, '_blank'); + + return; + } + function checktuntutbaki(e) { let tarikhtuntut = $(e).data('tarikhtuntut'); @@ -1552,8 +1583,13 @@ let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - var id = $('.tab-content .active').attr('id'); - if(id == "nav-tawarruq-tab") { + // var id = $('.tab-content .active').attr('id'); + + var activeTab = $("#navtawarruqdannottawarruq.tab-content").find(".active"); + var id = activeTab.attr('id'); + + console.log(id); + if(id == "nav-tawarruq") { if(+harini !== +tarikhgadai2){ Swal.fire({ icon: 'error', @@ -1694,10 +1730,12 @@ alert(xhr.responseText); } }); + + return false; } - return false; + // return false; }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); @@ -1926,6 +1964,36 @@ } } + + + $('#poskod').change(function(){ + var poskod = this.value; + console.log(poskod); + $.ajax({ + method:'GET', + url:api_url+'/api/poskod/'+poskod, + success:function(poskod_detail){ + var koddaerah = poskod_detail['koddaerah']; + var kodnegeri = poskod_detail['kodnegeri']; + $.ajax({ + url:api_url+'/api/negeri/'+kodnegeri, + method:'GET', + success:function(negeri){ + console.log(negeri); + $('#kodnegeri').val(negeri['negeri']); + } + }); + $.ajax({ + url:api_url+'/api/daerah/'+koddaerah, + method:'GET', + success:function(daerah){ + $('#koddaerah').val(daerah['namadaerah']); + } + }); + } + }); + }); + function kemaskinifunc() { $('#btnkemaskini').addClass('btn-danger'); @@ -1940,6 +2008,8 @@ $('#kodbank').attr('disabled', false); $('#noakaun').attr('readonly', false); $('#nota').attr('readonly', false); + $('#alamat').attr('readonly', false); + $('#poskod').attr('readonly', false); } @@ -1959,6 +2029,8 @@ $('#kodbank').attr('disabled', true); $('#noakaun').attr('readonly', true); $('#nota').attr('readonly', true); + $('#alamat').attr('readonly', true); + $('#poskod').attr('readonly', true); } $("#kemaskiniform").submit(function(event) { @@ -1970,6 +2042,8 @@ var kodbank = $('#kodbank').val(); var noakaun = $('#noakaun').val(); var nota = $('#nota').val(); + var alamat = $('#alamat').val(); + var poskod = $('#poskod').val(); $.ajax({ method:"put", @@ -1979,7 +2053,9 @@ "telefon2": telefon2, "kodbank":kodbank, "noakaun":noakaun, - 'nota':nota + 'nota':nota, + 'alamat':alamat, + 'poskod':poskod }, success: function(success){ $('#btnsave').css('display','none'); @@ -2044,6 +2120,8 @@ $('#noakaun').attr('readonly', true); $('#kodbank').attr('disabled', true); $('#nota').attr('readonly', true); + $('#alamat').attr('readonly', true); + $('#poskod').attr('readonly', true); $('#kemaskiniform').trigger('submit'); } diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 0b39319..332fb00 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -265,6 +265,8 @@ } window.onload = timedRefresh(100000); + //Pusher + var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({ "ordering": true }); diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 26e754b..f70fc1e 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -64,6 +64,10 @@
  • Home
  • Aliran Tunai
    • + + {{-- {{ dd($tunai) }} --}} @@ -92,9 +96,6 @@ -
    @@ -106,29 +107,30 @@ {{-- {{ dd($arraytunai) }} --}} - @endforeach -
    - @foreach($listUser as $index1=>$ls) + @foreach($teller as $index1=>$ls) @if($index1 == 0) -
    +
    Hari Ini @@ -220,26 +222,26 @@
    -