From 11b9a37928c459c95491122b7ac38f9885d57b2e Mon Sep 17 00:00:00 2001 From: afiq Date: Wed, 17 Feb 2021 21:34:21 +0800 Subject: [PATCH] edit marhun --- app/Http/Controllers/GadaianController.php | 8 +- resources/views/gadaian/edit.blade.php | 105 +++++++++++++++--- resources/views/gadaian/index.blade.php | 114 ++++++++++++++++---- resources/views/modal/editmarhun.blade.php | 74 +++++++------ resources/views/operasi/hargaemas.blade.php | 106 +++++++++++------- 5 files changed, 297 insertions(+), 110 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 4eba117..08a1140 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -127,9 +127,8 @@ class GadaianController extends Controller } public function ubahmarhun(Request $request){ - + dd($request); $api_url = config('api.url'); - $auth_user = Auth::user(); $gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukedit,[ @@ -137,8 +136,9 @@ class GadaianController extends Controller 'karat' => $request->sltkarat, 'berat' => $request->berat, 'harga' => $request->harga1, - 'n_marhun' => $request->nilaimarhun - + 'n_marhun' => $request->nilaimarhun, + 'marhun' => $request->marhun_edit, + 'nota' => $request->nota_edit ])->json(); return redirect()->back(); diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php index bdf7a49..6debb91 100644 --- a/resources/views/gadaian/edit.blade.php +++ b/resources/views/gadaian/edit.blade.php @@ -337,6 +337,14 @@ closeOnSelect: false }); + $(".select2_nota").select2({ + dropdownParent: $('#editMarhunModal'), + tags: true, + tokenSeparators: [',', ' '], + allowClear: true, + closeOnSelect: false + }); + var total_nilai_marhun = 0; var total_berat = 0; var kadarupah = 0; @@ -443,39 +451,110 @@ } 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 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]; + let nota = recno[6]; + let jenismarhun = recno[2]; + var res = nota.split(","); + + $.ajax({ + method:'GET', + url: api_url + '/api/jemas', + success:function(data){ + $.each(data,function(index,jemas){ + $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun'])); + }) + } + }); + + $('#nota_edit').val(res).trigger('change'); $('#sltkarat').val(karat); - $('#berat').val(berat); - $('#nilaimarhun').val(nm.substring(2)); - $('#harga1').val(harga); + $('#marhun_edit').val(jenismarhun); + $('#berat_edit').val(berat); + $('#nilaimarhun_edit').val(nm); + $('#harga_edit').val(harga); $('#norujukedit').val(norujuk); - $('#recno').val(recno[1]); + $('#recnoedit').val(recno[1]); $('#editMarhunModal').modal(); } $("#sltkarat").change(function(e){ - let hargaref = $(this).find(':selected').data('harga'); - let ber = parseFloat($('#berat').val()); + let ber = parseFloat($('#berat_edit').val()); let total = ber * hargaref; - // $('#berat').attr('readonly', false); - $('#nilaimarhun').val(total.toFixed(2)); - $('#harga1').val(hargaref); + $('#nilaimarhun_edit').val(formatter.format(total)); + $('#harga_edit').val(hargaref); }); function calculationharga(e){ let berat = $(e).val(); let total = 0; - let harga = $('#harga1').val(); + let harga = $('#harga_edit').val(); total = berat * harga; - $('#nilaimarhun').val(total.toFixed(2)); + $('#nilaimarhun_edit').val(formatter.format(total)); } + $('#terima_edit').on('click',function(){ + var nota_edit = $('#nota_edit').val(); + var norujukedit = $('#norujukedit').val(); + var recnoedit = $('#recnoedit').val(); + var marhun_edit = $('#marhun_edit').val(); + var sltkarat = $('#sltkarat').val(); + var berat_edit = $('#berat_edit').val(); + var harga_edit = $('#harga_edit').val(); + var nilaimarhun_edit = $('#nilaimarhun_edit').val(); + var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,"")); + + if(nota_edit != null){ + var nota = nota_edit.toString(); + }else{ + var nota = ''; + } + + if($.isNumeric(berat_edit) == false){ + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Sila Masukkan Berat Marhun' + }); + event.preventDefault(); + return false; + }else{ + $.ajax({ + method:'put', + url: api_url + '/api/gadai/ubah/marhun/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + norujukedit, + datatype:'json', + data:{ + 'recno' : recnoedit, + 'karat' : sltkarat, + 'berat' : berat_edit, + 'harga' : harga_edit, + 'n_marhun' : nilai_marhun_edit, + 'marhun' : marhun_edit, + 'nota' : nota + }, + success:function(data){ + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Ubah Marhun Berjaya' + }); + getMarhun(norujukedit); + $('#editMarhunModal').modal('hide'); + } + }) + } + + }); + $('#pinjaman').on('input',function(){ var pinjaman = Number(this.value); var nilaimarhun = Number($('#jumlah_nilai_marhun').val()); diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 82c667a..6358c0a 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -158,15 +158,15 @@
-
- - +
+ +
Karat
@@ -314,6 +314,14 @@ closeOnSelect: false }); + $(".select2_nota").select2({ + dropdownParent: $('#editMarhunModal'), + tags: true, + tokenSeparators: [',', ' '], + allowClear: true, + closeOnSelect: false + }); + var total_nilai_marhun = 0; var total_berat = 0; var kadarupah = 0; @@ -519,7 +527,7 @@ var bilangan_marhun_daftar = Number($('#bilangan_marhun').val()); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nota_array = $('#nota').val(); - console.log($.isNumeric(berat_emas)); + if(nota_array != null){ var nota = nota_array.toString(); }else{ @@ -985,34 +993,100 @@ let karat = recno[4]; let berat = recno[5]; let harga = recno[7]; + let nota = recno[6]; + let jenismarhun = recno[2]; + var res = nota.split(","); + $.ajax({ + method:'GET', + url: api_url + '/api/jemas', + success:function(data){ + $.each(data,function(index,jemas){ + $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun'])); + }) + } + }); + $('#nota_edit').val(res).trigger('change'); $('#sltkarat').val(karat); - $('#berat').val(berat); - $('#nilaimarhun').val(nm); - $('#harga1').val(harga); + $('#marhun_edit').val(jenismarhun); + $('#berat_edit').val(berat); + $('#nilaimarhun_edit').val(nm); + $('#harga_edit').val(harga); $('#norujukedit').val(norujuk); - $('#recno').val(recno[1]); + $('#recnoedit').val(recno[1]); $('#editMarhunModal').modal(); } + $('#terima_edit').on('click',function(){ + var nota_edit = $('#nota_edit').val(); + var norujukedit = $('#norujukedit').val(); + var recnoedit = $('#recnoedit').val(); + var marhun_edit = $('#marhun_edit').val(); + var sltkarat = $('#sltkarat').val(); + var berat_edit = $('#berat_edit').val(); + var harga_edit = $('#harga_edit').val(); + var nilaimarhun_edit = $('#nilaimarhun_edit').val(); + var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,"")); + + if(nota_edit != null){ + var nota = nota_edit.toString(); + }else{ + var nota = ''; + } + + if($.isNumeric(berat_edit) == false){ + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Sila Masukkan Berat Marhun' + }); + event.preventDefault(); + return false; + }else{ + $.ajax({ + method:'put', + url: api_url + '/api/gadai/ubah/marhun/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + norujukedit, + datatype:'json', + data:{ + 'recno' : recnoedit, + 'karat' : sltkarat, + 'berat' : berat_edit, + 'harga' : harga_edit, + 'n_marhun' : nilai_marhun_edit, + 'marhun' : marhun_edit, + 'nota' : nota + }, + success:function(data){ + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Ubah Marhun Berjaya' + }); + getMarhun(norujukedit); + $('#editMarhunModal').modal('hide'); + } + }) + } + + }); + $("#sltkarat").change(function(e){ let hargaref = $(this).find(':selected').data('harga'); - let ber = parseFloat($('#berat').val()); + let ber = parseFloat($('#berat_edit').val()); let total = ber * hargaref; - $('#nilaimarhun').val(total.toFixed(2)); - $('#harga1').val(hargaref); + $('#nilaimarhun_edit').val(formatter.format(total)); + $('#harga_edit').val(hargaref); }); function calculationharga(e){ let berat = $(e).val(); let total = 0; - let harga = $('#harga1').val(); + let harga = $('#harga_edit').val(); total = berat * harga; - $('#nilaimarhun').val(total.toFixed(2)); - + $('#nilaimarhun_edit').val(formatter.format(total)); } diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php index daafd11..27ecfe7 100644 --- a/resources/views/modal/editmarhun.blade.php +++ b/resources/views/modal/editmarhun.blade.php @@ -14,48 +14,54 @@
- diff --git a/resources/views/operasi/hargaemas.blade.php b/resources/views/operasi/hargaemas.blade.php index bb08476..a82b013 100644 --- a/resources/views/operasi/hargaemas.blade.php +++ b/resources/views/operasi/hargaemas.blade.php @@ -36,6 +36,7 @@ {{ $he['tarikhupdate'] }} + @endforeach @@ -54,6 +55,38 @@ + @endsection