diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index c2ec905..0855fe6 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -189,12 +189,14 @@ class GadaianController extends Controller $total_nilai_marhun = $request->total_nilai_marhun; $total_nilai_marhun = str_replace(',','',$total_nilai_marhun); + $keuntungan_sebln = $request->keuntungan_sebulan; + $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); $margin_pinjaman = $request->pinjaman / $total_nilai_marhun; // dd($margin_pinjaman); $kadarupah = $request->kadarkeuntungan * 100; - $keuntungan6bulan = $request->keuntungan_6bln; - $keuntungan12bulan = $request->keuntungan_sebulan*12; + $keuntungan6bulan = $keuntungan_sebln * 6; + $keuntungan12bulan = $keuntungan_sebln * 12; $hargajualan = $request->pinjaman + $keuntungan12bulan; $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[ 'kodcaw' => $auth_user['cawangan'], @@ -210,6 +212,11 @@ class GadaianController extends Controller 'hargajualan' => $hargajualan, 'kuantiti_marhun' => $request->kuantiti_marhun ])->json(); + $update_komuditi = Http::put(config('api.url').'/api/komuditi/update',[ + 'unit_komuditi' => round($request->pinjaman, 2), + 'norujukan' => $request->norujukan_gadai + ])->json(); + $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); return redirect()->route('customer_info'); diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index d51700a..f8d00fc 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -424,7 +424,7 @@ '', '' + gadai_detail['norujukan'] + '', gadai_detail['t_gadai'], - gadai_detail['t_matang'], + gadai_detail['t_matang1'], '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") + '%', @@ -437,7 +437,7 @@ '', gadai_detail['norujukan'], gadai_detail['t_gadai'], - gadai_detail['t_matang'], + gadai_detail['t_matang1'], '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") + '%', @@ -450,7 +450,7 @@ counter, gadai_detail['norujukan'], gadai_detail['t_gadai'], - gadai_detail['t_matang'], + gadai_detail['t_matang1'], '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") + '%', @@ -719,7 +719,7 @@ let hapusid = $('input[name="belum"]:checked').val(); let hapusidsudah = $('input[name="sudahtebus"]:checked').val(); let harini = new Date();harini.setHours(0, 0, 0, 0); - + console.log(hapusid); if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ Swal.fire({ icon: 'error', @@ -829,7 +829,6 @@ "norujukan" : id }, success:function(data){ - console.log(data); if(data != 0){ console.log('berjaya'); clearInterval(timerInterval); @@ -842,15 +841,23 @@ method:'put', url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid, success:function(data){ - console.log(data); - swalWithBootstrapButtons.fire( - 'Hapus!', - 'Data pelanggan telah dihapuskan.', - 'success' - ).then(function () { - location.reload(); - }); - + $.ajax({ + method:'put', + url: api_url + '/api/komuditi/batal', + dataType:'json', + data:{ + norujukan: hapusid + }, + success:function(batalkomuditi){ + swalWithBootstrapButtons.fire( + 'Hapus!', + 'Data pelanggan telah dihapuskan.', + 'success' + ).then(function(){ + location.reload(); + }); + } + }) },error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 5611641..05b2950 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -82,8 +82,6 @@ { let norujukan = $(e).data('norujukan'); let pelulus = $(e).data('pelulus'); - - alert(pelulus); $.ajax({ method:'put', url: "{{ route('khazanah.updatekelulusan') }}", @@ -103,8 +101,8 @@ }); },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); } }); } @@ -113,9 +111,6 @@ { let norujukan = $(e).data('norujukan'); let namakhazanah = "{{ $auth_user = Auth::user()->name }}"; - - alert(namakhazanah); - $.ajax({ method:'put', url: "{{ route('khazanah.updatekelulusan') }}", @@ -134,8 +129,8 @@ }); },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); } }); } diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 5a104fa..e99ac08 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -74,8 +74,6 @@ let norujukan = $(e).data('norujukan'); let cawangankod = $(e).data('kodcaw'); - alert(cawangankod); - $.ajax({ method:'put', url: "{{ route('operasi.updatekelulusan') }}", @@ -94,8 +92,8 @@ }); },error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); } }); } diff --git a/resources/views/operasi/komuditi/index.blade.php b/resources/views/operasi/komuditi/index.blade.php index bdce701..8de1462 100644 --- a/resources/views/operasi/komuditi/index.blade.php +++ b/resources/views/operasi/komuditi/index.blade.php @@ -6,14 +6,13 @@
{{ __('Komuditi') }}
-
-
+
No Sijil :
@@ -39,7 +38,11 @@
- +
+
+

Tiada Komuditi

+
+
@@ -152,6 +155,15 @@ 'kodproduk': kodproduk }, success:function(description){ + var komuditi_semasa = Object.keys(description).length + console.log(komuditi_semasa); + if(komuditi_semasa == 0){ + $('#maklumat_komuditi').hide(); + $('#tiada_komuditi').show(); + }else{ + $('#maklumat_komuditi').show(); + $('#tiada_komuditi').hide(); + } $('#nosijil_span').text(data['no_sijil']) $('#harga_span').text('RM ' + formatter.format(data['nilai'])) $('#produk_span').text(description['kodproduk'] + ' / ' + description['description'])