From 09db6dfcb0afa1728d5f4df9a4abf55a1634b489 Mon Sep 17 00:00:00 2001 From: "LAPTOP-DGCU80CH\\user1" Date: Thu, 3 Dec 2020 12:37:34 +0800 Subject: [PATCH] fix conflict --- app/Http/Controllers/GadaianController.php | 34 +++ resources/views/customers/info.blade.php | 3 +- resources/views/gadaian/index.blade.php | 37 +++- .../views/homepage/penilai/home.blade.php | 198 ++++++++++++++++-- resources/views/layouts/app.blade.php | 1 + routes/web.php | 7 +- 6 files changed, 260 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 1a8d26d..7347a78 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -96,4 +96,38 @@ class GadaianController extends Controller $request->session()->forget('norujukan'); return redirect()->route('customer_info'); } + + public function cetakSAG(Request $request){ + $auth_user = Auth::user(); + // dd($request); + + $gadai = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$request->norujukan_modal); + + return redirect()->route('home'); + } + + public function serahMarhun(Request $request){ + // dd($request); + $auth_user = Auth::user(); + $norujukan_serah = $request->norujukanpilih; + + $arraynorujukan = explode(",",$norujukan_serah); + + $results=array_search("",$arraynorujukan,true); + if($results !== false) { + unset($arraynorujukan[$results]); + } + + // dd($arraynorujukan); + + foreach($arraynorujukan as $index=>$norujukan){ + $gadai = Http::put(config('api.url'). '/api/gadai/norujukan/serah/'. $auth_user['cawangan'] .'/'. $norujukan); + + if($gadai->failed()){ + break; + } + } + + return redirect()->route('home'); + } } diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 1b10b4e..af2994f 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -184,6 +184,7 @@ tablegadai.clear().draw(); $.each(data,function(index,gadai){ $.each(gadai, function(index,gadai_detail){ + var keuntungan_semasa = (gadai_detail['kadarupah']/100)*gadai_detail['bakipjm']*gadai_detail['jbg']; tablegadai.row.add([ counter, gadai_detail['norujukan'], @@ -191,7 +192,7 @@ 'RM '+formatter.format(gadai_detail['pinjaman']), 'RM '+ formatter.format(gadai_detail['nilaimarhun']), gadai_detail['jbg'], - 'RM '+ formatter.format((gadai_detail['kadarupah']/100)*gadai_detail['pinjaman']*gadai_detail['tempoh']), + 'RM '+ formatter.format(keuntungan_semasa), gadai_detail['t_matang'], (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', 'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)), diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index c448646..68db27e 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -475,7 +475,12 @@ 'nilai_marhun' : nilai_marhun }, success:function(data){ - alert('Tambah Marhun Berjaya'); + // alert('Tambah Marhun Berjaya'); + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Tambah Marhun Berjaya' + }); $('#nota').val('').trigger("change"); $('#marhun').val(0); $('#karat').val(0); @@ -491,7 +496,12 @@ $('#daftar_marhun').modal('hide'); }, error: function(xhRequest, ErrorText, thrownError){ - alert('Tambah Marhun Tidak Berjaya'); + // alert('Tambah Marhun Tidak Berjaya'); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Tambah Marhun Tidak Berjaya' + }); console.log(xhRequest); } }); @@ -524,7 +534,12 @@ 'nilai_marhun' : nilai_marhun }, success:function(data){ - alert('Tambah Marhun Berjaya'); + // alert('Tambah Marhun Berjaya'); + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Tambah Marhun Berjaya' + }); $('#nota').val('').trigger("change"); $('#marhun').val(0); $('#karat').val(0); @@ -539,7 +554,12 @@ getMarhun(norujukan); }, error: function(xhRequest, ErrorText, thrownError){ - alert('Tambah Marhun Tidak Berjaya'); + // alert('Tambah Marhun Tidak Berjaya'); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Tambah Marhun Tidak Berjaya' + }); console.log(xhRequest); } }); @@ -572,7 +592,7 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'Pinjaman Memerlukan Kelulusan Operasi' + text: 'Pembiayaan Memerlukan Kelulusan Operasi' }); event.preventDefault(); return false; @@ -580,12 +600,17 @@ Swal.fire({ icon: 'error', title: 'Amaran!', - text: 'Pinjaman Memerlukan Kelulusan Khazanah' + text: 'Pembiayaan Memerlukan Kelulusan Khazanah' }); event.preventDefault(); return false; } } + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Gadaian Berjaya Disimpan' + }); return true; } diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index bcbfc96..77ddceb 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -21,16 +21,23 @@ Berat Karat Nilai Marhun + Nota -
+
- Cetak SAG - Pembelian Komuditi +
+ @csrf + + +
+
@@ -42,6 +49,44 @@ + + @section('content')
@@ -65,6 +110,8 @@ Bil + Nama + No KP No Rujukan Pembiayaan (RM) Nilai Marhun (RM) @@ -79,7 +126,14 @@ {{ $count }} @php - $marhun = Http::get('http://localhost:8000/api/marhun/' . $gadaian['norujukan'] )->json(); + $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); + echo ($customer_info[0]['nama']); + @endphp + + {{ $gadaian['nokp'] }} + + @php + $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); @endphp {{$gadaian['norujukan']}} @@ -99,6 +153,8 @@ Bil + Nama + No KP No Rujukan Pembiayaan (RM) Nilai Marhun (RM) @@ -110,12 +166,17 @@ @if (is_array($gadaian_belumserah) || is_object($gadaian_belumserah)) @foreach($gadaian_belumserah as $index=>$gadaian) - + @php + $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); + @endphp + + {{ $customer_info[0]['nama'] }} + {{ $gadaian['nokp'] }} @php - $marhun = Http::get('http://localhost:8000/api/marhun/' . $gadaian['norujukan'] )->json(); + $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); @endphp - {{$gadaian['norujukan']}} + {{$gadaian['norujukan']}} {{ $gadaian['pinjaman'] }} {{ $gadaian['nilaimarhun'] }} @@ -132,8 +193,11 @@
- - Serah Marhun +
+ @csrf + + +
@@ -150,7 +214,7 @@ setTimeout("location.reload(true);",timeoutPeriod); } - window.onload = timedRefresh(60000); + window.onload = timedRefresh(300000); var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({ "ordering": false }); @@ -161,6 +225,66 @@ minimumFractionDigits: 2 }); + // $('#cetak_sag').click(function(){ + // var kodcaw = $('#kodcaw').val(); + // var norujukan = $('#norujukan_modal').val(); + // $.ajax({ + // url: api_url + '/api/gadai/norujukan/cetak/'+ kodcaw + '/' + norujukan, + // method: 'put', + // success: function(data){ + + // Swal.fire({ + // icon: 'success', + // title: 'Berjaya!', + // text: 'Cetak SAG Berjaya' + // }); + // }, + // error: function(xhRequest, ErrorText, thrownError){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran!', + // text: 'Cetak SAG Tidak Berjaya' + // }); + // console.log(xhRequest); + // } + // }); + // }); + + // $('#pembelian_komuditi').click(function(){ + // var kodcaw = $('#kodcaw').val(); + // var norujukan = $('#norujukan_modal').val(); + // $.ajax({ + // url: api_url + '/api/gadai/norujukan/komuditi/'+ kodcaw + '/' + norujukan, + // method: 'put', + // success: function(data){ + + // Swal.fire({ + // icon: 'success', + // title: 'Berjaya!', + // text: 'Pembelian Komuditi Berjaya' + // }); + // }, + // error: function(xhRequest, ErrorText, thrownError){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran!', + // text: 'Pembelian Komuditi Tidak Berjaya' + // }); + // console.log(xhRequest); + // } + // }); + // }); + + function cetakSAG(kodcaw,norujukan){ + $.ajax({ + url: api_url + 'gadai/norujukan/' + kodcaw + '/' + norujukan, + method:'get', + success: function(data){ + console.log(data); + } + }); + } + //modal $('#marhunModal').on('show.bs.modal', function(event) { var button = $(event.relatedTarget); // button yg trigger @@ -169,6 +293,35 @@ var kodcaw = button.data('kodcaw'); var hargajualan = button.data('hargajualan'); + $('#norujukan_modal').val(norujukan); + cetakSAG(kodcaw,norujukan); + $('#tablemarhun').empty(); + $.each(arraymarhun,function(index,marhun){ + $.each(marhun, function(index,marhun_detail){ + var marhun_name; + $.ajax({ + method:'GET', + url: api_url + '/api/jemas/nama_marhun', + dataType: 'json', + data:{ + marhun:marhun_detail['marhun'] + }, + success:function(marhun_ajax){ + $("#tablemarhun").append("" + marhun_detail['bil'] + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] +""); + } + }); + }); + }); + + }); + + $('#belum_serah_modal').on('show.bs.modal', function(event) { + var button = $(event.relatedTarget); // button yg trigger + var arraymarhun = button.data('marhun'); + var norujukan = button.data('norujukan'); + var kodcaw = button.data('kodcaw'); + var hargajualan = button.data('hargajualan'); + $('#tablemarhun').empty(); $.each(arraymarhun,function(index,marhun){ $.each(marhun, function(index,marhun_detail){ @@ -181,7 +334,7 @@ marhun:marhun_detail['marhun'] }, success:function(marhun_ajax){ - $("#tablemarhun").append("" + marhun_detail['bil'] + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""); + $("#belum_serah").append("" + marhun_detail['bil'] + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] +""); } }); }); @@ -194,11 +347,19 @@ var norujukan = $(this).data("norujukan"); var kodcaw = $(this).data("kodcaw"); var marhun = $(this).data("marhun"); - + total_marhun_pilih += Number(marhun); $('#marhunpilih').val(total_marhun_pilih.toFixed(2)); + $("#btn-serah").prop('disabled', false); + + var norujukanpilih = $('#norujukanpilih').val(); + + norujukanpilih += norujukan + ","; + + $('#norujukanpilih').val(norujukanpilih); + }else { var norujukan = $(this).data("norujukan"); var kodcaw = $(this).data("kodcaw"); @@ -207,6 +368,19 @@ total_marhun_pilih -= Number(marhun); $('#marhunpilih').val(total_marhun_pilih.toFixed(2)); + + var norujukanpilih = $('#norujukanpilih').val(); + + var sag; + sag = norujukan + ","; + + norujukanpilih = norujukanpilih.replace('ALS201203-0001,', ""); + + $('#norujukanpilih').val(norujukanpilih); + } + var legchecked = $('input[id^=checkgadai]:checked').length; + if(legchecked == 0){ + $("#btn-serah").prop('disabled', true); } }); diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f7c7da8..e28f915 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -70,6 +70,7 @@
Kod Cawangan : {{ $cawangan_info['kodcaw'] }} +