From 86758cfbe1a8a47583c3b1a428c5640b6c08d6fc Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 31 Jan 2021 08:39:15 +0800 Subject: [PATCH] fix all the bug --- app/Http/Controllers/GadaianController.php | 35 +- app/Http/Controllers/KhazanahController.php | 146 ++++++- app/Http/Controllers/OperasiController.php | 40 +- app/Http/Controllers/PenebusanController.php | 5 +- resources/views/aliran_tunai/index.blade.php | 12 +- resources/views/customers/info.blade.php | 53 +-- resources/views/gadaian/edit.blade.php | 105 +++-- resources/views/gadaian/index.blade.php | 105 ++++- .../views/homepage/penilai/home.blade.php | 122 +++++- .../views/khazanah/agingbulanan.blade.php | 142 +++++++ resources/views/khazanah/kelulusan.blade.php | 22 +- .../views/khazanah/rekodtelahlulus.blade.php | 72 ++++ resources/views/modal/editmarhun.blade.php | 4 +- resources/views/modal/wakil.blade.php | 11 + resources/views/operasi/kelulusan.blade.php | 30 +- resources/views/penebusan/index.blade.php | 51 ++- .../print/laporan_aging_bulanan.blade.php | 398 ++++++++++++++++++ routes/web.php | 7 +- 18 files changed, 1209 insertions(+), 151 deletions(-) create mode 100644 resources/views/khazanah/agingbulanan.blade.php create mode 100644 resources/views/khazanah/rekodtelahlulus.blade.php create mode 100644 resources/views/print/laporan_aging_bulanan.blade.php diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index a7c818f..c2ec905 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -136,7 +136,7 @@ class GadaianController extends Controller 'recno' => $request->recno, 'karat' => $request->sltkarat, 'berat' => $request->berat, - 'harga' => $request->harga, + 'harga' => $request->harga1, 'n_marhun' => $request->nilaimarhun ])->json(); @@ -186,7 +186,7 @@ class GadaianController extends Controller public function editstore(Request $request){ $auth_user = Auth::user(); - // dd($request); + $total_nilai_marhun = $request->total_nilai_marhun; $total_nilai_marhun = str_replace(',','',$total_nilai_marhun); @@ -270,12 +270,37 @@ class GadaianController extends Controller $norujukan = $request->norujukan_modal; $auth_user = Auth::user(); $api_url = config('api.url'); - $cetak_sag = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$norujukan,[ - 'penilai' => $auth_user['name'] - ]); + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$norujukan)->json(); $gadai_detail = $gadai[0]; + if(isset($request->jenisprint)) + { + + $cetak_sag = Http::put(config('api.url').'/api/gadai/norujukan/cetak/'.$auth_user['cawangan'].'/'.$norujukan,[ + 'penilai' => $auth_user['name'] + ]); + + $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'] . '/' . $gadai_detail['teller'])->json(); + + $keluar=$getTunai2['keluar']; + $baki=$getTunai2['baki']; + $masuk=$getTunai2['masuk']; + $totalkeluar = 0; + $bakiakhir = 0; + + $totalkeluar = $gadai_detail['pinjaman'] + $keluar; + + $bakiakhir = $baki - $gadai_detail['pinjaman']; + + //masuk dalam tunai aliran + $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'].'/'.$gadai_detail['teller'], [ + 'keluar'=>$totalkeluar, + 'masuk'=>$masuk, + 'bakiakhir'=>$bakiakhir + ]); + + } $customer = Http::get(config('api.url') . '/api/customers/'. $gadai_detail['nokp'])->json(); $customer_detail = $customer[0]; diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ef4f01a..b4d0b22 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -251,10 +251,53 @@ class KhazanahController extends Controller $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + //declare array baru + $arraykelulusan = []; + $kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json(); $kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json(); - return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan','kelulusanmohonid')); + foreach($kelulusan as $index=>$k) + { + $komen = explode("|",$k['komen']); + + $results=array_search("",$komen,true); + if($results !== false) { + unset($komen[$results]); + } + + array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]); + } + + return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid')); + + } + + public function kelulusanrekodlepas() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + //declare array baru + $arraykelulusan = []; + + $kelulusan = Http::get(config('api.url') . '/api/RekodDahLepas/' . $auth_user['cawangan'])->json(); + $kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json(); + + foreach($kelulusan as $index=>$k) + { + $komen = explode("|",$k['komen']); + + $results=array_search("",$komen,true); + if($results !== false) { + unset($komen[$results]); + } + + array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus'],]); + } + + return view('khazanah.rekodtelahlulus',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid')); } @@ -328,24 +371,21 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); + $current = Carbon::now(); + $current = new Carbon(); + $norujukan = $request->norujukan; $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/khazanah', [ - 'komen' => "Pembiayaan Melebihi Margin 70%", - 'dategadai' => "2020-12-12", + 'komen' => $request->komen, + 'dategadai' => $current->toDateString(), 'bilgadai' => 1, - 'jumpinjam' => 1020, + 'jumpinjam' => $request->jumpinjam, 'jenistebus' => "G", - 'teller' => "dsaas", + 'teller' => $request->teller, 'pelulus' => "khazanah" - // 'komen' => $request->komen, - // 'dategadai' => $dategadai, - // 'bilgadai' => $bilgadai, - // 'jumpinjam' => $request->jumpinjam, - // 'jenistebus' => "G", - // 'teller' => $request->teller ])->json(); event(new StatusLiked($auth_user['cawangan'],$auth_user['name'])); @@ -449,7 +489,9 @@ class KhazanahController extends Controller public function barcodescanned(Request $request){ $auth_user = Auth::user(); $gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json(); + + event(new NotifikasiPembayaran('TellerkepadaKhazanah')); return redirect()->route('khazanah.gadaian'); @@ -1335,4 +1377,86 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); return view('khazanah.unjuran',compact('cawangan_info','api_url')); } + + + + public function laporanAging_Bulanan()//added by fariz 2021-01-19 + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + return view('khazanah.laporan.agingbulanan',compact('cawangan_info','api_url')); + } + + + public function cetaklaporang_Aging(Request $request) //added by fariz 2021-01-19 + { + + + $auth_user = Auth::user(); + $api_url = config('api.url'); + $tarikh_aging=$request; + // dd($tarikh_aging); + $num=$request->num; + $current = Carbon::now(); + $current = new Carbon(); + + + if($request->datetimepicker1 == null){ + $tebus_date = $current->toDateString(); + }else + { + $split_date = explode('-',$request->datetimepicker1); + $tarikh_aging = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } + + $num1=$request->num1; + $num2=$request->num2; + $num3=$request->num3; + $num4=$request->num4; + + $num5=$request->num5; + $num6=$request->num6; + $num7=$request->num7; + $num8=$request->num8; + + $num9=$request->num9; + $num10=$request->num10; + $num11=$request->num11; + $num12=$request->num12; + $num13=$request->num13; + + $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]; + + + $data=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num1)->json(); + $data_2=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num2)->json(); + $data_3=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num3)->json(); + + + $data_4=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num4)->json(); + $data_5=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num5)->json(); + $data_6=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num6)->json(); + $data7=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num7)->json(); + $data_8=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num8)->json(); + $data_9=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num9)->json(); + $data_10=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num10)->json(); + $data_11=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num11)->json(); + $data_12=Http::get(config('api.url').'/api/gadai/aging/test/'.$auth_user['cawangan'].'/'.$tarikh_aging.'/'.$num12)->json(); + $data_13=Http::get(config('api.url').'/api/gadai/aging/lebih12bulan/'.$auth_user['cawangan'].'/'.$tarikh_aging)->json(); + + + + $data2=Http::get(config('api.url').'/api/gadai/JumlahagingBulanan/test/'.$auth_user['cawangan'].'/'.$tarikh_aging)->json(); + + + return view('print.laporan_aging_bulanan', compact('cawangan_info', 'api_url','cawangan_detail','data','data2','data_2','data_3','data_4','data_5', + 'data_6','data7','data_8','data_9','data_10','data_11','data_12','data_13','tarikh_aging')); + } + } \ No newline at end of file diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index aae070d..83895f7 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -11,6 +11,8 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; +use Carbon\Carbon; + class OperasiController extends Controller { public function __construct() @@ -24,14 +26,26 @@ class OperasiController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $kelulusan = Http::get(config('api.url') . '/api/ListOperasi/')->json(); + + $arraykelulusan = []; + - - if(sizeof($kelulusan) != 0) + foreach($kelulusan as $index=>$lulus) { - $kelulusan = $kelulusan[0]; + foreach($lulus['kelulusanall'] as $index=>$kel) + { + $komen = explode("|",$kel['komen']); + + $results=array_search("",$komen,true); + if($results !== false) { + unset($komen[$results]); + } + + array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'], "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]); + } } - return view('operasi.kelulusan',compact('cawangan_info','api_url','kelulusan')); + return view('operasi.kelulusan',compact('cawangan_info','api_url','arraykelulusan')); } public function getkelulusan(Request $request) @@ -80,24 +94,22 @@ class OperasiController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); + $current = Carbon::now(); + $current = new Carbon(); + $norujukan = $request->norujukan; $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $createlulus = Http::post(config('api.url') . '/api/CreateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan . '/roles/operasi', [ - 'komen' => "Pembiayaan Melebihi Margin 75%", - 'dategadai' => "2020-12-12", + 'komen' => $request->komen, + 'dategadai' => $current->toDateString(), 'bilgadai' => 1, - 'jumpinjam' => 1020, + 'jumpinjam' => $request->jumpinjam, 'jenistebus' => "G", - 'teller' => "dsaas", + 'teller' => $request->teller, 'peloperasi' => "operasi" - // 'komen' => $request->komen, - // 'dategadai' => $dategadai, - // 'bilgadai' => $bilgadai, - // 'jumpinjam' => $request->jumpinjam, - // 'jenistebus' => "G", - // 'teller' => $request->teller + ])->json(); event(new StatusLiked($auth_user['cawangan'],$auth_user['name'])); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 068dcc8..f2f2908 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -405,7 +405,7 @@ class PenebusanController extends Controller } - //Wakil Function - Jangan kacau saya nak makan kacang ni!!!!!! + //Wakil Function - Jangan kacau saya nak makan kacang ni!! public function getfirstWakil() { @@ -438,8 +438,7 @@ class PenebusanController extends Controller $auth_user = Auth::user(); $createwakil = Http::post(config('api.url') . '/api/createwakil/'. $auth_user['cawangan'] . '/' . $request->icno,[ - - + 'nopelanggan' => $request->nopelanggan, 'nowakil' => $request->nowakil, 'nama' => $request->nama, diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 6e26237..2e89b54 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -63,9 +63,9 @@
- {{--

RM {{ number_format($GT['gjumlah'],2) }}

--}} -

{{ $GT['gcount'] }}

-

Bilangan Gadaian

+

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

+ {{--

{{ $GT['gcount'] }}

--}} +

Jumlah Gadaian

@@ -75,9 +75,9 @@
- {{--

RM {{ number_format($GT['tjumlah'],2) }}

--}} -

{{ $GT['tcount'] }}

-

Bilangan Penebusan

+

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

+ {{--

{{ $GT['tcount'] }}

--}} +

Jumlah Penebusan

diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 0520baf..16809a2 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -18,6 +18,7 @@
+
@@ -719,31 +720,6 @@ let hapusidsudah = $('input[name="sudahtebus"]:checked').val(); let harini = new Date();harini.setHours(0, 0, 0, 0); - if($("input[name='options']:checked").val() == 'belum_tebus'){ - let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); - let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - if(+harini !== +tarikhgadai2){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Hapu Gadai Tidak Dibenarkan' - }); - return false; - } - }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ - let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); - let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); - - if(+harini !== +tarikhgadai1){ - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Hapu Gadai Tidak Dibenarkan' - }); - return false; - } - } - if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ Swal.fire({ icon: 'error', @@ -760,6 +736,31 @@ return false; } + if($("input[name='options']:checked").val() == 'belum_tebus'){ + let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); + let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); + if(+harini !== +tarikhgadai2){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Hapus Gadai Tidak Dibenarkan' + }); + return false; + } + }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ + let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); + let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); + + // if(+harini !== +tarikhgadai1){ + // Swal.fire({ + // icon: 'error', + // title: 'Amaran', + // text: 'Hapus Gadai Tidak Dibenarkan' + // }); + // return false; + // } + } + const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', @@ -817,7 +818,7 @@ } }); - //TIME INTERVAL + //TIME INTERVAL let timerInterval; timerInterval = setInterval(function(){ diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php index eb2d605..40b6cc7 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -20,32 +20,9 @@
-
-
-
- Jumlah Pembiayaan Semasa -
-
- @php - $outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json(); - @endphp - -
-
-
-
-
-
- Limit Pembiayaan Semasa -
-
- -
-
-
- +
@@ -120,8 +97,7 @@
- @php $percentpinjam = ($gadaiannorujukan['pinjaman']/$gadaiannorujukan['nilaimarhun'])*100; @endphp - {{ number_format((float)$percentpinjam,2) }}% +
@@ -156,8 +132,8 @@ - {{-- Batal --}} - Batal + Batal + {{-- Batal --}}
@@ -206,7 +182,7 @@
Berat
Harga
-
+
Nilai Marhun
Bilangan Marhun
@@ -249,6 +225,30 @@ function disableF5(e) { if ((e.which || e.keyCode) == 116) e.preventDefault(); }; $(document).ready( function () { + + + $.ajax({ + method: 'get', + url: api_url + '/api/marhun/' + "{{ $norujukan }}", + success:function(data) + { + let count = 0; + let jumlah = 0; + $.each(data,function(index,marhun) + { + $.each(marhun,function(index,mar) + { + jumlah += Number(mar['n_marhun']); + count++; + }) + }) + + $('#bilangan_marhun').val(count); + $('#jumlah_nilai_marhun').val(formatter.format(jumlah)); + + } + }); + $(document).on("keydown", disableF5); var norujukan = $('#norujukan').val(); getMarhun(norujukan); @@ -289,6 +289,7 @@ var karat = this.value; karat = karat.replace(/\./g,'-'); var berat = $('#berat_emas').val(); + alert(karat); getHargaEmas(karat,berat) }); @@ -315,10 +316,15 @@ method:'GET', url: api_url + '/api/harga_emas/'+karat, success:function(data){ - + var nilai_marhun = data['harga'] * berat; - $('#harga').val(data['harga']); + $('#harga').val(formatter.format(data['harga'])); + $('#nilai_marhun').val(formatter.format(nilai_marhun)); + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(err.Message); + console.log(err.Message); } }) } @@ -354,6 +360,7 @@ var jumlah_nilai_marhun = 0; function marhuntable(data){ var counter = 1; + var count = 0; total_nilai_marhun = 0; total_berat = 0; var marhun_details = ''; @@ -372,12 +379,20 @@ formatter.format(marhun_detail['berat']), marhun_detail['nota'], marhun_detail['harga'], - " " + "
" ]).draw(); + count++; counter = counter + 1; }); }); + + if (count == 1) + { + $('.buttonpunya').html(""); + } + + if(total_nilai_marhun > 0 && total_nilai_marhun < 401){ kadarupah = 1.25/100; }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){ @@ -391,6 +406,14 @@ $('#kadarkeuntungan').val(formatter.format(kadarupah)); $('#kuantiti_marhun').val(formatter.format(jumlah_marhun)); + let perpinjam = ($('#pinjaman').val()/total_nilai_marhun)*100; + let keuntungan_sebulan = $('#pinjaman').val() * kadarupah; + let keuntungan_6bln = keuntungan_sebulan * 6; + + $('.span-pinjaman').text(formatter.format(perpinjam.toFixed(2)) + ' %'); + $('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2))); + $('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2))); + $.ajax({ method:'GET', url: api_url + '/api/maxpinjaman', @@ -448,30 +471,28 @@ $('#sltkarat').val(karat); $('#berat').val(berat); - $('#nilaimarhun').val(nm); - $('#harga').val(harga); + $('#nilaimarhun').val(nm.substring(2)); + $('#harga1').val(harga); $('#norujukedit').val(norujuk); $('#recno').val(recno[1]); $('#editMarhunModal').modal(); } - // $( "#daft" ).one( "click", function() { - // alert( "This will be displayed only once." ); - // }); - $("#sltkarat").change(function(e){ let hargaref = $(this).find(':selected').data('harga'); - - $('#berat').attr('readonly', false); - $('#harga').val(hargaref); + let ber = parseFloat($('#berat').val()); + let total = ber * hargaref; + // $('#berat').attr('readonly', false); + $('#nilaimarhun').val(total.toFixed(2)); + $('#harga1').val(hargaref); }); function calculationharga(e) { let berat = $(e).val(); let total = 0; - let harga = $('#harga').val(); + let harga = $('#harga1').val(); total = berat * harga; diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 9445447..f5a4abf 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -1,5 +1,7 @@ @extends('layouts.app') +@include('modal.editmarhun') + @section('content') @php $gadai_session = Http::get($api_url . '/api/check/sag',['kodcaw'=>$cawangan_info['kodcaw'],'norujukan'=>$norujukan,'nokp'=>$customer_info['kpbaru']])->json(); @@ -38,11 +40,14 @@ Bil + Recno Marhun Nilai Marhun Karat Berat Nota + Harga + Tindakan @@ -300,7 +305,19 @@ } var tablemarhun = $('#myTable').DataTable({ - "ordering": false + "ordering": false, + "columnDefs": [ + { + "targets": [ 1 ], + "visible": false, + "searchable": false + }, + { + "targets": [ 7 ], + "visible": false, + "searchable": false + } + ] }); $(".select2").select2({ @@ -329,11 +346,14 @@ marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +","; tablemarhun.row.add([ counter, + marhun_detail['recno'], marhun_detail['marhun'], 'RM ' + formatter.format(marhun_detail['n_marhun']), marhun_detail['karat'], formatter.format(marhun_detail['berat']), - marhun_detail['nota'] + marhun_detail['nota'], + marhun_detail['harga'], + "
" ]).draw(); counter = counter + 1; }); @@ -666,6 +686,10 @@ if (result.isConfirmed) { let norujukan = $('#norujukan').val(); + let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); + let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|"; + let jumpinjam = $('#pinjaman').val(); + let teller = "{{ Auth::user()->name }}"; Swal.fire({ title: 'Tunggu Pengesahan Daripada Operasi.', @@ -685,7 +709,10 @@ url: "{{ route('operasi.createkelulusan') }}", data: { "_token": "{{ csrf_token() }}", - "norujukan" : norujukan + "norujukan" : norujukan, + "komen" : komen, + "jumpinjam" : jumpinjam, + "teller" : teller }, success:function(data){ console.log(data); @@ -705,6 +732,7 @@ url: "{{ route('operasi.getkelulusan') }}", data: { "norujukan" : norujukan + }, success:function(data){ if(data != ''){ @@ -756,6 +784,10 @@ if (result.isConfirmed) { let norujukan = $('#norujukan').val(); + let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text(); + let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|"; + let jumpinjam = $('#pinjaman').val(); + let teller = "{{ Auth::user()->name }}"; Swal.fire({ title: 'Tunggu Pengesahan Daripada Khazanah.', @@ -775,7 +807,10 @@ url: "{{ route('khazanah.createkelulusan') }}", data: { "_token": "{{ csrf_token() }}", - "norujukan" : norujukan + "norujukan" : norujukan, + "komen" : komen, + "jumpinjam" : jumpinjam, + "teller" : teller }, success:function(data){ console.log(data); @@ -844,5 +879,67 @@ }); } } + + + function deletemarhun(e) + { + 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] + }, + success:function(data) + { + console.log(data); + location.reload(); + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + } + + function editmarhun(e) + { + let norujuk = $('#norujukan').val();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[7]; + + + $('#sltkarat').val(karat); + $('#berat').val(berat); + $('#nilaimarhun').val(nm.substring(2)); + $('#harga1').val(harga); + $('#norujukedit').val(norujuk); + $('#recno').val(recno[1]); + $('#editMarhunModal').modal(); + } + + $("#sltkarat").change(function(e){ + let hargaref = $(this).find(':selected').data('harga'); + let ber = parseFloat($('#berat').val()); + let total = ber * hargaref; + $('#nilaimarhun').val(total.toFixed(2)); + $('#harga1').val(hargaref); + }); + + function calculationharga(e) + { + let berat = $(e).val(); + let total = 0; + let harga = $('#harga1').val(); + + total = berat * harga; + + $('#nilaimarhun').val(total.toFixed(2)); + + } + @endsection diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 444b531..89d75b2 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -31,6 +31,7 @@
@csrf + @@ -79,6 +80,20 @@ +
+
+ + @csrf + + + + +
+ +
@@ -178,7 +193,7 @@ @php $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); @endphp - {{$gadaian['norujukan']}} + {{$gadaian['norujukan']}} {{ number_format($gadaian['pinjaman'],2) }} {{ number_format($gadaian['nilaimarhun'],2) }} @@ -269,7 +284,10 @@ var hargajualan = button.data('hargajualan'); var pinjaman = button.data('pinjaman'); - $('#tablemarhun').empty(); + $('#norujukan_modal1').val(norujukan); + $('#pinjaman_modal1').val(pinjaman); + + $('#belum_serah').empty(); $.each(arraymarhun,function(index,marhun){ $.each(marhun, function(index2,marhun_detail){ var marhun_name; @@ -331,5 +349,105 @@ $("#btn-serah").prop('disabled', true); } }); + + $(document).on('click', '#cetak_sag_belum_serah', function(e) { + + let norujukan = $('#norujukan_modal1').val(); + let mohon = "Print SAG"; + + + const swalWithBootstrapButtons = Swal.mixin({ + customClass: { + confirmButton: 'btn btn-success ml-1', + cancelButton: 'btn btn-danger' + }, + buttonsStyling: false + }); + + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Daripada Khazanah?', + text: "Cetak SAG Semula!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Setuju!', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if(result.isConfirmed) { + Swal.fire({ + title: 'Tunggu Pengesahan Daripada Khazanah.', + icon: 'info', + width: 600, + padding: '6em', + background: '#fffff', + showCancelButton: false, + showConfirmButton: false, + allowOutsideClick: false, + allowEscapeKey: false, + allowEnterKey: false + }) + + + $.ajax({ + method:'post', + url: '{{ route("teller.createkelulusan") }}', + data: { + "_token" : "{{ csrf_token() }}", + "norujukan" : norujukan, + "mohon" : mohon + }, + success:function(data){ + console.log("created"); + + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + console.log(err); + } + }); + + + //TIME INTERVAL + let timerInterval; + + timerInterval = setInterval(function(){ + $.ajax({ + method:'get', + url: "{{ route('teller.getkelulusan') }}", + data: { + "norujukan" : norujukan + }, + success:function(data){ + console.log(data); + if(data != 0){ + console.log('berjaya'); + clearInterval(timerInterval); + Swal.fire({ + icon: 'success', + title: 'Anda Berjaya Menerima Pengesahan' + }).then(function(){ + $("#print_submit_belum_serah").submit(); + }); + } + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + }, 3000); + + + }else if (result.dismiss === Swal.DismissReason.cancel) { + swalWithBootstrapButtons.fire( + 'Cancelled', + 'Your imaginary file is safe :)', + 'error' + ) + } + + }); + }); + @endsection diff --git a/resources/views/khazanah/agingbulanan.blade.php b/resources/views/khazanah/agingbulanan.blade.php new file mode 100644 index 0000000..227dddd --- /dev/null +++ b/resources/views/khazanah/agingbulanan.blade.php @@ -0,0 +1,142 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Laporan Aging Bulanan') }}
+ +
+
+
+ +
+
+

Laporan Aging Bulanan

+
+
+ + +
+
+
+ @csrf +
+
+ Tarikh +
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ + + + + + + + + + + +
BilBil GadaianJumlah Pinjaman (RM)Peratusan %
+
+
+
+
+ Bilangan Surat : 3 + Jumlah Pinjaman : RM 3,000.00 +
+
+
+
+
+
+
+ +@endsection + diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 5e00584..5611641 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -24,21 +24,23 @@ No Rujukan - TARIKH - Cawangan - Permohonan Komen + Nilai Pembiayaan + Nilai Marhun + Berat + Margin Tindakan - @foreach($kelulusan as $index=>$k) + @foreach($arraykelulusan as $index=>$k) - {{ $k['norujukan'] }} - {{ $k['tarikh'] }} - {{ $cawangan_info['details_caw'] }} {{ $k['norujukan'] }} {{ $k['komen'] }} + {{ $k['pinjaman'] }} + {{ $k['nilaimarhun'] }} + {{ $k['berat'] }} + {{ $k['margin'] }} @@ -47,10 +49,11 @@ {{ $km['norujukan'] }} + {{ $km['mohon'] }} {{ $km['tarikh'] }} {{ $cawangan_info['details_caw'] }} {{ $km['norujukan'] }} - {{ $km['mohon'] }} + {{ $km['norujukan'] }} @@ -60,8 +63,7 @@
- Kemaskini - Rekod Telah Lulus + Rekod Telah Lulus
diff --git a/resources/views/khazanah/rekodtelahlulus.blade.php b/resources/views/khazanah/rekodtelahlulus.blade.php new file mode 100644 index 0000000..0bf5c09 --- /dev/null +++ b/resources/views/khazanah/rekodtelahlulus.blade.php @@ -0,0 +1,72 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+ +
+ +
+
+ +
+
+

Kelulusan

+
+
+
+
+ + + + + + + + + + + + + + @foreach($arraykelulusan as $index=>$k) + + + + + + + + + @endforeach + @foreach($kelulusanmohonid as $index=>$km) + + + + + + + + + + + @endforeach + +
No RujukanKomenNilai PembiayaanNilai MarhunBeratMargin
{{ $k['norujukan'] }}{{ $k['komen'] }}{{ $k['pinjaman'] }}{{ $k['nilaimarhun'] }}{{ $k['berat'] }}{{ $k['margin'] }}
{{ $km['norujukan'] }}{{ $km['mohon'] }}{{ $km['tarikh'] }}{{ $cawangan_info['details_caw'] }}{{ $km['norujukan'] }}{{ $km['norujukan'] }}
+ +
+
+
+
+
+ +@endsection diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php index d6e6ad5..daafd11 100644 --- a/resources/views/modal/editmarhun.blade.php +++ b/resources/views/modal/editmarhun.blade.php @@ -32,7 +32,7 @@
- +
@@ -40,7 +40,7 @@
- +
diff --git a/resources/views/modal/wakil.blade.php b/resources/views/modal/wakil.blade.php index 4b1212f..a4e141e 100644 --- a/resources/views/modal/wakil.blade.php +++ b/resources/views/modal/wakil.blade.php @@ -76,6 +76,17 @@ + + + + + + + + + + +
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 968de56..5a104fa 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -17,38 +17,34 @@

Kelulusan

-
. +
- + + + + - @php - - if(sizeof($kelulusan) != 0) - { - $cawangan = $kelulusan['cawangan']; - $kodcaw = $kelulusan['cawangankod']; - $kelulusan = $kelulusan['kelulusanall']; - } - - @endphp - - @foreach($kelulusan as $index=>$k)} + @foreach($arraykelulusan as $index=>$k) + {{-- {{ dd($k) }} --}} - - + - + + + + + @endforeach diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index e78bda7..e4d0ad5 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -104,6 +104,7 @@ + @php $count = 0; @endphp @foreach ($marhun as $index=>$m) @@ -116,6 +117,7 @@ + @php $count++; @endphp @endforeach @@ -291,6 +293,21 @@ var array_nm = []; var array_marhun = []; var array_berat = []; +let bilangan_marhun = Number("{{ $count }}"); + +bilmarhun = () => { + if(bilangan_marhun ==1) + { + $('option[value="S"]').attr("disabled", true); + } + else + { + $('option[value="S"]').attr("disabled", false); + } +} + +bilmarhun(); + var tarikhtawarruq = new Date("2021/01/01"); var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}"); @@ -752,11 +769,9 @@ function bayaransemua() var marhun = "{{ $gadai['marhun'] }}"; var nowakil = nw; - alert(nw); - return; - $.ajax({ method:'put', + datatype: 'json', url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan, data:{ "nopelanggan" : nopelanggan, @@ -775,9 +790,24 @@ function bayaransemua() "jenisbayarantebus" : jenisbayarantebus }, success:function(success_data){ + + // $.ajax({ + // method: 'put', + // datatype: 'json', ///////untuk kegunaaan aliran tunai penebusan je testing + // url: api + '/api/', + // data:{ + + // }, + // success:function(data) + // { + // success la + // } + // }); + + Swal.fire({ icon: 'success', - title: 'Good job!', + title: 'Berjaya!', text: 'You clicked the button!', footer: 'Why do I have this issue?' @@ -1154,12 +1184,21 @@ function bayaransemua() jenisbayarantebus = "tawarruq"; } + if( $('#tambahpinjam').val() <= 0 && $('#tambahpinjam').val() === '') + { + Swal.fire( + 'Amaran!', + 'Amaun hendaklah melebihi daripada 0', + 'error' + ) + return false; + } - if(parseFloat($('#basic-addon2').text()) > 70) + if(parseFloat($('#basic-addon2').text()) > 80) { Swal.fire( 'Amaran!', - 'Pinjaman Haruslah Dalam Lingkungan 70%!', + 'Pinjaman Haruslah Dalam Lingkungan 80%!', 'error' ) return false; diff --git a/resources/views/print/laporan_aging_bulanan.blade.php b/resources/views/print/laporan_aging_bulanan.blade.php new file mode 100644 index 0000000..b96aff0 --- /dev/null +++ b/resources/views/print/laporan_aging_bulanan.blade.php @@ -0,0 +1,398 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No RujukanTARIKH Cawangan KomenNilai PembiayaanNilai MarhunBeratMargin Tindakan
{{ $k['norujukan'] }}{{ $k['tarikh'] }}{{ $cawangan }}{{ $k['cawangan'] }} {{ $k['komen'] }}{{ $k['pinjaman'] }}{{ $k['nilaimarhun'] }}{{ $k['berat'] }}{{ $k['margin'] }}
{{ $index+1 }}{{ $m['karat'] }} RM {{ $m['harga'] }}
+ + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + +
LAPORAN AGING BULANAN
TARIKH : {{$tarikh_aging}}
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TEMPOH BIL GADAIAN JUM PINJAMAN (RM) PERATUSAN %
1 BULAN @foreach($data as $index=>$var) {{$var['a']}}@endforeach @foreach($data as $index=>$var) {{ number_format($var['b'],2)}}@endforeach + @foreach($data as $index=>$var) @foreach($data2 as $in=>$vr){{ round(($var['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
2 BULAN @foreach($data_2 as $index_2=>$var2) {{$var2['a']}}@endforeach @foreach($data_2 as $index_2=>$var2) {{ number_format($var2['b'],2)}}@endforeach @foreach($data_2 as $index=>$var2) @foreach($data2 as $in=>$vr){{ round(($var2['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
3 BULAN @foreach($data_3 as $index_3=>$var3) {{$var3['a']}}@endforeach @foreach($data_3 as $index_2=>$var2) {{ number_format($var3['b'],2)}}@endforeach @foreach($data_3 as $index=>$var3) @foreach($data2 as $in=>$vr){{ round( ($var3['a'] /$vr['a'])*100 ,2) }}@endforeach @endforeach
4 BULAN @foreach($data_4 as $index_4=>$var4) {{$var4['a']}}@endforeach @foreach($data_4 as $index_4=>$var4) {{ number_format($var4['b'],2)}}@endforeach @foreach($data_4 as $index=>$var4) @foreach($data2 as $in=>$vr){{ round(($var4['a'] /$vr['a'])*100 ,2) }}@endforeach @endforeach
5 BULAN @foreach($data_5 as $index_5=>$var5) {{$var5['a']}}@endforeach @foreach($data_5 as $index_5=>$var5) {{ number_format($var5['b'],2)}}@endforeach @foreach($data_5 as $index=>$var5) @foreach($data2 as $in=>$vr){{ round( ($var5['a'] /$vr['a'])*100 ,2) }}@endforeach @endforeach
6 BULAN @foreach($data_6 as $index_6=>$var6) {{$var6['a']}}@endforeach @foreach($data_6 as $index_6=>$var6) {{ number_format($var6['b'],2)}}@endforeach @foreach($data_6 as $index=>$var6) @foreach($data2 as $in=>$vr){{ round(($var6['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
7 BULAN @foreach($data7 as $index7=>$var7) {{$var7['a']}}@endforeach @foreach($data7 as $index7=>$var7) {{ number_format($var7['b'],2)}}@endforeach @foreach($data7 as $index=>$var7) @foreach($data2 as $in=>$vr){{ round( ($var7['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
8 BULAN @foreach($data_8 as $index_8=>$var8) {{$var8['a']}}@endforeach @foreach($data_8 as $index_8=>$var8) {{ number_format($var8['b'],2)}}@endforeach @foreach($data_8 as $index=>$var8) @foreach($data2 as $in=>$vr){{ round( ($var8['a'] /$vr['a'])*100 ,2) }}@endforeach @endforeach
9 BULAN @foreach($data_9 as $index_9=>$var9) {{$var9['a']}}@endforeach @foreach($data_9 as $index_9=>$var9) {{ number_format($var9['b'],2)}}@endforeach @foreach($data_9 as $index=>$var9) @foreach($data2 as $in=>$vr){{ round(($var9['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
10 BULAN @foreach($data_10 as $index_10=>$var10) {{$var10['a']}}@endforeach @foreach($data_10 as $index_10=>$var10) {{number_format($var10['b'],2)}}@endforeach @foreach($data_10 as $index=>$var10) @foreach($data2 as $in=>$vr){{ round( ($var10['a'] /$vr['a'])*100 ,2) }}@endforeach @endforeach
11 BULAN @foreach($data_11 as $index_11=>$var11) {{$var11['a']}}@endforeach @foreach($data_11 as $index_11=>$var11) {{number_format($var11['b'],2)}}@endforeach @foreach($data_11 as $index=>$var11) @foreach($data2 as $in=>$vr){{ round(($var11['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
12 BULAN @foreach($data_12 as $index_12=>$var12) {{$var12['a']}}@endforeach @foreach($data_12 as $index_12=>$var12) {{ number_format($var12['b'],2)}}@endforeach @foreach($data_12 as $index=>$var) @foreach($data2 as $in=>$vr){{ round (($var12['a'] /$vr['a'])*100,2) }}@endforeach @endforeach
12 > BULAN @foreach($data_13 as $index_13=>$var13) {{$var13['a']}}@endforeach @foreach($data_13 as $index_13=>$var13) {{ number_format($var13['b'],2)}}@endforeach @foreach($data_13 as $index=>$var13) @foreach($data2 as $in=>$vr){{ round(($var13['a'] /$vr['a'])*100, 2) }}@endforeach @endforeach
JUMLAH @foreach($data2 as $index2=>$var1){{$var1['a']}} + @endforeach @foreach($data2 as $index2=>$var1){{ number_format($var1['b'],2)}} + @endforeach
+ +
+
+
+ + + + + + + + + + + + + +
DISEMAK DISAHKAN
.................................................................................................................
+ +
\ No newline at end of file diff --git a/routes/web.php b/routes/web.php index f88b09f..4e34277 100644 --- a/routes/web.php +++ b/routes/web.php @@ -67,7 +67,6 @@ Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersControl Route::post('/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller'); Route::post('/gadai/store',['as'=>'gadai.store','uses'=>'GadaianController@store'])->middleware('auth','teller'); Route::get('/gadai/batal',['as'=>'gadai.batal','uses'=>'GadaianController@batal'])->middleware('auth','teller'); -Route::get('/gadai/batal/marhun',['as'=>'gadai.batalmarhun','uses'=>'GadaianController@batalmarhun'])->middleware('auth','teller'); Route::get('/customer/otp',['as'=>'customer.otp','uses'=>'CustomersController@getOTP'])->middleware('auth','teller'); Route::get('/getwakil',['as'=>'wakil.search','uses'=>'PenebusanController@getWakil'])->middleware('auth','teller'); Route::get('/cari',['as'=>'wakil.caricustomer','uses'=>'CustomersController@cari'])->middleware('auth','teller'); @@ -92,6 +91,7 @@ Route::get('/menu','KhazanahController@menu')->middleware('auth','khazanah'); Route::get('/khazanahgadaian',['as'=>'khazanah.gadaian','uses'=>'KhazanahController@gadaian'])->middleware('auth','khazanah'); Route::get('/khazanahtebus','KhazanahController@tebus')->middleware('auth','khazanah'); Route::get('/kelulusan','KhazanahController@kelulusan')->middleware('auth','khazanah'); +Route::get('/kelulusanrekodlepas',['as'=>'khazanah.rekodlepas','uses'=>'KhazanahController@kelulusanrekodlepas'])->middleware('auth','khazanah'); Route::get('/pendahuluan',['as'=>'khazanah.pendahulu','uses'=>'KhazanahController@pendahuluan'])->middleware('auth','khazanah'); Route::get('/serahan',['as'=>'khazanah.serahan','uses'=>'KhazanahController@serahan'])->middleware('auth','khazanah'); Route::get('/laporanscanbarcode',['as'=>'laporanscanbarcode','uses'=>'KhazanahController@LaporanSemakBarcode'])->middleware('auth','khazanah'); @@ -130,10 +130,9 @@ Route::get('/gadai/edit/editmarhun',['as'=>'gadai.ubahmarhun','uses'=>'GadaianCo //Ubah dan Hapus Route::get('/getkelulu',['as'=>'teller.getkelulusan','uses'=>'GadaianController@getkelulusan'])->middleware('auth','teller'); -Route::post('/createkelulu',['as'=>'teller.createkelulusan','uses'=>'GadaianController@createkelulusan'])->middleware('auth','teller'); +Route::post('/createkelulu',['as'=>'teller.createkelulusan','uses'=>'GadaianController@createkelulusan'])->middleware('auth'); Route::put('/updatekelulu',['as'=>'teller.updatekelulusan','uses'=>'GadaianController@updatekelulusan'])->middleware('auth','khazanah'); - //Laporan Baru Route::get('/laporan/lelongan',['as'=>'laporan.lelongan','uses'=>'KhazanahController@laporanLelongan'])->middleware('auth','khazanah'); Route::post('laporan/lelongan/cetak',['as'=>'lelongan.laporancetak','uses'=>'KhazanahController@cetaklaporanLelongan'])->middleware('auth','khazanah'); @@ -153,6 +152,8 @@ Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>' Route::post('laporan/marhunterkumpul/cetak',['as'=>'marhunterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanMarhunTerkumpul'])->middleware('auth','khazanah'); Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanHarian'])->middleware('auth','khazanah'); Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah'); +Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah'); +Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah'); //Resit Ansurans Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'GadaianController@resit'])->middleware('auth','teller');