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

Merge branch 'pipiv2' into 'new-master'

Browse Source 
Pipiv2

See merge request online-sistem1/kaunter!135
This commit is contained in:
Zakwan Hamdan
2021-05-27 09:44:17 +00:00
parent 493de641a4 f7e456e24c
commit abf490c987
7 changed files with 139 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+8 -2
View File
@@ -4035,11 +4035,13 @@ class KhazanahController extends Controller
//Tanggungan Semasa //Tanggungan Semasa
$panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$wtd = Http::get(config('api.url').'/api/WTD/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $wtd = Http::get(config('api.url').'/api/SerahBaki/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$xtra = Http::get(config('api.url').'/api/Xtra/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
//TunaiDitangan Sementara Upah //TunaiDitangan Sementara Upah
if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
{ {
@@ -4061,6 +4063,10 @@ class KhazanahController extends Controller
$cajlelongxtra = floatval(25.50); $cajlelongxtra = floatval(25.50);
$upahsimpanxtra = floatval(4894.40); $upahsimpanxtra = floatval(4894.40);
}else{
$upahsimpanxtra = $xtra['upahsimpan'];
$bakilelongxtra = $xtra['bakilelong'];
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
} }
//Terkumpul //Terkumpul
resources/views/customers/info.blade.php
+93 -82
View File
@@ -1083,17 +1083,17 @@
} }
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){ }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
// let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
// let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
// if(+harini !== +tarikhgadai1){ if(+harini !== +tarikhgadai1){
// Swal.fire({ Swal.fire({
// icon: 'error', icon: 'error',
// title: 'Amaran', title: 'Amaran',
// text: 'Ubah Gadai Tidak Dibenarkan' text: 'Ubah Gadai Tidak Dibenarkan'
// }); });
// return false; return false;
// } }
} }
if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
@@ -1529,92 +1529,103 @@
} }
}); });
//TIME INTERVAL var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
let timerInterval; cluster: 'ap1',
encrypted: true
});
timerInterval = setInterval(function(){ var channel = pusher.subscribe('notice-ubahhapus');
$.ajax({ channel.bind('my-ubahhapus', function(data) {
method:'get',
url: "{{ route('teller.getkelulusan') }}", if(data.norujukan == id)
data: { {
"norujukan" : id if(data.kelulusan == 'lulus')
}, {
success:function(data){
if(data != 0){ Swal.fire({
clearInterval(timerInterval);
Swal.fire({
icon: 'success', icon: 'success',
title: 'Telah Disahkan' title: 'Telah Disahkan'
}).then(function(){ }).then(function(){
let teller = "{{ Auth::user()->name }}"; let teller = "{{ Auth::user()->name }}";
if($("input[name='options']:checked").val() == 'belum_tebus'){ if($("input[name='options']:checked").val() == 'belum_tebus'){
$.ajax({ $.ajax({
method:'put', method:'put',
url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + hapusid, url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + id,
data: { 'kodlaluan' : teller }, data: { 'kodlaluan' : teller },
success:function(data){ success:function(data){
$.ajax({ $.ajax({
method:'put', method:'put',
url: api_url + '/api/komuditi/batal', url: api_url + '/api/komuditi/batal',
dataType:'json', dataType:'json',
data:{ data:{
norujukan: hapusid norujukan: hapusid
}, },
success:function(batalkomuditi){ success:function(batalkomuditi){
swalWithBootstrapButtons.fire(
'Hapus!',
'Maklumat gadaian telah dihapuskan.',
'success'
).then(function(){
location.reload();
});
}
})
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
$.ajax({
method:'put',
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
data: { 'kodlaluan' : teller },
success:function(data){
if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire( swalWithBootstrapButtons.fire(
'Hapus!', 'Hapus!',
'Maklumat gadaian telah dihapuskan.', 'Maklumat gadaian telah dihapuskan.',
'success' 'success'
).then(function () { ).then(function(){
location.reload(); location.reload();
}); });
}else{
clearInterval(timerInterval);
swalWithBootstrapButtons.fire(
'Amaran!',
'Hapus Tebus Tidak Dibenarkan, Hanya untuk tebus sahaja!',
'error'
)
} }
},error: function(xhr, status, error) { })
var err = eval("(" + xhr.responseText + ")"); },error: function(xhr, status, error) {
console.log(xhr.responseText); var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
$.ajax({
method:'put',
url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + id,
data: { 'kodlaluan' : teller },
success:function(data){
if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire(
'Hapus!',
'Maklumat gadaian telah dihapuskan.',
'success'
).then(function () {
location.reload();
});
}else{
swalWithBootstrapButtons.fire(
'Amaran!',
'Hapus Tebus Tidak Dibenarkan, Hanya untuk tebus sahaja!',
'error'
)
} }
}); },error: function(xhr, status, error) {
} var err = eval("(" + xhr.responseText + ")");
return true; console.log(xhr.responseText);
}); }
} });
}
},error: function(xhr, status, error) { return true;
var err = eval("(" + xhr.responseText + ")"); });
alert(xhr.responseText);
} }
}); else if(data.kelulusan == 'batal')
}, 3000); {
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
// $("#terima_gadai").prop('disabled', false);
location.reload();
return false;
});
}
}
});
}else if (result.dismiss === Swal.DismissReason.cancel) { }else if (result.dismiss === Swal.DismissReason.cancel) {
swalWithBootstrapButtons.fire( swalWithBootstrapButtons.fire(
'Batal', 'Batal',
resources/views/gadaian/edit.blade.php
+13 -3
View File
@@ -27,8 +27,8 @@
</div> </div>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<table class="table" id="myTable"> <table class="table table-striped table-hover text-center" id="myTable">
<thead> <thead class="thead-dark">
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>Recno</th> <th>Recno</th>
@@ -41,6 +41,13 @@
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tfoot class="thead-dark">
<th colspan="3" class="text-center">Jumlah</th>
<th id="totalnilaimarhuntable"></th>
<th></th>
<th id="totalberattable"></th>
<th colspan="3"></th>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
@@ -368,7 +375,7 @@
counter, counter,
marhun_detail['recno'], marhun_detail['recno'],
marhun_detail['marhun'], marhun_detail['marhun'],
'RM ' + formatter.format(marhun_detail['n_marhun']), formatter.format(marhun_detail['n_marhun']),
marhun_detail['karat'], marhun_detail['karat'],
formatter.format(marhun_detail['berat']), formatter.format(marhun_detail['berat']),
marhun_detail['nota'], marhun_detail['nota'],
@@ -379,6 +386,8 @@
counter = counter + 1; counter = counter + 1;
}); });
}); });
$('#totalberattable').text(formatter.format(total_berat));
$('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
$('#bilangan_marhun').val(formatter.format(counter-1)); $('#bilangan_marhun').val(formatter.format(counter-1));
$('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
if (count == 1){ if (count == 1){
@@ -466,6 +475,7 @@
$.ajax({ $.ajax({
method:'GET', method:'GET',
url: api_url + '/api/jemas', url: api_url + '/api/jemas',
async:false,
success:function(data){ success:function(data){
$.each(data,function(index,jemas){ $.each(data,function(index,jemas){
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun'])); $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
resources/views/gadaian/index.blade.php
+10 -1
View File
@@ -49,7 +49,7 @@
</div> </div>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<table class="table table-striped table-hover" id="myTable"> <table class="table table-striped table-hover text-center" id="myTable">
<thead class="thead-dark"> <thead class="thead-dark">
<tr> <tr>
<th>Bil</th> <th>Bil</th>
@@ -63,6 +63,13 @@
<th>Tindakan</th> <th>Tindakan</th>
</tr> </tr>
</thead> </thead>
<tfoot class="thead-dark">
<th colspan="3" class="text-center">Jumlah</th>
<th id="totalnilaimarhuntable"></th>
<th></th>
<th id="totalberattable"></th>
<th colspan="3"></th>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
@@ -367,6 +374,8 @@
counter = counter + 1; counter = counter + 1;
}); });
}); });
$('#totalberattable').text(formatter.format(total_berat));
$('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
$('#bilangan_marhun').val(formatter.format(counter-1)); $('#bilangan_marhun').val(formatter.format(counter-1));
$('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun)); $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
if(total_nilai_marhun > 0 && total_nilai_marhun < 401){ if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
resources/views/khazanah/info.blade.php
+4 -1
View File
@@ -712,7 +712,10 @@
allowOutsideClick: false, allowOutsideClick: false,
allowEscapeKey: false, allowEscapeKey: false,
allowEnterKey: false, allowEnterKey: false,
confirmButtonText: '<i class="fa fa-check-circle"></i> Baiklah', showConfirmButton: false,
html: "<br>" +
'<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1">' + 'Okay' + '</button>' +
'<button type="button" role="button" tabindex="0" class="btn btn-primary">' + 'Ulang Cetak' + '</button>',
icon: 'error', icon: 'error',
title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!' title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
}); });
resources/views/khazanah/tebus.blade.php
+2 -2
View File
@@ -89,7 +89,7 @@
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>No Rujukan</th> <th>No Rujukan</th>
<th>Penilai</th> <th>Teller</th>
<th>Transaksi</th> <th>Transaksi</th>
<th>Nilai Marhun</th> <th>Nilai Marhun</th>
</tr> </tr>
@@ -106,7 +106,7 @@
<a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}" <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}"
data-target="#marhunModal"> {{$ls['norujukan']}} </a></td> data-target="#marhunModal"> {{$ls['norujukan']}} </a></td>
<td>{{ $ls['penilai'] }}</td> <td>{{ $ls['teller'] }}</td>
<td>{{ $ls['jenistebus'] }}</td> <td>{{ $ls['jenistebus'] }}</td>
<td>{{ $ls['nilaimarhun'] }}</td> <td>{{ $ls['nilaimarhun'] }}</td>
</tr> </tr>
resources/views/print/suratgadaianhilang.blade.php
+9 -9
View File
@@ -33,10 +33,10 @@
$daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json(); $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp @endphp
<p style=" text-align: justify;text-justify: inter-word;line-height: 1.6;">Saya, <b style="color:#bdc3c7;">{{ $customers[0]['nama'] }}</b>, No. K/P : <b style="color:#bdc3c7;">@php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp</b> yang beralamat di <b style="color:#bdc3c7;">{{ strtoupper($customers[0]['alamat1']) . ', ' . $customers[0]['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }}</b> dengan sesungguhnya dan sebenarnya mengaku bahawa: -</p> <p style=" text-align: justify;text-justify: inter-word;line-height: 1.6;">Saya, <b>{{ $customers[0]['nama'] }}</b>, No. K/P : <b>@php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp</b> yang beralamat di <b>{{ strtoupper($customers[0]['alamat1']) . ', ' . $customers[0]['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }}</b> dengan sesungguhnya dan sebenarnya mengaku bahawa: -</p>
<ol> <ol>
<li style=" text-align: justify;text-justify: inter-word;line-height: 1.6;"><b>Surat Gadaian Ar-Rahn Cawangan <span style="color:#bdc3c7;">@php $namacawangan = substr($cawangan_detail['namacaw'],7); $rendoh = strtolower($namacawangan);echo ucwords($rendoh); @endphp</span></b> kepunyaan saya telah hilang dalam simpanan @php if(strtoupper($polis[0]['komen1']) == 'SIMPANAN') { echo '.'; }else{ echo 'kerana <b style="color:#bdc3c7;">' . $polis[0]['komen1'] . '</b>.'; } @endphp Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.</li> <li style=" text-align: justify;text-justify: inter-word;line-height: 1.6;"><b>Surat Gadaian Ar-Rahn Cawangan <span>@php $namacawangan = substr($cawangan_detail['namacaw'],7); $rendoh = strtolower($namacawangan);echo ucwords($rendoh); @endphp</span></b> kepunyaan saya telah hilang dalam simpanan @php if(strtoupper($polis[0]['komen1']) == 'SIMPANAN') { echo '.'; }else{ echo 'kerana <b>' . $polis[0]['komen1'] . '</b>.'; } @endphp Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.</li>
</ol> </ol>
<ol start="2"> <ol start="2">
<li>Butir-butir mengenai kehilangan surat gadaian tersebut adalah seperti berikut: -</li> <li>Butir-butir mengenai kehilangan surat gadaian tersebut adalah seperti berikut: -</li>
@@ -45,22 +45,22 @@
<tr> <tr>
<td style="text-align: left;" width="40%;">No. Rujukan</td> <td style="text-align: left;" width="40%;">No. Rujukan</td>
<td style="text-align: center;" width="20%;">:</td> <td style="text-align: center;" width="20%;">:</td>
<td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">{{ $polis[0]['norujukan'] }}</td> <td style="text-align: left;font-weight:bold;" width="50%;">{{ $polis[0]['norujukan'] }}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: left;">Berat</td> <td style="text-align: left;">Berat</td>
<td style="text-align: center;" width="20%;">:</td> <td style="text-align: center;" width="20%;">:</td>
<td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">{{ $gadai[0][0]['berat'] }} gm</td> <td style="text-align: left;font-weight:bold;" width="50%;">{{ $gadai[0][0]['berat'] }} gm</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: left;">Pembiayaan</td> <td style="text-align: left;">Pembiayaan</td>
<td style="text-align: center;" width="20%;">:</td> <td style="text-align: center;" width="20%;">:</td>
<td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">RM {{ $gadai[0][0]['pinjaman'] }}</td> <td style="text-align: left;font-weight:bold;" width="50%;">RM {{ $gadai[0][0]['pinjaman'] }}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: left;">Tarikh Gadaian</td> <td style="text-align: left;">Tarikh Gadaian</td>
<td style="text-align: center;" width="20%;">:</td> <td style="text-align: center;" width="20%;">:</td>
<td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">@php $time = new DateTime($gadai[0][0]['t_gadai']); $date = $time->format('d/m/Y'); echo $date; @endphp</td> <td style="text-align: left;font-weight:bold;" width="50%;">@php $time = new DateTime($gadai[0][0]['t_gadai']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
</tr> </tr>
</table> </table>
<p style=" text-align: justify;text-justify: inter-word;">dan saya membuat akuan ini dengan kepercayaan bahwa akuan ini adalah benar, dan menurut kuasa peruntukan Akta Akuan Berkanun 1960.</p> <p style=" text-align: justify;text-justify: inter-word;">dan saya membuat akuan ini dengan kepercayaan bahwa akuan ini adalah benar, dan menurut kuasa peruntukan Akta Akuan Berkanun 1960.</p>
@@ -77,7 +77,7 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td style="font-weight: bold;color:#bdc3c7;">{{ $customers[0]['nama'] }}</td> <td style="font-weight: bold;">{{ $customers[0]['nama'] }}</td>
<td class="tableright">)</td> <td class="tableright">)</td>
<td style="text-align: right;">........................................................</td> <td style="text-align: right;">........................................................</td>
</tr> </tr>
@@ -88,12 +88,12 @@
@endphp @endphp
<tr> <tr>
<td>di <b style="color:#bdc3c7;">{{ strtoupper($daerah['namadaerah']) }} </b> </td> <td>di <b>{{ strtoupper($daerah['namadaerah']) }} </b> </td>
<td class="tableright">)</td> <td class="tableright">)</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>di dalam Negeri <b style="color:#bdc3c7;">{{ $negeri['negeri'] }}</b></td> <td>di dalam Negeri <b>{{ $negeri['negeri'] }}</b></td>
<td class="tableright">)</td> <td class="tableright">)</td>
<td></td> <td></td>
</tr> </tr>