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

fixing deletependser and mohon

Browse Source
This commit is contained in:
hafifierahman
2021-10-02 09:54:31 +08:00
parent 2e41e124e4
commit 0ed748a0cc
13 changed files with 421 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+4 -3
View File
@@ -727,11 +727,12 @@ class GadaianController extends Controller
$berat = ($gadai_info[0][0]['berat']) ? $gadai_info[0][0]['berat'] : '-';
$percentpinj = ($gadai_info[0][0]['percentpinj']) ? $gadai_info[0][0]['percentpinj'] : '-';
$message = $pinjaman . '|' . $nilaimarhun . '|' . $berat . '|' . $percentpinj . '|';
$createlulus = Http::post(config('api.url') . '/api/CreateLulus/' . $auth_user['cawangan'] . '/' . $norujukan, [
'mohon' => $request->mohon,
'message' => $message,
'pinjaman' => $pinjaman,
'nilaimarhun' => $nilaimarhun,
'berat' => $berat,
'margin' => $percentpinj,
'teller' => $auth_user['name']
])->json();
app/Http/Controllers/KhazanahController.php
+140 -37
View File
@@ -469,33 +469,7 @@ class KhazanahController extends Controller
$kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $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'],'siri' => $k['siri'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]);
}
foreach($kelulusanmohonid as $index=>$km)
{
$komen = explode("|",$km['katalaluan']);
$results=array_search("",$komen,true);
if($results !== false) {
unset($komen[$results]);
}
array_push($arraykelulusanmohonid,['norujukan' => $km['norujukan'], 'teller' => $km['teller'], 'mohon' => $km['mohon'], 'pinjaman' => ($komen[0] ?? '-'), 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'), 'margin' => ($komen[3] ?? '-')]);
}
return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','arraykelulusanmohonid'));
return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan','kelulusanmohonid'));
}
@@ -586,6 +560,7 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pembatalan" => $request->batal,
"komen" => $request->komenubahhapus,
"khazanah" => $request->khazanah
])->json();
@@ -705,6 +680,10 @@ class KhazanahController extends Controller
'bilgadai' => 1,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'margin' => $request->margin,
'berat' => $request->berat,
'nilaimarhun' => $request->nilaimarhun,
'status' => $request->status,
'teller' => $request->teller,
'pelulus' => "khazanah"
])->json();
@@ -2271,14 +2250,14 @@ class KhazanahController extends Controller
$auth_user = Auth::user();
$gldetail = Http::post(config('api.url').'/api/gldetailkaunter/'. $auth_user['cawangan'],[
'amaun' => $request->amaun,
'jenisgldetail' => $request->jenisgldetail,
'keterangan' => $request->keterangan,
'kodcaw' => $request->kodcaw,
'teller' => $request->teller,
'dtacct' => $request->dtacct,
'ktacct' => $request->ktacct
])->json();
'amaun' => $request->amaun,
'jenisgldetail' => $request->jenisgldetail,
'keterangan' => $request->keterangan,
'kodcaw' => $request->kodcaw,
'teller' => $request->teller,
'dtacct' => $request->dtacct,
'ktacct' => $request->ktacct
])->json();
$amaun=$request->amaun;
@@ -2300,10 +2279,10 @@ class KhazanahController extends Controller
])->json();
}
return $this->denominasipendahuluanserahan($request);
return $this->denominasipendahuluanserahan($request,$gldetail);
}
public function denominasipendahuluanserahan($request)
public function denominasipendahuluanserahan($request,$gldetail)
{
$auth_user = Auth::user();
@@ -2419,12 +2398,136 @@ class KhazanahController extends Controller
]);
}
$denopendser = Http::post(config('api.url').'/api/requestdenopendser/'.$auth_user['cawangan'],[
'kodlaluan' => $auth_user['name'],
'amaun' => floatval($request->amaun),
'bd1' => 0,
'bd5' => 0,
'bd10' => 0,
'bd20' => 0,
'bd50' => 0,
'bd100' => 0,
'txtring1' => intval($request->ambilanring1),
'txtring5' => intval($request->ambilanring5),
'txtring10' => intval($request->ambilanring10),
'txtring20' => intval($request->ambilanring20),
'txtring50' => intval($request->ambilanring50),
'txtring100' => intval($request->ambilanring100),
'txtring1000' => 0,
'txtsen1' => intval($request->ambilansen1),
'txtsen5' => intval($request->ambilansen5),
'txtsen10' => intval($request->ambilansen10),
'txtsen20' => intval($request->ambilansen20),
'txtsen50' => intval($request->ambilansen50),
'jenis' => $request->jenisgldetail,
'recno' => intval($gldetail['id'])
]);
if($denominasiupdate)
return "LULUS";
else
return "GAGAL";
}
public function deletependahuluanserahan(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$denopendser = Http::get( config('api.url') .'/api/getdenopendser/'. $auth_user['cawangan'],['recno' => $request->recno])->json();
if(sizeof($denopendser) > 0)
$denopendser = $denopendser[0];
$denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
//bundle initialize
$rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20'];
$rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100'];
//wang Syilling Initialize
$rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10'];
$rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50'];
//Wang Ringgit Initialize
$rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10'];
$rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100'];
if($request->jenisserahan === 'pendahuluan')
{
//Tolok Rekod
$rekodsen1 -= intval($denopendser['txtsen1']);
$rekodsen5 -= intval($denopendser['txtsen5']);
$rekodsen10 -= intval($denopendser['txtsen10']);
$rekodsen20 -= intval($denopendser['txtsen20']);
$rekodsen50 -= intval($denopendser['txtsen50']);
$rekodring1 -= intval($denopendser['txtring1']);
$rekodring5 -= intval($denopendser['txtring5']);
$rekodring10 -= intval($denopendser['txtring10']);
$rekodring20 -= intval($denopendser['txtring20']);
$rekodring50 -= intval($denopendser['txtring50']);
$rekodring100 -= intval($denopendser['txtring100']);
}else{
//Tolok Rekod
$rekodsen1 += intval($denopendser['txtsen1']);
$rekodsen5 += intval($denopendser['txtsen5']);
$rekodsen10 += intval($denopendser['txtsen10']);
$rekodsen20 += intval($denopendser['txtsen20']);
$rekodsen50 += intval($denopendser['txtsen50']);
$rekodring1 += intval($denopendser['txtring1']);
$rekodring5 += intval($denopendser['txtring5']);
$rekodring10 += intval($denopendser['txtring10']);
$rekodring20 += intval($denopendser['txtring20']);
$rekodring50 += intval($denopendser['txtring50']);
$rekodring100 += intval($denopendser['txtring100']);
}
$denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[
'bd1' => $rekodb1,
'bd5'=> $rekodb5,
'bd10'=> $rekodb10,
'bd20'=> $rekodb20,
'bd50'=> $rekodb50,
'bd100'=> $rekodb100,
'txtring1'=> $rekodring1,
'txtring5'=> $rekodring5,
'txtsen1'=> $rekodsen1,
'txtsen5'=> $rekodsen5,
'txtsen10'=> $rekodsen10,
'txtsen20'=> $rekodsen20,
'txtsen50'=> $rekodsen50,
'txtring10'=> $rekodring10,
'txtring20'=> $rekodring20,
'txtring50'=> $rekodring50,
'txtring100'=> $rekodring100,
'txtring1000'=> "0",
'jumlahbundle'=> "0",
'txtjumlah'=> "0",
'jumlahkeping' => "0"
]);
$deletependser = Http::post(config('api.url') . '/api/DeletePendSer/'. $auth_user['cawangan'],[
'recno' => $request->recno
])->json();
$updateVault = Http::put( config('api.url').'/api/UpdateVault/PendahuluanSerahan/'.$auth_user['cawangan']);
$upVault = $updateVault->getStatusCode();
$upDeno = $denominasicreate->getStatusCode();
if($upVault == 200 && $upDeno == 200)
{
return 'berjaya';
}else{
return 'gagal';
}
}
app/Http/Controllers/OperasiController.php
+15 -8
View File
@@ -37,14 +37,7 @@ class OperasiController extends Controller
{
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'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $kel['pelulus']]);
array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($kel['nilaimarhun'] ?? '-'), 'berat' => ($kel['berat'] ?? '-'),'margin' => ($kel['margin'] ?? '-'), 'status' => ($kel['status'] ?? '-'), 'pelulus' => $kel['pelulus']]);
}
}
@@ -86,6 +79,11 @@ class OperasiController extends Controller
if($request->pembatalan == null)
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
@@ -99,6 +97,11 @@ class OperasiController extends Controller
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $request->kodcaw . '/' . $norujukan,[
"komen" => $request->komenkelulusan,
'siri' => $request->siri
])->json();
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
@@ -143,6 +146,10 @@ class OperasiController extends Controller
'dategadai' => $current->toDateString(),
'bilgadai' => 1,
'siri' => $siri,
'margin' => $request->margin,
'berat' => $request->berat,
'nilaimarhun' => $request->nilaimarhun,
'status' => $request->status,
'jumpinjam' => $request->jumpinjam,
'jenistebus' => "G",
'teller' => $request->teller,
resources/views/customers/info.blade.php
+5 -1
View File
@@ -562,7 +562,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : '0.00',
"teller" : teller
},
resources/views/gadaian/edit.blade.php
+19 -8
View File
@@ -358,6 +358,8 @@
var kadarupah = 0;
var jumlah_marhun = 0;
var jumlah_nilai_marhun = 0;
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
function marhuntable(data){
var counter = 1;
var count = 0;
@@ -419,8 +421,7 @@
method:'GET',
url: api_url + '/api/maxpinjaman',
success:function(data){
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
pinjaman_teller = Number(pinjaman['max']);
@@ -863,7 +864,7 @@
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
}
if(pinjaman >= 10000){
var errortext = "Pinjaman Melebihi 10000";
var errortext = "Pinjaman Melebihi 10,000";
}
swalWithBootstrapButtons.fire({
@@ -879,7 +880,8 @@
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 komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|";
let status = errortext;
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -902,7 +904,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
@@ -974,7 +980,7 @@
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
text: "Tetapan margin melebihi 70% untuk Khazanah!",
text: "Tetapan margin melebihi" + pinjaman_teller + "% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
@@ -985,7 +991,8 @@
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 komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|";
let status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -1008,7 +1015,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
resources/views/gadaian/index.blade.php
+17 -9
View File
@@ -347,6 +347,8 @@
var kadarupah = 0;
var jumlah_marhun = 0;
var jumlah_nilai_marhun = 0;
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
function marhuntable(data){
var counter = 1;
total_nilai_marhun = 0;
@@ -395,8 +397,6 @@
method:'GET',
url: api_url + '/api/maxpinjaman',
success:function(data){
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
pinjaman_teller = Number(pinjaman['max']);
@@ -779,10 +779,10 @@
});
if(pinjaman > Number(pembiyaan_max_pelulus)){
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
var errortext = "Tetapan margin melebihi " + pinjaman_pelulus + "% untuk Operasi!";
}
if(pinjaman >= 10000){
var errortext = "Pinjaman Melebihi 10000";
var errortext = "Pinjaman Melebihi 10,000";
}
swalWithBootstrapButtons.fire({
@@ -798,7 +798,7 @@
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 status = errortext;
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -821,7 +821,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -899,7 +903,7 @@
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Tetapan margin melebihi 70% untuk Khazanah!",
text: "Tetapan margin melebihi " + pinjaman_teller + "% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
@@ -910,7 +914,7 @@
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 status = "Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -934,7 +938,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
resources/views/khazanah/kelulusan.blade.php
+71 -30
View File
@@ -111,7 +111,7 @@
<tr>
<th>No Rujukan</th>
<th>Teller</th>
<th>Komen</th>
<th>Status</th>
<th>Nilai Pembiayaan (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Berat</th>
@@ -120,13 +120,12 @@
</tr>
</thead>
<tbody>
@foreach($arraykelulusan as $index=>$k)
{{-- {{ dd($k) }} --}}
@foreach($kelulusan as $index=>$k)
<tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
<td>{{ $k['namateller'] }}</td>
<td>{{ $k['komen'] }}</td>
<td>{{ number_format($k['pinjaman'],2) }}</td>
<td>{{ $k['teller'] }}</td>
<td>{{ $k['status'] }}</td>
<td>{{ number_format($k['jumpinj'],2) }}</td>
<td>{{ $k['nilaimarhun'] }}</td>
<td>{{ $k['berat'] }}</td>
<td>{{ $k['margin'] }}</td>
@@ -134,8 +133,7 @@
<button class="btn btn-danger" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" data-siri="{{ $k['siri'] }}" onclick="updatebatal(this)"><i class="fas fa-thumbs-down"></i></button></td>
</tr>
@endforeach
@foreach($arraykelulusanmohonid as $index=>$km)
@foreach($kelulusanmohonid as $index=>$km)
<tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $km['norujukan'] }}">{{ $km['norujukan'] }} </a></td>
<td>{{ $km['teller'] }}</td>
@@ -302,29 +300,48 @@
return false;
}
const { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
// input: 'checkbox',
// inputPlaceholder: 'Komen',
input: 'radio',
inputOptions: {
'#ff0000': 'Red',
'#00ff00': 'Green',
'#0000ff': 'Blue'
},
confirmButtonText: 'Hantar',
showCancelButton:false,
allowOutsideClick: false
})
// var { value: komenkelulusan } = await Swal.fire({
// title: 'Masukkan Komen!',
// input: 'radio',
// customClass: {
// input: 'custom-radio'
// },
// inputOptions: {
// 'Pelanggan Baru': 'Pelanggan Baru',
// 'Pelanggan Tetap': 'Pelanggan Tetap',
// 'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
// 'Lain2': 'Lain-Lain'
// },
// confirmButtonText: 'Hantar',
// showCancelButton:false,
// allowOutsideClick: false
// })
// if(komenkelulusan === 'Lain2')
// {
// var { value: komenkelulusan } = await Swal.fire({
// title: 'Masukkan Komen!',
// input: 'text',
// inputPlaceholder: 'Komen',
// confirmButtonText: 'Hantar',
// showCancelButton:false,
// allowOutsideClick: false
// });
// }
// console.log(komenkelulusan);
// return false;
return false;
let teller = $(e).closest('tr').children('td:eq(1)').text();
let nm = $(e).closest('tr').children('td:eq(4)').text();
let ber = $(e).closest('tr').children('td:eq(5)').text();
let marg = $(e).closest('tr').children('td:eq(6)').text();
let komen = komenkelulusan + '|' + nm + "|" + ber + "|" + marg + "|";
// let komen = komenkelulusan + '|' + nm + "|" + ber + "|" + marg + "|";
let komen = '';
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
@@ -341,9 +358,13 @@
"norujukan" : norujukan,
"pelulus" : pelulus,
"siri" : siri,
'komen' : komen,
'namakhazanah' : namakhazanah,
'teller' : teller
"komen" : komen,
"margin" : marg,
"nilaimarhun" : nm,
"berat" : ber,
"status" : status,
"namakhazanah" : namakhazanah,
"teller" : teller
},
success:function(data){
Swal.fire({
@@ -399,14 +420,34 @@
return false;
}
const { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen Daripada Khazanah',
var { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
input: 'radio',
customClass: {
input: 'custom-radio'
},
inputOptions: {
'Pelanggan Baru': 'Pelanggan Baru',
'Pelanggan Tetap': 'Pelanggan Tetap',
'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
'Lain2': 'Lain-Lain'
},
confirmButtonText: 'Hantar',
showCancelButton:false,
allowOutsideClick: false
})
if(komenkelulusan === 'Lain2')
{
var { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
input: 'text',
inputPlaceholder: 'Komen',
confirmButtonText: 'Hantar',
showCancelButton:false,
allowOutsideClick: false
})
});
}
let teller = $(e).closest('tr').children('td:eq(1)').text();
let norujukan = $(e).data('norujukan');
resources/views/khazanah/pendahuluanserahanmain.blade.php
+41 -8
View File
@@ -27,7 +27,7 @@
@endphp
<div class="col-12 d-flex justify-content-end" style="visibility: hidden;">
<div class="col-12 d-flex justify-content-end">
<button class="btn btn-danger fas fa-trash-alt" onclick="togglepadam();"></button>
</div>
@@ -50,7 +50,7 @@
<td>{{ $gldetail['descpt'] }}</td>
<td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
<td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
@if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-minus-square"></button></td>@else<td></td> @endif
@if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser(this);" data-pend="{{ $gldetail['pendahuluan'] }}" data-ser="{{ $gldetail['serahan'] }}" data-recno="{{ $gldetail['recno'] }}" class="btn btn-danger fas fa-minus-square"></button></td>@else<td></td> @endif
</tr>
@endforeach
</tbody>
@@ -139,8 +139,20 @@
column.visible(!column.visible());
}
function deletependser()
function deletependser(e)
{
let rec_no = $(e).data('recno');
let pend = $(e).data('pend');
let ser = $(e).data('ser');
let jenisserahan = '';
if(pend > 0)
{
jenisserahan = 'pendahuluan';
}else{
jenisserahan = 'serahan';
}
Swal.fire({
title: 'Adakah anda pasti?',
text: "Anda tidak dapat untuk mengembalinya kembali!",
@@ -152,11 +164,32 @@
confirmButtonText: 'Teruskan!'
}).then((result) => {
if (result.isConfirmed) {
Swal.fire(
'Deleted!',
'Your file has been deleted.',
'success'
)
$.ajax({
method: 'post',
url: '{{ route("khazanah.deletependser") }}',
data: {
"_token": "{{ csrf_token() }}",
'recno' : rec_no,
'jenisserahan' : jenisserahan
},
success:function(data){
if(data === 'berjaya')
{
location.reload();
}else{
Swal.fire(
'Tidak Berjaya!',
'Data tidak berjaya dihapuskan.',
'error'
)
}
}
});
}
});
}
resources/views/layouts/app.blade.php
+11
View File
@@ -66,6 +66,17 @@
}
</script>
<style>
.custom-radio {
font-size:18px;
margin:20px 20px 20px 20px;
display: inline-flex !important;
flex-direction: column;
align-items: flex-start !important;
}
</style>
</head>
<body onload="startTime()" style="background-color:#BAC1C9;">
resources/views/layouts/app_operasi.blade.php
+10
View File
@@ -67,6 +67,16 @@
}
</script>
<style>
.custom-radio {
font-size:18px;
margin:20px 20px 20px 20px;
display: inline-flex !important;
flex-direction: column;
align-items: flex-start !important;
}
</style>
</head>
<body onload="startTime()" style="background-color:#BAC1C9;">
<div id="app">
resources/views/operasi/kelulusan.blade.php
+24 -4
View File
@@ -110,7 +110,7 @@
<th>No Rujukan</th>
<th>Cawangan</th>
<th>Teller</th>
<th>Komen</th>
<th>Status</th>
<th>Nilai Pembiayaan</th>
<th>Nilai Marhun</th>
<th>Berat</th>
@@ -124,7 +124,7 @@
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-kodcawangan="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
<td>{{ $k['cawangan'] }}</td>
<td>{{ $k['namateller'] }}</td>
<td>{{ $k['komen'] }}</td>
<td>{{ $k['status'] }}</td>
<td>{{ number_format($k['pinjaman'],2) }}</td>
<td>{{ $k['nilaimarhun'] }}</td>
<td>{{ $k['berat'] }}</td>
@@ -301,14 +301,34 @@
return false;
}
const { value: komenkelulusan } = await Swal.fire({
var { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
input: 'radio',
customClass: {
input: 'custom-radio'
},
inputOptions: {
'Pelanggan Baru': 'Pelanggan Baru',
'Pelanggan Tetap': 'Pelanggan Tetap',
'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
'Lain2': 'Lain-Lain'
},
confirmButtonText: 'Hantar',
showCancelButton:false,
allowOutsideClick: false
})
if(komenkelulusan === 'Lain2')
{
var { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
input: 'text',
inputPlaceholder: 'Komen',
confirmButtonText: 'Hantar',
showCancelButton:false,
allowOutsideClick: false
})
});
}
let norujukan = $(e).data('norujukan');
let cawangankod = $(e).data('kodcaw');
resources/views/penebusan/index.blade.php
+62 -16
View File
@@ -433,7 +433,10 @@
var jumlahperlu = 0;
var jumlahminima = 0;
var percent_mora = 0;
var pinjaman_teller = 0;
var pinjaman_pelulus = 0;
$( document ).ready(function() {
tebusan();
@@ -455,6 +458,21 @@
}
})
$.ajax({
method:'GET',
url: api + '/api/maxpinjaman',
success:function(data){
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
pinjaman_teller = Number(pinjaman['max']);
}
if(pinjaman['user_type'] == 'khazanah'){
pinjaman_pelulus = Number(pinjaman['max']);
}
});
}
});
});
function tebusan(){
@@ -1298,7 +1316,8 @@
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla;
let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
// let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
let status = "[Tebus Separuh] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#bakipinjaman').val();
let teller = "{{ Auth::user()->name }}";
@@ -1321,7 +1340,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -1420,13 +1443,14 @@
let komen = '';
if(separuhla > 75 && separuhla <= 80)
{
komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
komen = "[Tebus Separuh] Pembiayaan Melebihi Margin" + pinjaman_pelulus + "%";
}else if(pinjamanbaru >= 10000)
{
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
komen = "[Tebus Separuh] Pembiayaan Melebihi RM 10,000";
}
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let status = komen;
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1448,7 +1472,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -1572,7 +1600,8 @@
if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
// let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
let status = "[Tambah Pinjaman] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let jumpinjam = $('#hargapembiayaansemasa').val();
let teller = "{{ Auth::user()->name }}";
@@ -1595,7 +1624,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -1694,10 +1727,10 @@
let komen = '';
if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
{
komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
komen = "[Tambah Pinjaman] Pembiayaan Melebihi Margin " + pinjaman_pelulus "%";
}else if(pinjamanbaru >= 10000)
{
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
komen = "[Tambah Pinjaman] Pembiayaan Melebihi RM 10,000";
}
let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"");
@@ -1722,7 +1755,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -1966,7 +2003,8 @@
if (result.isConfirmed) {
let nm = nmsemasa;let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
// let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
let status = "[Auto Tawarruq] Pembiayaan Melebihi Margin " + pinjaman_teller + "%";
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1988,7 +2026,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : pinjaman_baru,
"teller" : teller
},
@@ -2087,10 +2129,10 @@
let komen = '';
if(marginsemasa > 75 && marginsemasa <= 80)
{
komen = "Pembiayaan Melebihi Margin 75%|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
komen = "[Auto Tawarruq] Pembiayaan Melebihi Margin " + pinjaman_pelulus + "%";
}else if(pinjamanbaru >= 10000)
{
komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
komen = "[Auto Tawarruq] Pembiayaan Melebihi RM 10,000";
}
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
@@ -2115,7 +2157,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : pinjaman_baru,
"teller" : teller
},
routes/web.php
+2
View File
@@ -163,6 +163,8 @@ Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianCon
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::get('/gadai/edit/editmarhun',['as'=>'gadai.ubahmarhun','uses'=>'GadaianController@ubahmarhun'])->middleware('auth','teller');
Route::post('/deletependahuluanserahan',['as'=>'khazanah.deletependser','uses'=>'KhazanahController@deletependahuluanserahan'])->middleware('auth','khazanah');
//Ubah dan Hapus
Route::get('/getkelulu',['as'=>'teller.getkelulusan','uses'=>'GadaianController@getkelulusan'])->middleware('auth','teller');