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

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into kaunter

Browse Source
This commit is contained in:
afiq
2021-10-02 19:33:17 +08:00
parent dd9d0274dc 15f230a972
commit b9d96bc608
19 changed files with 1047 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/aliran_tunai/index.blade.php
+11 -2
View File
@@ -125,7 +125,8 @@
<button type="button" onclick="periksaalirantunai();" class="btn btn-primary float-right">Kemaskini</button>
<button type="button" onclick="cetaklaporanalirantunai()" class="btn btn-primary float-right mr-1">Cetak</button>
<button type="button" onclick="cetaklaporanalirantunai()" class="btn btn-primary float-right mr-1">Peti Besi</button>
<button type="button" onclick="cetakserahankeseluruhan()" class="btn btn-primary float-right mr-1">Serahan</button>
<nav>
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
<a class="nav-item nav-link" id="nav-rekod-tab" data-toggle="tab" href="#nav-rekod" role="tab" aria-controls="nav-rekod" aria-selected="false">Rekod</a>
@@ -545,6 +546,14 @@
}
function cetakserahankeseluruhan()
{
console.log('ets');
let urlroute = '{{ route("laporan.serahanteller") }}';
window.open(urlroute, '_blank');
}
$('#tarikhaddtunai').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
@@ -578,7 +587,7 @@
}
let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
let laporanroute = "{{ route('laporan.serahanteller') }}";
let laporanroute = "{{ route('laporan.serahantellerberkala') }}";
</script>
<script src="{{ asset('js/main.js') }}"></script>
@endsection
resources/views/aliran_tunai/laporan/laporanserahan.blade.php
+18 -1
View File
@@ -434,7 +434,7 @@
<table id="tarikh_ib">
<tr>
<td colspan="2" > <B><U>Laporan Pemerisksaan Wang Peti Besi (Cash Box)</U></B></td>
<td colspan="2" > <B><U>Laporan Pemeriksaan Wang Peti Besi (Cash Box)</U></B></td>
</tr>
@@ -523,4 +523,21 @@
Baki Tunai Semasa sebanyak <span>RM {{ number_format($totalsemua,2) }}</span>
<br>
<br>
<table id="sign" style="margin-top:200px;">
<tr>
<td></td>
<td colspan="2"> .................................................................. </td>
<td> </td>
<td colspan="2">.................................................................. </td>
<td> </td>
</tr>
<tr>
<td></td>
<td colspan="2"><B> DI SEMAK</B> </td>
<td> </td>
<td colspan="2"><B>DI SAHKAN </B></td>
<td> </td>
</tr>
</table>
resources/views/aliran_tunai/laporan/laporanserahanberkala.blade.php
+543
View File
@@ -0,0 +1,543 @@
<style>
#header {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#header td, #customers th {
padding:4px;
font-size:12px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
border: 1px solid #ddd;
}
#scan td, #scan th {
padding: 8px;
font-size:20px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
}
#scan td, #scan th {
padding: 8px;
font-size:12px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
border-collapse: collapse;
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#details td, #details th {
padding: 8px;
font-size:16px;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ffffff;}
#details th {
padding-top: 12px;
font-style:bold;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
#sign tr:nth-child(even){background-color: #ffffff;}
#sign tr:hover {background-color: #ddd;}
#sign th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#title {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#title td, #title th {
padding:4px;
font-size:12px;
border: 0px solid #fff;
}
#title tr:nth-child(even){background-color: #ffffff;}
#title tr:hover {background-color: #ddd;}
#title th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:80%;
}
#details td, #details th {
padding:4px;
font-size:16px;
border: 1px solid #ddd;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ddd;}
#details th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#tarikh_cetak {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#tarikh_cetak td, #tarikh_cetak th {
padding:4px;
font-size:10px;
}
#tarikh_cetak tr:nth-child(even){background-color: #ffffff;}
#tarikh_cetak tr:hover {background-color: #ddd;}
#tarikh_cetak th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#data {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 80%;
}
#data td, #data th {
padding:4px;
font-size:16px;
}
#data tr:nth-child(even){background-color: #ffffff;}
#data tr:hover {background-color: #ddd;}
#data th {
padding-top: 11px;
padding-bottom: 11px;
text-align: left;
padding:4px;
color:black;
font-size:14px;
}
</style>
<style>
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:45%;
}
#tarikh_ib td, #tarikh_ib th {
padding:4px;
font-size:12px;
}
#tarikh_ib tr:nth-child(even){background-color: #ffffff;}
#tarikh_ib tr:hover {background-color: #ddd;}
#tarikh_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#GL {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL td, #GL th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL tr:nth-child(even){background-color: #ffffff;}
#GL tr:hover {background-color: #ddd;}
#GL th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#GL_dtl {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL_dtl td, #GL_dtl th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL_dtl tr:nth-child(even){background-color: #ffffff;}
#GL_dtl tr:hover {background-color: #ddd;}
#GL_dtl th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#dtl_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#dtl_ib td, #dtl_ib th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#dtl_ib tr:nth-child(even){background-color: #ffffff;}
#dtl_ib tr:hover {background-color: #ddd;}
#dtl_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#total_harta {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#total_harta td, #total_harta th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#total_harta tr:nth-child(even){background-color: #ffffff;}
#total_harta tr:hover {background-color: #ddd;}
#total_harta th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
<th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
</tr>
<tr>
<td>{{ $cawangan_detail['namacaw'] }}</td>
<td></td>
</tr>
<tr>
<td>{{ $cawangan_detail['alamat1'] }}</td>
<td></td>
</tr>
<tr>
<td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
<td></td>
</tr>
</table>
<br>
<table id="tarikh_ib">
<tr>
<td colspan="2" > <B><U>Laporan Pemeriksaan Wang Peti Besi (Cash Box)</U></B></td>
</tr>
</table>
<table id="tarikh_ib">
<tr><td style="width:10px" ><b>ID</b></td ><td style="width:20px"> {{ (Auth::user()->name) ? Auth::user()->name : ''}} </td> </tr>
<br>
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ $tarikh_cetak }} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px"> {{ $tarikh_cetak }} </td> </tr>
</table>
<br>
<table id="GL_dtl">
<thead>
<td><b>RM</b></td>
<td><b>KUANTITI</b></td>
<td><b>JUMLAH (RM)</b></td>
</thead>
<tr>
<td>RM100</td>
<td>{{ $array_requestteller['txtring100'] }}</td>
<td>@php $totalsemua = 0; $total = ($array_requestteller['txtring100'] * 100); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 50</td>
<td>{{ $array_requestteller['txtring50'] }}</td>
<td>@php $total = ($array_requestteller['txtring50'] * 50); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 20</td>
<td>{{ $array_requestteller['txtring20'] }}</td>
<td>@php $total = ($array_requestteller['txtring20'] * 20); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 10</td>
<td>{{ $array_requestteller['txtring10'] }}</td>
<td>@php $total = ($array_requestteller['txtring10'] * 10); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 5</td>
<td>{{ $array_requestteller['txtring5'] }}</td>
<td>@php $total = ($array_requestteller['txtring5'] * 5); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 1.00</td>
<td>{{ $array_requestteller['txtring1'] }}</td>
<td>@php $total = ($array_requestteller['txtring1'] * 1); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 0.50</td>
<td>{{ $array_requestteller['txtsen50'] }}</td>
<td>@php $total = ($array_requestteller['txtsen50'] * 0.5); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 0.20</td>
<td>{{ $array_requestteller['txtsen20'] }}</td>
<td>@php $total = ($array_requestteller['txtsen20'] * 0.2); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM0.10</td>
<td>{{ $array_requestteller['txtsen10'] }}</td>
<td>@php $total = ($array_requestteller['txtsen10'] * 0.1); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 0.05</td>
<td>{{ $array_requestteller['txtsen5'] }}</td>
<td>@php $total = ($array_requestteller['txtsen5'] * 0.05); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td>RM 0.01</td>
<td>{{ $array_requestteller['txtsen1'] }}</td>
<td>@php $total = ($array_requestteller['txtsen1'] * 0.01); $totalsemua += $total; echo number_format($total,2); @endphp</td>
</tr>
<tr>
<td colspan="2"><b>JUMLAH (RM)</b></td>
<td>{{ number_format($totalsemua,2) }}</td>
</tr>
</table>
<h5>CATATAN:</h5> Serahan kepada peti besi ialah sebanyak <span>RM </span>
Baki Tunai Semasa sebanyak <span>RM {{ number_format($totalsemua,2) }}</span>
<br>
<br>
<table id="sign" style="margin-top:200px;">
<tr>
<td></td>
<td colspan="2"> .................................................................. </td>
<td> </td>
<td colspan="2">.................................................................. </td>
<td> </td>
</tr>
<tr>
<td></td>
<td colspan="2"><B> DI SEMAK</B> </td>
<td> </td>
<td colspan="2"><B>DI SAHKAN </B></td>
<td> </td>
</tr>
</table>
resources/views/customers/info.blade.php
+5 -1
View File
@@ -565,7 +565,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']);
@@ -781,10 +781,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({
@@ -800,7 +800,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 }}";
@@ -823,7 +823,11 @@
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"komen" : '',
"margin" : marg,
"berat" : ber,
"nilaimarhun" : nm,
"status" : status,
"jumpinjam" : jumpinjam,
"teller" : teller
},
@@ -901,7 +905,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',
@@ -912,7 +916,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 }}";
@@ -936,7 +940,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/info.blade.php
+6 -3
View File
@@ -693,10 +693,13 @@
function ulangcetakagh(e)
{
var komen2 = $(e).data('komen2');
var kodnegeri = $(e).data('kodnegeri');
var koddaerah = $(e).data('koddaerah');
var noruj = $(e).data('histid');
if(komen2 !== null)
console.log(kodnegeri);
if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
let histid = $('input[name="belum"]:checked').val();
@@ -751,7 +754,7 @@
showConfirmButton: false,
html: "<br>" +
'<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
'<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
'<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-koddaerah="' + data[0].koddaerah + '" data-kodnegeri="' + data[0].kodnegeri + '">' + 'Ulang Cetak' + '</button>',
icon: 'error',
title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
});
resources/views/khazanah/kelulusan.blade.php
+72 -23
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,21 +300,48 @@
return false;
}
const { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
input: 'text',
inputPlaceholder: 'Komen',
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;
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');
@@ -333,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({
@@ -391,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
},
resources/views/print/suratgadaianhilang.blade.php
+2 -1
View File
@@ -82,7 +82,8 @@
<td style="text-align: right;">........................................................</td>
</tr>
@php
list($negeriagh, $daerahagh) = explode('|', $polis[0]['komen2']);
$negeriagh = $polis[0]['kodnegeri'];
$daerahagh = $polis[0]['koddaerah'];
$negeri = Http::get($api_url . '/api/negeri/' . $negeriagh)->json();
$daerah = Http::get($api_url . '/api/daerah/' . $daerahagh)->json();