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

update

Browse Source
This commit is contained in:
afiq
2021-02-15 09:08:19 +08:00
parent 9cd75ac010
commit 6a2b78c72c
16 changed files with 118 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+5
View File
@@ -20,6 +20,11 @@ use PDF;
class KhazanahController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function index()
{
$search = false;
app/Http/Controllers/KomuditiController.php
+5
View File
@@ -7,6 +7,11 @@ use Illuminate\Support\Facades\Auth;
class KomuditiController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function index(){
$auth_user = Auth::user();
$api_url = config('api.url');
app/Http/Controllers/LelongController.php
+5
View File
@@ -8,6 +8,11 @@ use Illuminate\Support\Facades\Auth;
class LelongController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function lelong(){
$api_url = config('api.url');
$auth_user = Auth::user();
public/js/main.js
Vendored
+4 -6
View File
@@ -107,9 +107,8 @@ function totalkey(datakeyin)
$('#' + idkey).val(0);
Swal.fire({
icon: 'error',
title: 'Oops...',
text: 'Something went wrong!',
footer: '<a href>Why do I have this issue?</a>'
title: 'Amaran',
text: 'Jumlah Melebihi kadar',
});
}
else
@@ -147,9 +146,8 @@ function kiraan(datakeyin)
// $('#' + idkey).val('');
Swal.fire({
icon: 'error',
title: 'Oops...',
text: 'Something went wrong!',
footer: '<a href>Why do I have this issue?</a>'
title: 'Amaran',
text: 'Jumlah denominasi melebihi kadar'
});
}
else
resources/views/customers/info.blade.php
+12 -13
View File
@@ -680,11 +680,11 @@
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
text: "Ubah Rekod Pelanggan!",
title: 'Dapatkan Pengesahan Khazanah',
text: "Ubah Maklumat Gadaian",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
@@ -739,7 +739,7 @@
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
title: 'Anda Berjaya Menerima Pengesahan'
title: 'Telah Disahkan'
}).then(function(){
var urlroute = '{{ route("gadaian.edit", ":id") }}';
@@ -760,8 +760,8 @@
}, 3000);
}else if (result.dismiss === Swal.DismissReason.cancel){
swalWithBootstrapButtons.fire(
'Cancelled',
'Your imaginary file is safe :)',
'Batal',
'Tidak Berjaya Mendaptkan Pengesahan Khazanah',
'error'
)
}
@@ -825,11 +825,11 @@
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
title: 'Dapatkan Pengesahan Khazanah',
text: "Hapus Rekod!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
@@ -889,7 +889,7 @@
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
title: 'Anda Berjaya Menerima Pengesahan'
title: 'Telah Disahkan'
}).then(function(){
if($("input[name='options']:checked").val() == 'belum_tebus'){
$.ajax({
@@ -906,7 +906,7 @@
success:function(batalkomuditi){
swalWithBootstrapButtons.fire(
'Hapus!',
'Data pelanggan telah dihapuskan.',
'Maklumat gadaian telah dihapuskan.',
'success'
).then(function(){
location.reload();
@@ -927,7 +927,7 @@
if(data != "Bukan-Tebus"){
swalWithBootstrapButtons.fire(
'Hapus!',
'Data pelanggan telah dihapuskan.',
'Maklumat gadaian telah dihapuskan.',
'success'
).then(function () {
location.reload();
@@ -1073,7 +1073,7 @@
Swal.fire({
icon: 'success',
title: 'Berjaya',
text: 'Anda telah berjaya mengemaskini maklumat pelanggan'
text: 'Berjaya mengemaskini maklumat pelanggan'
})
},
error: function (request, status, error) {
@@ -1167,7 +1167,6 @@
}
},
error: function(xhRequest, ErrorText, thrownError){
// alert('Gadai Tidak Berjaya');
console.log(xhRequest);
}
});
resources/views/gadaian/edit.blade.php
+19 -9
View File
@@ -746,12 +746,19 @@
buttonsStyling: false
})
if(pinjaman > Number(pembiyaan_max_pelulus)+10){
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
}
if(pinjaman >= 10000){
var errortext = "Pinjaman Melebihi 10000";
}
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Operasi',
text: "Tetapan margin melebihi 75% untuk Operasi!",
text: errortext,
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
@@ -854,7 +861,7 @@
text: "Tetapan margin melebihi 70% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
@@ -944,13 +951,16 @@
event.preventDefault();
return false;
}
else if(pinjaman < 10000){
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Gadaian Berjaya Disimpan'
});
return true;
}
}
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Gadaian Berjaya Disimpan'
});
return true;
}
</script>
resources/views/gadaian/index.blade.php
+12 -10
View File
@@ -679,7 +679,7 @@
return false;
}
else{
if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman > 10000){
if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman >= 10000){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
@@ -691,7 +691,7 @@
if(pinjaman > Number(pembiyaan_max_pelulus)+10){
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
}
if(pinjaman > 10000){
if(pinjaman >= 10000){
var errortext = "Pinjaman Melebihi 10000";
}
@@ -888,14 +888,16 @@
event.preventDefault();
return false;
}
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Gadaian Berjaya Disimpan'
});
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
else if( pinjaman < 10000){
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Gadaian Berjaya Disimpan'
});
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
}
}
}
}
resources/views/homepage/penilai/home.blade.php
+13 -5
View File
@@ -242,6 +242,10 @@
minimumFractionDigits: 2
});
$('#cetak_sag').on('click',function(){
location.reload();
});
//modal
$('#marhunModal').on('show.bs.modal', function(event) {
var button = $(event.relatedTarget); // button yg trigger
@@ -258,7 +262,7 @@
var bil_count = 0;
$.each(arraymarhun,function(index,marhun){
$.each(marhun, function(index2,marhun_detail){
bil_count++;
var marhun_name;
$.ajax({
method:'GET',
@@ -268,6 +272,8 @@
marhun:marhun_detail['marhun']
},
success:function(marhun_ajax){
console.log(index2);
bil_count++;
$("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
}
});
@@ -288,6 +294,7 @@
$('#pinjaman_modal1').val(pinjaman);
$('#belum_serah').empty();
var bil_count = 0;
$.each(arraymarhun,function(index,marhun){
$.each(marhun, function(index2,marhun_detail){
var marhun_name;
@@ -299,7 +306,8 @@
marhun:marhun_detail['marhun']
},
success:function(marhun_ajax){
$("#belum_serah").append("<tr><td>" + index2 + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
bil_count++;
$("#belum_serah").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
}
});
});
@@ -364,11 +372,11 @@
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Daripada Khazanah?',
title: 'Dapatkan Pengesahan Khazanah',
text: "Cetak SAG Semula!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
@@ -423,7 +431,7 @@
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
title: 'Anda Berjaya Menerima Pengesahan'
title: 'Telah Disahkan'
}).then(function(){
$("#print_submit_belum_serah").submit();
});
resources/views/khazanah/dashboard.blade.php
+2 -2
View File
@@ -60,7 +60,7 @@
<div class="inner">
<h3>RM {{ number_format($keseluruhanupahharian,2) }}</h3>
<p>Upah Hari Ini</p>
<p>Keuntungan Hari Ini</p>
</div>
<div class="icon">
</div>
@@ -105,7 +105,7 @@
<div class="inner">
<h3>RM {{ number_format($keseluruhanupahterkumpul) }}</h3>
<p>Upah Terkumpul</p>
<p>Keuntungan Terkumpul</p>
</div>
<div class="icon">
</div>
resources/views/khazanah/gadaian.blade.php
+4 -3
View File
@@ -23,7 +23,7 @@
<th>Berat</th>
<th>Karat</th>
<th>Nilai Marhun</th>
<th>Nota test</th>
<th>Nota</th>
</tr>
</thead>
<tbody id="tablemarhun">
@@ -201,7 +201,7 @@
var total_berat = button.data('berat');
$('#jumlah_berat').val(total_berat);
var bil_count = 0;
$('#tablemarhun').empty();
$.each(arraymarhun,function(index,marhun){
$.each(marhun, function(index,marhun_detail){
@@ -214,7 +214,8 @@
marhun:marhun_detail['marhun']
},
success:function(marhun_ajax){
$("#tablemarhun").append("<tr><td>" + marhun_detail['bil'] + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
bil_count++;
$("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
}
});
});
resources/views/khazanah/kelulusan.blade.php
+1 -1
View File
@@ -37,7 +37,7 @@
<tr>
<td>{{ $k['norujukan'] }}</td>
<td>{{ $k['komen'] }}</td>
<td>{{ $k['pinjaman'] }}</td>
<td>{{ number_format($k['pinjaman'],2) }}</td>
<td>{{ $k['nilaimarhun'] }}</td>
<td>{{ $k['berat'] }}</td>
<td>{{ $k['margin'] }}</td>
resources/views/khazanah/pendahuluanserah.blade.php
+1 -1
View File
@@ -35,7 +35,7 @@
<div class="col-2"> </div>
<div class="col-6">
<button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
<input type="button" onclick="triggersubmit();" class="btn btn-primary" value="Lulus"/>
<input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
<a href="{{ url('/pendahuluan') }}" class="btn btn-danger">Batal</a>
</div>
</div>
resources/views/operasi/kelulusan.blade.php
+2 -3
View File
@@ -35,12 +35,11 @@
</thead>
<tbody>
@foreach($arraykelulusan as $index=>$k)
{{-- {{ dd($k) }} --}}
<tr>
<td>{{ $k['norujukan'] }}</td>
<td>{{ $k['cawangan'] }}</td>
<td>{{ $k['komen'] }}</td>
<td>{{ $k['pinjaman'] }}</td>
<td>{{ number_format($k['pinjaman'],2) }}</td>
<td>{{ $k['nilaimarhun'] }}</td>
<td>{{ $k['berat'] }}</td>
<td>{{ $k['margin'] }}</td>
@@ -86,7 +85,7 @@
console.log(data);
Swal.fire({
icon: 'success',
title: 'Anda Berjaya Mengesahkan Pengesahan'
title: 'Pengesahan Berjaya'
}).then(function(){
location.reload();
});
resources/views/penebusan/index.blade.php
+5 -4
View File
@@ -172,7 +172,7 @@
<div class="col-6">
<div class="form-group row">
<div class="col-4">
JUMLAH UPAH(RM)
JUMLAH KEUNTUNGAN(RM)
</div>
<div class="col-8">
<input type="text" id="jumlahupah" class="form-control" readonly/>
@@ -1182,6 +1182,7 @@
}
else if($('#sltjenistebus').find(":selected").val() == 'P')
{
let pinjamanbaru = $('#pinjamanbaru').val();
let jenisbayarantebus = '';
if(tarikhgadai < tarikhtawarruq)
{
@@ -1216,7 +1217,7 @@
text: "Tetapan margin melebihi 70% untuk Khazanah!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
@@ -1301,7 +1302,7 @@
event.preventDefault();
return false;
}else if(parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80){
}else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
@@ -1316,7 +1317,7 @@
text: "Tetapan margin melebihi 75% untuk Operasi!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Setuju!',
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
resources/views/print/laporanscanbarcode.blade.php
+12 -12
View File
@@ -198,6 +198,10 @@
<th>Nilai Marhun</th>
<th>Berat</th>
</tr>
@php
$jumlah_nilai_marhun = 0;
$jumlah_berat = 0;
@endphp
@foreach($marhun_serah_petibesi as $item)
<tr>
<td>{{$loop->iteration}}</td>
@@ -207,24 +211,20 @@
<td>{{$item['penilai']}}</td>
<td>{{$item['teller']}}</td>
<td>{{$item['marhun']}}</td>
<td>{{$item['nilaimarhun']}}</td>
<td>{{$item['berat']}}</td>
<td>{{number_format($item['nilaimarhun'],2)}}</td>
<td>{{number_format($item['berat'],2)}}</td>
</tr>
@php
$jumlah_nilai_marhun += $item['nilaimarhun'];
$jumlah_berat += $item['berat'];
@endphp
@endforeach
<tr>
<td></td>
<td><b>JUMLAH</b></td>
<td colspan="5"> </td>
<td>
@foreach($marhun_serah_petibesi as $item)
{{$item['nilaimarhun'] }}
@endforeach
</td>
<td>
@foreach($marhun_serah_petibesi as $item)
{{$item['berat'] }}
@endforeach
</td>
<td>{{ number_format($jumlah_nilai_marhun,2) }}</td>
<td>{{ number_format($jumlah_berat,2) }}</td>
</tr>
</table>
resources/views/print/sag.blade.php
+16 -46
View File
@@ -6,10 +6,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>
@@ -401,23 +401,17 @@
<table style="margin-bottom:10px;" id="perjanjian">
<tr>
<th colspan="7"> PERJANJIAN PEMBIAYAAN AR-RAHN TAWARRUQ </th>
<th colspan="4"> PERJANJIAN PEMBIAYAAN AR-RAHN TAWARRUQ </th>
</tr>
<tr>
<td> NAMA</td>
<td> </td>
<td> {{$customer_detail['nama']}}</td>
<td> </td>
<td> </td>
<td>NO SAG </td>
<td>{{$gadai_detail['norujukan']}}</td>
</tr>
<tr>
<td> NO MYKAD</td>
<td> </td>
<td>{{$gadai_detail['nokp']}} </td>
<td> </td>
<td> </td>
<td>TARIKH PEMBIAYAAN</td>
<td>
@php
@@ -429,10 +423,7 @@
</tr>
<tr>
<td> ALAMAT</td>
<td> </td>
<td>{{$customer_detail['alamat1']}} </td>
<td> </td>
<td> </td>
<td>TARIKH MATANG</td>
<td>
@php
@@ -443,7 +434,6 @@
</td>
</tr>
<tr>
<td> </td>
<td> </td>
<td>
@php
@@ -454,24 +444,16 @@
echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
@endphp
</td>
<td> </td>
<td> </td>
<td>NILAI MARHUN</td>
<td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
</tr>
<tr>
<td>NO TELEFON</td>
<td> </td>
<td>{{$customer_detail['telefon']}} </td>
<td> </td>
<td> </td>
<td>NILAI PEMBIAYAAN</td>
<td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
</tr>
<tr>
<td></td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td>HARGA JUALAN</td>
@@ -579,11 +561,12 @@
<table style="margin-bottom:10px;" id="marhun">
<tr>
<th colspan="7">KETERANGAN MARHUN</th>
<th colspan="8">KETERANGAN MARHUN</th>
</tr>
<tr>
<td><b>BIL</b></td>
<td><b>JENIS MARHUN</b></td>
<td><b>NOTA</b></td>
<td><b>KUANTITI</b></td>
<td><b>KARAT</b></td>
<td><b>HARGA(RM/g)</b></td>
@@ -600,6 +583,7 @@
echo ($marhun['descpt']);
@endphp
</td>
<td>{{ $marhun_detail[$i]['nota'] }}</td>
<td>{{ $marhun_detail[$i]['bil'] }}</td>
<td>{{ $marhun_detail[$i]['karat'] }}</td>
<td>{{ $marhun_detail[$i]['harga'] }}</td>
@@ -615,11 +599,12 @@
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
@endif
@endfor
<tr>
<td colspan="2"><b>JUMLAH MARHUN KESELURUHAN</td>
<td colspan="3"><b>JUMLAH MARHUN KESELURUHAN</td>
<td>{{$gadai_detail['kuantiti']}} </td>
<td> </td>
<td> </td>
@@ -818,23 +803,17 @@
</div>
<table id="perjanjian">
<tr>
<th colspan="7"> PERJANJIAN PEMBIAYAAN AR-RAHN TAWARRUQ </th>
<th colspan="4"> PERJANJIAN PEMBIAYAAN AR-RAHN TAWARRUQ </th>
</tr>
<tr>
<td> NAMA</td>
<td> </td>
<td> {{$customer_detail['nama']}}</td>
<td> </td>
<td> </td>
<td>NO SAG </td>
<td>{{$gadai_detail['norujukan']}}</td>
</tr>
<tr>
<td> NO MYKAD</td>
<td> </td>
<td>{{$gadai_detail['nokp']}} </td>
<td> </td>
<td> </td>
<td>TARIKH PEMBIAYAAN</td>
<td>
@php
@@ -846,10 +825,7 @@
</tr>
<tr>
<td> ALAMAT</td>
<td> </td>
<td>{{$customer_detail['alamat1']}} </td>
<td> </td>
<td> </td>
<td>TARIKH MATANG</td>
<td>
@php
@@ -860,7 +836,6 @@
</td>
</tr>
<tr>
<td> </td>
<td> </td>
<td>
@php
@@ -871,24 +846,16 @@
echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
@endphp
</td>
<td> </td>
<td> </td>
<td>NILAI MARHUN</td>
<td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }} </td>
</tr>
<tr>
<td>NO TELEFON</td>
<td> </td>
<td>{{$customer_detail['telefon']}} </td>
<td> </td>
<td> </td>
<td>NILAI PEMBIAYAAN</td>
<td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
</tr>
<tr>
<td></td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td>HARGA JUALAN</td>
@@ -940,11 +907,12 @@
<table id="marhun">
<tr>
<th colspan="7">KETERANGAN MARHUN</th>
<th colspan="8">KETERANGAN MARHUN</th>
</tr>
<tr>
<td><b>BIL</b></td>
<td><b>JENIS MARHUN</b></td>
<td><b>NOTA</b></td>
<td><b>KUANTITI</b></td>
<td><b>KARAT</b></td>
<td><b>HARGA(RM/g)</b></td>
@@ -961,6 +929,7 @@
echo ($marhun['descpt']);
@endphp
</td>
<td>{{ $marhun_detail[$i]['nota'] }}</td>
<td>{{ $marhun_detail[$i]['bil'] }}</td>
<td>{{ $marhun_detail[$i]['karat'] }}</td>
<td>{{ $marhun_detail[$i]['harga'] }}</td>
@@ -976,11 +945,12 @@
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
@endif
@endfor
<tr>
<td colspan="2"><b>JUMLAH MARHUN KESELURUHAN</td>
<td colspan="3"><b>JUMLAH MARHUN KESELURUHAN</td>
<td>{{$gadai_detail['kuantiti']}} </td>
<td> </td>
<td> </td>