diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index f925066..6922d95 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -106,7 +106,7 @@ class GadaianController extends Controller $auth_user = Auth::user(); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('gadaian.edit',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan','api_url')); + return view('gadaian.edit',compact('customer_info','gadaiannorujukan','limit_pinjaman_semasa','cawangan_info','norujukan','api_url')); } public function editmarhun(Request $request){ @@ -122,7 +122,25 @@ class GadaianController extends Controller return $gadaiannorujukan; } - + public function ubahmarhun(Request $request){ + + $api_url = config('api.url'); + + $auth_user = Auth::user(); + + dd(request()->all()); + + $gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukan,[ + 'marhun' => $request->valmarhun, + 'karat' => $request->karat, + 'berat' => $request->berat, + 'harga' => $request->harga, + 'n_marhun' => $request->n_marhun + + ])->json(); + + return $gadaiannorujukan; + } public function store(Request $request){ $auth_user = Auth::user(); @@ -252,6 +270,8 @@ class GadaianController extends Controller public function resit($id) { + $totaltransaction = 0; + $transaction = Http::get(config('api.url') . '/api/transaction/id/'. $id)->json(); if(sizeof($transaction) != 0) @@ -275,7 +295,15 @@ class GadaianController extends Controller $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); - + $totaltransaction = 0; + + $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json(); + + foreach($transaction as $trans) + { + $totaltransaction += $trans['duit_masuk']; + } + if(sizeof($gadai) != 0) $gadai = $gadai[0][0]; @@ -291,14 +319,13 @@ class GadaianController extends Controller if(sizeof($penebusan) != 0) $penebusan = $penebusan[0]; - $wakil = Http::get(config('api.url') . '/api/getwakil/ALS/code/' . $penebusan['nowakil'])->json(); // dd($wakil); if(sizeof($wakil) != 0) $wakil = $wakil[0]; - return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil')); + return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction')); } public function history(Request $request) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index ece5305..9abbe35 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -313,6 +313,67 @@ class KhazanahController extends Controller ///END KELULUSAN/// + + public function createpanjar(Request $request) + { + $auth_user = Auth::user(); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + switch ($request->jenismodal) { + case "selenggara": + $kategori = "Baiki dan Selenggara"; + $tag = 2; + break; + case "keraian": + $kategori = "Keraian & Promosi"; + $tag = 3; + break; + case "belanjaam": + $kategori = "Belanja AM"; + $tag = 1; + break; + case "perubatan": + $kategori = "Belanja AM - Perubatan"; + $tag = 1; + break; + case "dapur": + $kategori = "Belanja AM - Barangan Dapur"; + $tag = 1; + break; + case "pos": + $kategori = "Belanja AM -Postage"; + $tag = 1; + break; + } + + $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ + + 'deskripsi' => $request->deskripsi, + 'bayaran' => $request->bayaran, + 'tag' => $tag, + 'kategori' => $kategori, + 'id' => $auth_user['name'], + 'bakiperubatan' => "0", + 'nobaucer' => $request->baucer, + 'nobil' => "3213231", + 'tuntutoleh' => $request->tuntutan + + ])->json(); + + $updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[ + + 'masuk'=>$masukV, + 'keluar'=>$keluarV, + 'bakiawal'=>$bakiAwalV, + 'bakiakhir'=>$bakiAkhirV, + 'bakieod'=>$bakiEOD + + ]); + + return response($panjar); + } + public function pendahuluan() { $auth_user = Auth::user(); @@ -1172,15 +1233,6 @@ class KhazanahController extends Controller return view('khazanah.capaian',compact('cawangan_info','api_url')); } - public function hargaemas() - { - $auth_user = Auth::user(); - $api_url = config('api.url'); - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json(); - - return view('khazanah.hargaemas',compact('cawangan_info','api_url','harga_emas')); - } public function pelanggan() { diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index bdc016a..59242a7 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -95,4 +95,55 @@ class OperasiController extends Controller return response()->json($createlulus,201); } + + public function parameter() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + return view('operasi.parameter',compact('cawangan_info','api_url')); + } + + public function hargaemas() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json(); + + return view('operasi.hargaemas',compact('cawangan_info','api_url','harga_emas')); + } + + public function createhargaemas(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json(); + + $kemaskini = Http::post(config('api.url') . '/api/harga_emas/create/',[ + 'karat' => $request->karat, + 'keterangan'=> $request->keterangan, + 'harga' => $request->harga, + 'harga2' => $request->harga + ])->json(); + + return redirect('/operasi/hargaemas'); + } + + public function updatehargaemas(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $harga_emas = Http::get(config('api.url') . '/api/harga_emas/')->json(); + + $kemaskini = Http::put(config('api.url') . '/api/harga_emas/update/',[ + "recno" => $request->recno, + "harga" => $request->harga + ])->json(); + + return redirect('/operasi/hargaemas'); + } } diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index ea2a59a..e373313 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -61,7 +61,8 @@ class PenebusanController extends Controller 'bakiupah' => $request->bakiupah, 'nowakil' => $request->nowakil, 'historygadaian' => $request->historygadaian, - 'marhun' => $request->marhun + 'marhun' => $request->marhun, + 'jenisbayarantebus' => $request->jenisbayarantebus ])->json(); ////////////////////// @@ -181,7 +182,8 @@ class PenebusanController extends Controller 'bakipinjaman' => $request->bakipinjaman, 'bakiupah' => $request->bakiupah, 'historygadaian' => $request->historygadaian, - 'marhun' => $request->marhun + 'marhun' => $request->marhun, + 'jenisbayarantebus' => $request->jenisbayarantebus ])->json(); ////////////////////// @@ -302,7 +304,8 @@ class PenebusanController extends Controller 'bakiupah' => $request->bakiupah, 'nowakil' => $request->nowakil, 'historygadaian' => $request->historygadaian, - 'marhun' => $request->marhun + 'marhun' => $request->marhun, + 'jenisbayarantebus' => $request->jenisbayarantebus ])->json(); diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 18b62dc..54dd935 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -219,15 +219,21 @@
-
- Jumlah Pembiayaan Semasa +
+ Jumlah Pembiayaan Semasa / Limit Pembiayaan Semasa
-
+
@php $outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json(); @endphp
+
+ @php + $limit_pinjaman_semasa = 0; + @endphp + +
@@ -281,12 +287,12 @@ Bil No Rujukan Tarikh Gadai - Pembiayaan + Tarikh Matang Nilai Marhun + Pembiayaan + Margin Tempoh Keuntungan - Tarikh Matang - Margin Kos Keuntungan @@ -379,12 +385,12 @@ '', '' + gadai_detail['norujukan'] + '', gadai_detail['t_gadai'], - 'RM '+formatter.format(gadai_detail['pinjaman']), + gadai_detail['t_matang'], 'RM '+ formatter.format(gadai_detail['nilaimarhun']), + 'RM '+formatter.format(gadai_detail['pinjaman']), + (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['jbg'], '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)), '' ]).draw(); @@ -396,12 +402,12 @@ '', gadai_detail['norujukan'], gadai_detail['t_gadai'], - 'RM '+formatter.format(gadai_detail['pinjaman']), + gadai_detail['t_matang'], 'RM '+ formatter.format(gadai_detail['nilaimarhun']), + 'RM '+formatter.format(gadai_detail['pinjaman']), + (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['jbg'], '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)), '' ]).draw(); @@ -413,12 +419,12 @@ counter, gadai_detail['norujukan'], gadai_detail['t_gadai'], - 'RM '+formatter.format(gadai_detail['pinjaman']), + gadai_detail['t_matang'], 'RM '+ formatter.format(gadai_detail['nilaimarhun']), + 'RM '+formatter.format(gadai_detail['pinjaman']), + (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['jbg'], '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)), '' ]).draw(); @@ -477,9 +483,8 @@ { Swal.fire({ icon: 'error', - title: 'Oops...', - text: 'Something went wrong!', - footer: 'Why do I have this issue?' + title: 'Amaran', + text: 'Sila pilih salah satu SAG' }); } else @@ -502,7 +507,30 @@ else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let histid = $('input[name="sudahtebus"]:checked').val(); - alert(histid); + if(histid == null) + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Sila pilih salah satu SAG' + }); + } + else + { + $.ajax({ + method:'get', + url:'{{ route("gadai.history") }}', + data:{ "norujukan" : histid}, + success:function(data) + { + $('#historytebusModal').modal(); + historytebustable(data); + },error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + } } } @@ -525,8 +553,7 @@ tebusaz['norujukan'], tebusaz['jenistebus'], tebusaz['jbg'], - tebusaz['t_tebus'], - "Cetak" + tebusaz['t_tebus'] ]).draw(); counter = counter + 1; @@ -536,64 +563,116 @@ function ubahfunc(e) { - if($("input[name='options']:checked").val() == 'belum_tebus'){ - - let ubahid = $('input[name="belum"]:checked').val(); - - if(ubahid == null) - { - Swal.fire({ - icon: 'error', - title: 'Oops...', - text: 'Something went wrong!', - footer: 'Why do I have this issue?' - }); - } - else - { - var urlroute = '{{ route("gadaian.edit", ":id") }}'; - urlroute = urlroute.replace(':id', ubahid); + let ubahid = $('input[name="belum"]:checked').val(); - window.location.replace(urlroute); - } - + if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus') + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Sila pilih salah satu SAG!' + }); + + return false; } - else if($("input[name='options']:checked").val() == 'sudah_tebus'){ - Swal.fire({ + + if($("input[name='options']:checked").val() == 'sudah_tebus') + { + Swal.fire({ icon: 'error', - title: 'Oops...', - text: 'Ubah hanya untuk belum tebus sahaja!', - footer: 'Why do I have this issue?' - }); - + title: 'Amaran', + text: 'Ubah hanya untuk belum tebus sahaja!' + }); + return false; } - } - function hapusfunc() - { - let kodcaw = "{{ $cawangan_info['kodcaw'] }}"; - if($("input[name='options']:checked").val() == 'belum_tebus'){ - let hapusid = $('input[name="belum"]:checked').val(); - const swalWithBootstrapButtons = Swal.mixin({ + const swalWithBootstrapButtons = Swal.mixin + ({ customClass: { confirmButton: 'btn btn-success', cancelButton: 'btn btn-danger' }, buttonsStyling: false - }) + }) - swalWithBootstrapButtons.fire({ - title: 'Are you sure?', - text: "You won't be able to revert this!", - icon: 'warning', + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Daripada Khazanah?', + text: "Ubah Rekod Pelanggan!", + icon: 'info', showCancelButton: true, - confirmButtonText: 'Yes, delete it!', - cancelButtonText: 'No, cancel!', + confirmButtonText: 'Setuju!', + cancelButtonText: 'Batal', reverseButtons: true }).then((result) => { if (result.isConfirmed) { + var urlroute = '{{ route("gadaian.edit", ":id") }}'; + urlroute = urlroute.replace(':id', ubahid); + + window.location.replace(urlroute); + + + }else if (result.dismiss === Swal.DismissReason.cancel) { + swalWithBootstrapButtons.fire( + 'Cancelled', + 'Your imaginary file is safe :)', + 'error' + ) + } + }); + } + + function hapusfunc() + { + let kodcaw = "{{ $cawangan_info['kodcaw'] }}"; + + let hapusid = $('input[name="belum"]:checked').val(); + let hapusidsudah = $('input[name="sudahtebus"]:checked').val(); + + + if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus') + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Sila pilih salah satu SAG!' + + }); + return false; + }else if(hapusidsudah == null && $("input[name='options']:checked").val() == 'sudah_tebus') + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Sila pilih salah satu SAG!' + + }); + return false; + } + + const swalWithBootstrapButtons = Swal.mixin + ({ + customClass: { + confirmButton: 'btn btn-success', + cancelButton: 'btn btn-danger' + }, + buttonsStyling: false + }) + + swalWithBootstrapButtons.fire({ + title: 'Dapatkan Pengesahan Daripada Khazanah?', + text: "Hapus Rekod!", + icon: 'info', + showCancelButton: true, + confirmButtonText: 'Setuju!', + cancelButtonText: 'Batal', + reverseButtons: true + }).then((result) => { + if (result.isConfirmed) { + if($("input[name='options']:checked").val() == 'belum_tebus') + { + $.ajax({ method:'put', url:api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid, @@ -601,53 +680,24 @@ { console.log(data); swalWithBootstrapButtons.fire( - 'Deleted!', - 'Your file has been deleted.', + 'Hapus!', + 'Data pelanggan telah dihapuskan.', 'success' ).then(function () { location.reload(); }); - + },error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); } }); - - } else if ( - /* Read more about handling dismissals below */ - result.dismiss === Swal.DismissReason.cancel - ) { - swalWithBootstrapButtons.fire( - 'Cancelled', - 'Your imaginary file is safe :)', - 'error' - ) + } - }); + else if($("input[name='options']:checked").val() == 'sudah_tebus') + { + - } - else if($("input[name='options']:checked").val() == 'sudah_tebus'){ - let hapusid = $('input[name="sudahtebus"]:checked').val(); - - const swalWithBootstrapButtons = Swal.mixin({ - customClass: { - confirmButton: 'btn btn-success', - cancelButton: 'btn btn-danger' - }, - buttonsStyling: false - }) - - swalWithBootstrapButtons.fire({ - title: 'Are you sure?', - text: "You won't be able to revert this!", - icon: 'warning', - showCancelButton: true, - confirmButtonText: 'Yes, delete it!', - cancelButtonText: 'No, cancel!', - reverseButtons: true - }).then((result) => { - if (result.isConfirmed) { $.ajax({ method:'put', url:api_url+'/api/tebus/hapus/' + kodcaw + '/' + hapusid, @@ -656,8 +706,8 @@ if(data != "Bukan-Tebus") { swalWithBootstrapButtons.fire( - 'Deleted!', - 'Your file has been deleted.', + 'Hapus!', + 'Data pelanggan telah dihapuskan.', 'success' ).then(function () { location.reload(); @@ -671,25 +721,22 @@ 'error' ) } - - + + },error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); } }); - } else if ( - /* Read more about handling dismissals below */ - result.dismiss === Swal.DismissReason.cancel - ) { - swalWithBootstrapButtons.fire( - 'Cancelled', - 'Your imaginary file is safe :)', - 'error' - ) } - }); - } + }else if (result.dismiss === Swal.DismissReason.cancel) { + swalWithBootstrapButtons.fire( + 'Cancelled', + 'Your imaginary file is safe :)', + 'error' + ) + } + }); } function gadaiOptionButton(noic){ diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php index b164f5f..079ae0f 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -1,5 +1,7 @@ @extends('layouts.app') +@include('modal.editmarhun') + @section('content')
@@ -138,7 +140,7 @@ - Batal + Batal
@@ -228,6 +230,8 @@ - -@endsection diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 559e633..64c8e1c 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -39,12 +39,12 @@
- - - - - - + + + + + +
@@ -61,12 +61,6 @@ - - {{--
- - Sahkan - -
--}} @@ -75,9 +69,39 @@ + +@endsection diff --git a/resources/views/operasi/parameter.blade.php b/resources/views/operasi/parameter.blade.php new file mode 100644 index 0000000..2badab2 --- /dev/null +++ b/resources/views/operasi/parameter.blade.php @@ -0,0 +1,19 @@ +@extends('layouts.app_operasi') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+ +
+ Harga Emas + Contoh 1 + Contoh 2 +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 2756604..5537823 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -10,7 +10,6 @@

PENEBUSAN

- {{-- {{ dd($gadai) }} --}}
@@ -153,9 +152,21 @@
-
- +
+ +
+ +
+
+ PEMBIAYAAN ASAL(RM) +
+
+ +
+
+
+
@@ -181,7 +192,7 @@ BAYARAN PEMBIAYAAN(RM)
- +
@@ -192,11 +203,8 @@
- @php - $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm']; - - @endphp - + +
@@ -311,7 +319,15 @@ function tebusan() { if(tarikhgadai >= tarikhtawarruq) - { + { + let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}"; + + $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2)); + + + $('#divpembiayaanasal').hide(); + $('#divbakihargajualan').show(); + $('#divtelahdibayar').show(); //Upah Tawarruq $.ajax({ @@ -339,6 +355,13 @@ function tebusan() } else if(tarikhgadai < tarikhtawarruq) { + let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['pinjaman'] }}"; + + $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2)); + + $('#divpembiayaanasal').show(); + $('#divbakihargajualan').hide(); + $('#divtelahdibayar').hide(); //Upah Bukan Tawarruq $.ajax({ @@ -435,7 +458,6 @@ if(tarikhgadai >= tarikhtawarruq) "array_recno" : array_recno }, success:function(success){ - alert(success); let bayarz = $('#bayaran').val(Number(success.toFixed(2))); let bakihargajual = $('#bakihargajualan').val(); @@ -462,7 +484,6 @@ if(tarikhgadai >= tarikhtawarruq) } else if(tarikhgadai < tarikhtawarruq){ - alert('separuh belum tawarruq'); //Separuh Bayar Bukan Tawarruq $(document).on('click', '#checkmarhun', function(e) { @@ -521,7 +542,7 @@ if(tarikhgadai >= tarikhtawarruq) $('#bayaran').val(jumlahminima); - $('#bakipinjaman').val($('#pinjaman').val() - jumlahminima); + $('#bakipinjaman').val($('#pinjamanasal').val() - jumlahminima); $('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val())); jumlahperlu = Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()); @@ -626,6 +647,7 @@ $("#sltjenistebus").change(function(){ function bayarkey(e) { + if($('#sltjenistebus').find(":selected").val() == 'S') { let byr = $(e).val(); @@ -640,6 +662,32 @@ function bayarkey(e) } } +function bayartambahan(e) +{ + if($('#sltjenistebus').find(":selected").val() == 'A') + { + if(tarikhgadai < tarikhtawarruq) + { + + let byr = $(e).val(); + let total = 0; + let pdbyr = 0; + + if(byr == '') + { + $('#perludibayar').val($('#jumlahupah').val()); + } + else + { + pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val()); + + $('#perludibayar').val(pdbyr); + // $('#perludibayar').val(total); + } + + } + } +} function bayarpinjam(e) @@ -673,6 +721,15 @@ function bayaransemua() if($('#sltjenistebus').find(":selected").val() == 'T') { + let jenisbayarantebus = ''; + if(tarikhgadai < tarikhtawarruq) + { + jenisbayarantebus = "nottawarruq"; + } + else if (tarikhgadai >= tarikhtawarruq){ + jenisbayarantebus = "tawarruq"; + } + var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; @@ -706,7 +763,8 @@ function bayaransemua() "bakiupah" : bakiupah, "historygadaian" : historygadaian, "marhun" : marhun, - "nowakil" : nowakil + "nowakil" : nowakil, + "jenisbayarantebus" : jenisbayarantebus }, success:function(success_data){ Swal.fire({ @@ -729,6 +787,15 @@ function bayaransemua() } else if($('#sltjenistebus').find(":selected").val() == 'A') { + let jenisbayarantebus = ''; + if(tarikhgadai < tarikhtawarruq) + { + jenisbayarantebus = "nottawarruq"; + } + else if (tarikhgadai >= tarikhtawarruq){ + jenisbayarantebus = "tawarruq"; + } + if(tarikhgadai >= tarikhtawarruq) { var bayar = $('#bayaran').val(); @@ -753,25 +820,25 @@ function bayaransemua() } else if(tarikhgadai < tarikhtawarruq) { + // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())) + // { + // Swal.fire( + // 'Amaran!', + // 'Masukkan jumlah melebihi jumlah upah!', + // 'error' + // ) + // return false; + // } - if($('#bayaran').val() < $('#perludibayar').val()) - { - Swal.fire( - 'Amaran!', - 'Masukkan jumlah melebihi jumlah perlu dibayar!', - 'error' - ) - return false; - } - - var lebihan = parseFloat($('#bayaran').val()) - parseFloat($('#perludibayar').val()); + var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val()); + var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }} "; var nilai_marhun = "{{ $gadai['nilaimarhun']}}"; - var pinjaman = parseFloat("{{ $gadai['pinjaman']}}") - lebihan; + var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val()); var ansuran = $('#bayaran').val(); var addpinjaman = $('#bayaran').val(); var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val()); @@ -816,7 +883,9 @@ function bayaransemua() "kadarkeuntungan" : kadarupahbaru, "keuntungan_6bln" : keuntungan_6bln, "keuntungan_sebulan" : keuntungan_sebulan, - "kuantiti_marhun" : kuantiti_marhun + "kuantiti_marhun" : kuantiti_marhun, + "lebihan" : lebihan, + "jenisbayarantebus" : jenisbayarantebus }, success:function(success_data){ @@ -825,7 +894,7 @@ function bayaransemua() 'You clicked the button!', 'success' ).then(function() { - window.location.replace("{{ url()->previous() }}"); + window.location.replace("{{ url('customer_info') }}"); }) },error: function (request, status, error) { console.log(request.responseText); @@ -840,6 +909,15 @@ function bayaransemua() } else if($('#sltjenistebus').find(":selected").val() == 'S') { + let jenisbayarantebus = ''; + if(tarikhgadai < tarikhtawarruq) + { + jenisbayarantebus = "nottawarruq"; + } + else if (tarikhgadai >= tarikhtawarruq){ + jenisbayarantebus = "tawarruq"; + } + if($('#perludibayar').val() < $('#bayaran').val()) { Swal.fire( @@ -850,11 +928,27 @@ function bayaransemua() return false; } + //checked box + var checkboxes = document.querySelectorAll('input[type="checkbox"]'); + var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked); + + console.log(checkboxes.length); + if (checkedOne == false) { + Swal.fire( + 'Amaran!', + 'Sila tick salah satu marhun!', + 'error' + ) + return false; + } + + var sumnilaimarhun = 0; var sumberat = 0; var marhun = "{{ $gadai['marhun'] }}"; var test = marhun.split(","); + // var marhunlama = marhun.split(","); $.each( array_nm, function( index, value ) { sumnilaimarhun += parseFloat(value); @@ -877,13 +971,25 @@ function bayaransemua() return false; } + // else + // { + // console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]); + // marhunlama.splice(index,1); + // } } }); + var marhun_baru = test.join(", "); + // var marhun_lama = marhunlama.join(", "); + // console.table(marhun_baru); + // console.table(marhun_lama); + + // return; + $.each( array_berat, function( index, value ) { sumberat += parseFloat(value); }); @@ -910,6 +1016,7 @@ function bayaransemua() var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length; var nowakil = nw; + console.log("Pinjaman Baru Sekali Lagi: " + pinjamanbaru); // console.log('lebihan : ' + lebihan + ' '); console.log("No Pelanggan:" + nopelanggan + " " + "jenistebus:" + jenistebus + " " + "jbg:" + jbg + " " + "kadarupah:" + kadarupah + " "); @@ -951,6 +1058,7 @@ function bayaransemua() "marhun" : marhun, "nowakil" : nowakil, "arrayrecno" : array_recno, + "jenisbayarantebus" : jenisbayarantebus, //yang baru @@ -993,6 +1101,25 @@ function bayaransemua() } else if($('#sltjenistebus').find(":selected").val() == 'P') { + let jenisbayarantebus = ''; + if(tarikhgadai < tarikhtawarruq) + { + jenisbayarantebus = "nottawarruq"; + } + else if (tarikhgadai >= tarikhtawarruq){ + jenisbayarantebus = "tawarruq"; + } + + + if(parseFloat($('#basic-addon2').text()) > 70) + { + Swal.fire( + 'Amaran!', + 'Pinjaman Haruslah Dalam Lingkungan 70%!', + 'error' + ) + return false; + } var nopelanggan = "{{ $gadai['nopelanggan'] }}"; @@ -1064,7 +1191,8 @@ function bayaransemua() "keuntungan_6bln" : keuntungan_6bln, "keuntungan_sebulan" : keuntungan_sebulan, "noic" : noic, - "norujukan" : norujukan + "norujukan" : norujukan, + "jenisbayarantebus" : jenisbayarantebus }, success:function(success_data){ diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php index 17b698e..e5b2584 100644 --- a/resources/views/print/resitansuran.blade.php +++ b/resources/views/print/resitansuran.blade.php @@ -396,25 +396,25 @@ hr.new5 {
- + - + - + - + - +
Marhun : {{ $gadai['marhun'] }} No SAG {{ $transaction['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG {{ $transaction['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }}
Nama Wakil : Nama Wakil :
No K/P Wakil : No K/P Wakil :

@@ -492,25 +492,25 @@ hr.new5 { - + - + - + - + - +
Marhun : {{ $gadai['marhun'] }} No SAG {{ $transaction['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG {{ $transaction['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp Nama : {{ $customers_info['nama'] }} Tarikh Bayar @php $time = new DateTime($transaction['created_at']); $date = $time->format('n/j/Y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }}
Nama Wakil : Nama Wakil :
No K/P Wakil : No K/P Wakil :

diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php index e6437e5..78a4056 100644 --- a/resources/views/print/resittebus.blade.php +++ b/resources/views/print/resittebus.blade.php @@ -397,22 +397,22 @@ hr.new5 { - + - + - + - + - +
Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }} Marhun : {{ $gadai['marhun'] }} No SAG {{ $gadai['norujukan'] }}
Nama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphpNama : {{ $customers_info['nama'] }} Tarikh Bayar@php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('n/j/Y'); echo $date; @endphp
No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }} No K/P : {{ $customers_info['kpbaru'] }} Tempoh Simpan {{ $gadai['tempoh'] }}
Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp
No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp

@@ -427,7 +427,7 @@ hr.new5 { Harga Jualan RM {{ number_format(($gadai['hargajualan']),2) }} -(-) Bayaran Pelanggan RM {{ number_format($penebusan['BakiPjm'],2) }} +(-) Bayaran Pelanggan RM {{ number_format($totaltransaction,2) }} Baki Harga Jualan RM {{ number_format($gadai['bakihargajualan'],2) }} @@ -529,7 +529,7 @@ hr.new5 { Harga Jualan RM {{ number_format(($gadai['hargajualan']),2) }} -(-) Bayaran Pelanggan RM {{ number_format($penebusan['BakiPjm'],2) }} +(-) Bayaran Pelanggan RM {{ number_format($totaltransaction,2) }} Baki Harga Jualan RM {{ number_format($gadai['bakihargajualan'],2) }} diff --git a/routes/web.php b/routes/web.php index d0ab510..054bf1e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -79,7 +79,7 @@ Route::get('/history',['as'=>'gadai.history','uses'=>'GadaianController@history' //MAINTENANCE Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller'); Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); -Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller'); +Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller'); //Penilai Route::get('/gadaiansemasa',['as'=>'gadaian.semasa','uses'=>'GadaianController@gadaiansemasa'])->middleware('auth','penilai'); @@ -115,7 +115,6 @@ Route::post('/kemaskiniserahan',['as'=>'khazanah.KemaskiniSerahan','uses'=>'Khaz Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahController@kakitangan'])->middleware('auth','khazanah'); Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah'); Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah'); -Route::get('/hargaemas',['as'=>'khazanah.hargaemas','uses'=>'KhazanahController@hargaemas'])->middleware('auth','khazanah'); Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah'); Route::get('/pelangganan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); Route::get('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah'); @@ -123,10 +122,11 @@ Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller'); Route::post('/createkelulusan',['as'=>'khazanah.createkelulusan','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller'); Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'KhazanahController@updatekelulusan'])->middleware('auth','khazanah'); -Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller'); +Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah'); Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller'); Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller'); Route::put('/gadai/edit/deletemarhun',['as'=>'gadai.editmarhun','uses'=>'GadaianController@editmarhun'])->middleware('auth','teller'); +Route::put('/gadai/edit/editmarhun',['as'=>'gadai.ubahmarhun','uses'=>'GadaianController@ubahmarhun'])->middleware('auth','teller'); //Laporan Baru Route::get('/laporan/lelongan',['as'=>'laporan.lelongan','uses'=>'KhazanahController@laporanLelongan'])->middleware('auth','khazanah'); @@ -162,3 +162,7 @@ Route::get('/operasi/getkelulusan',['as'=>'operasi.getkelulusan','uses'=>'Operas Route::put('/operasi/updatekelulusan',['as'=>'operasi.updatekelulusan','uses'=>'OperasiController@updatekelulusan'])->middleware('auth','operasi'); Route::get('/daftar/kakitangan',['as'=>'daftar.kakitangan','uses'=>'KakitanganController@daftarKakitangan'])->middleware('auth','operasi'); Route::post('/daftar/kakitangan/baru',['as'=>'kakitangan.baru','uses'=>'KakitanganController@registerStaff'])->middleware('auth','operasi'); +Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter')->middleware('auth','operasi'); +Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi'); +Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi'); +Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');