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

lapfix

Browse Source
This commit is contained in:
hafifierahman
2022-01-08 11:01:36 +08:00
parent f06d1ce859 3eaf31522c
commit b0210f23bd
23 changed files with 311 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/info.blade.php
+18 -1
View File
@@ -826,7 +826,24 @@
if (tarikhtuntut == null)
{
window.location.href = urlroute;
$.ajax({
method: 'GET',
url : api_url + '/api/check/wtd',
data:{
'norujukan' : norujukan
},
success:function(data){
if(data == 'yes'){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Lelongan dalam process WTD'
});
}else{
window.location.href = urlroute;
}
}
});
}else{
Swal.fire({
icon: 'error',
resources/views/gadaian/edit.blade.php
+13 -11
View File
@@ -481,20 +481,21 @@
success:function(data){
$.each(data,function(index,jemas){
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
$('#nota_edit').val(res).trigger('change');
$('#sltkarat').val(karat);
$('#marhun_edit').val(jenismarhun);
$('#berat_edit').val(berat);
$('#nilaimarhun_edit').val(nm);
$('#harga_edit').val(harga);
$('#norujukedit').val(norujuk);
$('#recnoedit').val(recno[1]);
$('#editMarhunModal').modal();
})
}
});
$('#nota_edit').val(res).trigger('change');
$('#sltkarat').val(karat);
$('#marhun_edit').val(jenismarhun);
$('#berat_edit').val(berat);
$('#nilaimarhun_edit').val(nm);
$('#harga_edit').val(harga);
$('#norujukedit').val(norujuk);
$('#recnoedit').val(recno[1]);
$('#editMarhunModal').modal();
}
$("#sltkarat").change(function(e){
@@ -787,6 +788,7 @@
var pinjaman = Number($('#pinjaman').val());
var total_nilai_marhun = $('#total_nilai_marhun').val();
var nilai_marhun_total = Number(total_nilai_marhun.replace(/[^0-9.-]+/g,""));
var pinjaman_asal = "{{ $gadaiannorujukan['pinjaman']}}";
var pembiayaan_max_teller = $('#pembiayaan_max_teller').val();
var pembiayaan_max_teller = Number(pembiayaan_max_teller.replace(/[^0-9.-]+/g,""));
@@ -808,7 +810,7 @@
'kodlaluan': teller
},
success:function(data){
bakiakhir = data.baki;
bakiakhir = data.baki + pinjaman_asal;
}
});
resources/views/gadaian/index.blade.php
+11 -10
View File
@@ -1073,20 +1073,21 @@
success:function(data){
$.each(data,function(index,jemas){
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
$('#nota_edit').val(res).trigger('change');
$('#sltkarat').val(karat);
$('#marhun_edit').val(jenismarhun);
$('#berat_edit').val(berat);
$('#nilaimarhun_edit').val(nm);
$('#harga_edit').val(harga);
$('#norujukedit').val(norujuk);
$('#recnoedit').val(recno[1]);
$('#editMarhunModal').modal();
})
}
});
$('#nota_edit').val(res).trigger('change');
$('#sltkarat').val(karat);
$('#marhun_edit').val(jenismarhun);
$('#berat_edit').val(berat);
$('#nilaimarhun_edit').val(nm);
$('#harga_edit').val(harga);
$('#norujukedit').val(norujuk);
$('#recnoedit').val(recno[1]);
$('#editMarhunModal').modal();
}
$('#terima_edit').on('click',function(){
resources/views/homepage/khazanah/home.blade.php
+14 -13
View File
@@ -276,6 +276,7 @@
$.ajax({
method: 'put',
async:false,
url: api + '/api/DenominasiUpdate/' + kodcaw,
data: {
"bd1" : bundle1,
@@ -494,20 +495,20 @@
function simpanfunc()
{
console.log('simpan');
//Swal.fire({
// title: 'Adakah anda pasti untuk mengemaskini denominasi?',
// text: "Sila pastikan denominasi anda betul!",
// icon: 'warning',
// showCancelButton: true,
// confirmButtonColor: '#3085d6',
// cancelButtonColor: '#d33',
// confirmButtonText: 'Simpan'
// }).then((result) => {
Swal.fire({
title: 'Adakah anda pasti untuk mengemaskini denominasi?',
text: "Sila pastikan denominasi anda betul!",
icon: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Simpan'
}).then((result) => {
console.log(result);
return false;
});
// console.log(result);
// return false;
// });
let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
resources/views/homepage/penilai/home.blade.php
-2
View File
@@ -345,8 +345,6 @@
// this.checked = true;
$(this).prop('checked', true);
}
}
});
resources/views/khazanah/laporan/index.blade.php
+2 -5
View File
@@ -25,7 +25,7 @@
<div class="row">
<a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block mb-3">Pelanggan Baru</a>
</div>
<div class="row">
<div class="row d-none">
<a href="{{ route('laporan.ringkasanterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Terkumpul</a>
</div>
<div class="row">
@@ -70,7 +70,7 @@
<a href="{{ route('laporan.hapushq') }}" class="btn btn-dark btn-lg btn-block mb-3">Hapus S/P HQ</a>
</div> --}}
<div class="row">
<a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Rebet</a>
<a href="{{ route('laporan.saghilang') }}" class="btn btn-dark btn-lg btn-block mb-3">SAG Hilang</a>
</div>
</div>
<div class="col-3 mx-1">
@@ -98,9 +98,6 @@
<div class="row">
<a href="{{ route('laporan.perbelanjaan') }}" class="btn btn-dark btn-lg btn-block mb-3">Perbelanjaan</a>
</div>
<div class="row">
<a href="{{ route('laporan.saghilang') }}" class="btn btn-dark btn-lg btn-block mb-3">SAG Hilang</a>
</div>
</div>
</div>
</div>
resources/views/khazanah/laporan/saghilang.blade.php
+24 -9
View File
@@ -9,7 +9,7 @@
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
<li class="breadcrumb-item active" aria-current="page">Ringkasan Harian</li>
<li class="breadcrumb-item active" aria-current="page">SAG Hilang</li>
</ol>
</nav>
@@ -20,21 +20,36 @@
<div class="col-md-10">
</div>
</div>
<form action="{{ route('saghilang.laporancetak') }}" target="_blank" method="post">
@csrf
<div class="row">
<div class="col-md-5">
<form action="{{ route('saghilang.laporancetak') }}" target="_blank" method="get">
@csrf
<div class="col-md-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="dateringkasanharian" aria-describedby="basic-addon1">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datesaghilang" name="datesaghilang" aria-describedby="basic-addon1">
{{-- <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak"> --}}
</div>
</form>
</div>
<div class="col-md-5">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Alasan</span>
</div>
<select class="form-control" name="sltalasan">
@foreach($loopalasan as $index=>$lp)
<option value="{{ $lp['alasan'] }}">{{ $lp['alasan'] }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-md-2">
<input type="submit" class="btn btn-primary" id="submit_button" name="submit_button" value="Cetak">
</div>
</div>
</form>
</div>
</div>
</div>
@@ -49,7 +64,7 @@
});
$(document).ready( function () {
$('#datetimepicker1').datepicker({
$('#datesaghilang').datepicker({
format: 'dd-mm-yyyy'
});
});
resources/views/operasi/komuditi/index.blade.php
+10
View File
@@ -414,9 +414,19 @@
text: 'Pendahuluan Unit Komuditi Berjaya'
});
$('#pembelian_modal').modal('hide');
komoditiNotify();
}
});
});
function komoditiNotify(){
$.ajax({
method:'get',
url: "{{ route('beli.notifyKomoditi') }}",
success:function(data){
console.log('berjaya');
}
});
}
</script>
@endsection
resources/views/penebusan/index.blade.php
-1
View File
@@ -74,7 +74,6 @@
@endif
@if($gadai['hargajualan'] == null)
<option value="AT">A = Auto Tawarruq</option>
<option value="U">U = Bayaran Upah</option>
@endif
</select>
</div>
resources/views/print/laporan_saghilang.blade.php
+20 -18
View File
@@ -172,7 +172,7 @@
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN WAKIL</b></th>
<th colspan ="5"><b>LAPORAN SAG HILANG</b></th>
<th> </th>
<th> </th>
<th></th>
@@ -192,48 +192,50 @@
<td> </td>
<td> </td>
</tr>
{{-- <tr>
<tr>
<td style="width:20px"> <b>TARIKH:</b></td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@endphp</td> --}}
@endphp</td>
{{-- <td style="width:20px"> <b>HINGGA:</b></td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@endphp</td> --}}
{{-- <td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr> --}}
<td> </td>
</tr>
</table>
<br>
<table id="details">
<tr>
<th>Bil</th>
<th>nama</th>
<th>nokp</th>
<th>nowakil</th>
<th>hubungan</th>
<th>alamat1</th>
<th>telefon</th>
<th>Norujukan</th>
<th>Alasan</th>
<th>PC/PPC</th>
<th>Daerah</th>
<th>Negeri</th>
</tr>
@foreach($wakil as $index=>$lw)
@foreach($polis as $index=>$sh)
<tr>
<td>{{ $loop->iteration}}</td>
<td>{{ $lw['nama'] }}</td>
<td>{{ $lw['nokp'] }}</td>
<td>{{ $lw['nowakil'] }}</td>
<td>{{ $lw['hubungan'] }}</td>
<td>{{ $lw['alamat1'] }}</td>
<td>{{ $lw['telefon'] }}</td>
<td> {{ $sh['norujukan'] }}</th>
<td> {{ $sh['komen1'] }}</th>
<td> {{ $sh['teller'] }}</th>
@php
$koddaerah = Http::get(config('api.url') .'/api/daerah/' .$sh['koddaerah'] )->json();
$kodnegeri = Http::get(config('api.url') .'/api/negeri/' .$sh['kodnegeri'] )->json();
@endphp
<td> {{ $koddaerah['namadaerah'] }}</th>
<td> {{ $kodnegeri['negeri'] }}</th>
</tr>
@endforeach
</table>
resources/views/print/resitansuran.blade.php
+37 -38
View File
@@ -7,10 +7,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script>
$(document).ready(function () {
window.print();
window.onfocus=function(){ window.close();}
});
// $(document).ready(function () {
// window.print();
// window.onfocus=function(){ window.close();}
// });
</script>
<style>
/* Red border */
@@ -222,7 +222,7 @@ hr.new5 {
#payment {
font-family: Arial, Helvetica, sans-serif;
border-collapse:collapse;
width: 60%;
width: 90%;
font-size:13px;
border: 1px solid black;
@@ -394,34 +394,34 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
<table id="payment">
<tr>
<td style="width:10px">Harga/Baki Harga Jualan</td>
<td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:10px">Pembiayaan/Baki Pembiayaan</td>
<td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
<td style="width:30%">Harga Jualan/Baki</td>
<td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:30%">Pembiayaan/Baki</td>
<td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">Bayaran Harga Jualan</td>
<td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
<td style="width:10px">Ansuran Pembiyaan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
<td style="width:30%"><b>Bayaran Harga Jualan</b></td>
<td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
<td style="width:30%">Ansuran Pembiyaan</td>
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
<td style="width:10px"><b>Baki Pembiayaan</b></td>
<td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td>
<td style="width:30%">Baki Harga Jualan</td>
<td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
<td style="width:30%">Baki Pembiayaan</td>
<td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
</tr>
<tr>
<td style="width:10px"></td>
<td style="width:10px"></td>
<td style="width:10px"><b>Keuntungan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td>
<td style="width:10px">Keuntungan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
</tr>
</table>
<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
<br>
@@ -496,35 +496,34 @@ hr.new5 {
</table>
<br>
<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
<h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
<table id="payment">
<tr>
<td style="width:10px">Harga/Baki Harga Jualan</td>
<td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:10px">Pembiayaan/Baki Pembiayaan</td>
<td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
<td style="width:30%">Harga Jualan/Baki</td>
<td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:30%">Pembiayaan/Baki</td>
<td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
</tr>
<tr>
<td style="width:10px">Bayaran Harga Jualan</td>
<td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
<td style="width:10px">Ansuran Pembiyaan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
<td style="width:30%"><b>Bayaran Harga Jualan</b></td>
<td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
<td style="width:30%">Ansuran Pembiyaan</td>
<td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
<td style="width:10px"><b>Baki Pembiayaan</b></td>
<td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td>
<td style="width:30%">Baki Harga Jualan</td>
<td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
<td style="width:30%">Baki Pembiayaan</td>
<td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
</tr>
<tr>
<td style="width:10px"></td>
<td style="width:10px"></td>
<td style="width:10px"><b>Keuntungan</b></td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td>
<td style="width:10px">Keuntungan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
</tr>
</table>
<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
<br>