KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update komuditi

Browse Source
This commit is contained in:
afiq
2021-02-08 12:06:43 +08:00
parent cc8c2bdd1b
commit 4a89aa13d3
5 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+9 -2
View File
@@ -189,12 +189,14 @@ class GadaianController extends Controller
$total_nilai_marhun = $request->total_nilai_marhun; $total_nilai_marhun = $request->total_nilai_marhun;
$total_nilai_marhun = str_replace(',','',$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; $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
// dd($margin_pinjaman); // dd($margin_pinjaman);
$kadarupah = $request->kadarkeuntungan * 100; $kadarupah = $request->kadarkeuntungan * 100;
$keuntungan6bulan = $request->keuntungan_6bln; $keuntungan6bulan = $keuntungan_sebln * 6;
$keuntungan12bulan = $request->keuntungan_sebulan*12; $keuntungan12bulan = $keuntungan_sebln * 12;
$hargajualan = $request->pinjaman + $keuntungan12bulan; $hargajualan = $request->pinjaman + $keuntungan12bulan;
$gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[ $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[
'kodcaw' => $auth_user['cawangan'], 'kodcaw' => $auth_user['cawangan'],
@@ -210,6 +212,11 @@ class GadaianController extends Controller
'hargajualan' => $hargajualan, 'hargajualan' => $hargajualan,
'kuantiti_marhun' => $request->kuantiti_marhun 'kuantiti_marhun' => $request->kuantiti_marhun
])->json(); ])->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('page_reload');
$request->session()->forget('norujukan'); $request->session()->forget('norujukan');
return redirect()->route('customer_info'); return redirect()->route('customer_info');
resources/views/customers/info.blade.php
+21 -14
View File
@@ -424,7 +424,7 @@
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>', '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>', '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'], gadai_detail['t_gadai'],
gadai_detail['t_matang'], gadai_detail['t_matang1'],
'RM '+ formatter.format(gadai_detail['nilaimarhun']), 'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'RM '+formatter.format(gadai_detail['pinjaman']), 'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
@@ -437,7 +437,7 @@
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>', '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
gadai_detail['norujukan'], gadai_detail['norujukan'],
gadai_detail['t_gadai'], gadai_detail['t_gadai'],
gadai_detail['t_matang'], gadai_detail['t_matang1'],
'RM '+ formatter.format(gadai_detail['nilaimarhun']), 'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'RM '+formatter.format(gadai_detail['pinjaman']), 'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
@@ -450,7 +450,7 @@
counter, counter,
gadai_detail['norujukan'], gadai_detail['norujukan'],
gadai_detail['t_gadai'], gadai_detail['t_gadai'],
gadai_detail['t_matang'], gadai_detail['t_matang1'],
'RM '+ formatter.format(gadai_detail['nilaimarhun']), 'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'RM '+formatter.format(gadai_detail['pinjaman']), 'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((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 hapusid = $('input[name="belum"]:checked').val();
let hapusidsudah = $('input[name="sudahtebus"]:checked').val(); let hapusidsudah = $('input[name="sudahtebus"]:checked').val();
let harini = new Date();harini.setHours(0, 0, 0, 0); let harini = new Date();harini.setHours(0, 0, 0, 0);
console.log(hapusid);
if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
Swal.fire({ Swal.fire({
icon: 'error', icon: 'error',
@@ -829,7 +829,6 @@
"norujukan" : id "norujukan" : id
}, },
success:function(data){ success:function(data){
console.log(data);
if(data != 0){ if(data != 0){
console.log('berjaya'); console.log('berjaya');
clearInterval(timerInterval); clearInterval(timerInterval);
@@ -842,15 +841,23 @@
method:'put', method:'put',
url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid, url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid,
success:function(data){ success:function(data){
console.log(data); $.ajax({
swalWithBootstrapButtons.fire( method:'put',
'Hapus!', url: api_url + '/api/komuditi/batal',
'Data pelanggan telah dihapuskan.', dataType:'json',
'success' data:{
).then(function () { norujukan: hapusid
location.reload(); },
}); success:function(batalkomuditi){
swalWithBootstrapButtons.fire(
'Hapus!',
'Data pelanggan telah dihapuskan.',
'success'
).then(function(){
location.reload();
});
}
})
},error: function(xhr, status, error) { },error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")"); var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText); alert(xhr.responseText);
resources/views/khazanah/kelulusan.blade.php
+4 -9
View File
@@ -82,8 +82,6 @@
{ {
let norujukan = $(e).data('norujukan'); let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus'); let pelulus = $(e).data('pelulus');
alert(pelulus);
$.ajax({ $.ajax({
method:'put', method:'put',
url: "{{ route('khazanah.updatekelulusan') }}", url: "{{ route('khazanah.updatekelulusan') }}",
@@ -103,8 +101,8 @@
}); });
},error: function(xhr, status, error) { },error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")"); var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText); alert(xhr.responseText);
} }
}); });
} }
@@ -113,9 +111,6 @@
{ {
let norujukan = $(e).data('norujukan'); let norujukan = $(e).data('norujukan');
let namakhazanah = "{{ $auth_user = Auth::user()->name }}"; let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
alert(namakhazanah);
$.ajax({ $.ajax({
method:'put', method:'put',
url: "{{ route('khazanah.updatekelulusan') }}", url: "{{ route('khazanah.updatekelulusan') }}",
@@ -134,8 +129,8 @@
}); });
},error: function(xhr, status, error) { },error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")"); var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText); alert(xhr.responseText);
} }
}); });
} }
resources/views/operasi/kelulusan.blade.php
+2 -4
View File
@@ -74,8 +74,6 @@
let norujukan = $(e).data('norujukan'); let norujukan = $(e).data('norujukan');
let cawangankod = $(e).data('kodcaw'); let cawangankod = $(e).data('kodcaw');
alert(cawangankod);
$.ajax({ $.ajax({
method:'put', method:'put',
url: "{{ route('operasi.updatekelulusan') }}", url: "{{ route('operasi.updatekelulusan') }}",
@@ -94,8 +92,8 @@
}); });
},error: function(xhr, status, error) { },error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")"); var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText); alert(xhr.responseText);
} }
}); });
} }
resources/views/operasi/komuditi/index.blade.php
+15 -3
View File
@@ -6,14 +6,13 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="card"> <div class="card">
<div class="card-header">{{ __('Komuditi') }}</div> <div class="card-header">{{ __('Komuditi') }}</div>
<div class="card-body text-center"> <div class="card-body text-center">
<div class="row"> <div class="row">
<div class="col-2 justify-content-start"> <div class="col-2 justify-content-start">
<a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a> <a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
</div> </div>
</div> </div>
<div class="row form-group justify-content-start"> <div class="row form-group justify-content-start" id="maklumat_komuditi">
<div class="col-md-4"> <div class="col-md-4">
<div class="row form-group"> <div class="row form-group">
<div class="col-md-4">No Sijil : </div> <div class="col-md-4">No Sijil : </div>
@@ -39,7 +38,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row justify-content-center" id="tiada_komuditi">
<div class="col-12">
<p>Tiada Komuditi</p>
</div>
</div>
<div class="row form-group justify-content-center"> <div class="row form-group justify-content-center">
<input type="hidden" value="{{ $user_name }}" id="user_name" name="user_name"> <input type="hidden" value="{{ $user_name }}" id="user_name" name="user_name">
<button class="btn btn-primary" id="pembelian">Pembelian Komuditi</button> <button class="btn btn-primary" id="pembelian">Pembelian Komuditi</button>
@@ -152,6 +155,15 @@
'kodproduk': kodproduk 'kodproduk': kodproduk
}, },
success:function(description){ 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']) $('#nosijil_span').text(data['no_sijil'])
$('#harga_span').text('RM ' + formatter.format(data['nilai'])) $('#harga_span').text('RM ' + formatter.format(data['nilai']))
$('#produk_span').text(description['kodproduk'] + ' / ' + description['description']) $('#produk_span').text(description['kodproduk'] + ' / ' + description['description'])