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

Merge remote-tracking branch 'origin' into afiqhamzah-feat-mykad-reader-registration

Browse Source
This commit is contained in:
afiq.hamzah
2023-03-16 16:43:19 +08:00
parent 9adccf5728 27b0bdbd56
commit e620fd9ecf
8 changed files with 108 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+7 -2
View File
@@ -329,7 +329,7 @@ class GadaianController extends Controller
public function resit($id)
{
$auth_user = Auth::user();
$totaltransaction = 0;
$transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/id/'. $id)->json();
@@ -347,7 +347,12 @@ class GadaianController extends Controller
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info'));
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $transaction['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
}
public function resitansurans($id)
resources/views/customers/info.blade.php
+25 -8
View File
@@ -370,7 +370,7 @@
<div class="mr-5 form-group float-right">
<button type="button" class="btn btn-primary" onclick="kemaskinifunc()" id="btnkemaskini">Ubah</button>
<button type="button" class="btn btn-primary" onclick="kemaskinipelanggan()" id="btnsave">Terima</button>
<button type="button" class="btn btn-primary" id="btnotp">Daftar Akaun Online</button>
{{-- <button type="button" class="btn btn-primary" id="btnotp">Daftar Akaun Online</button> --}}
</div>
</div>
<div class="modal-footer">
@@ -753,7 +753,7 @@
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
if(gadai_detail["bakihargajualan"] == null){
if(gadai_detail['taglel'] == 1){
var taglel = 'Akan Dilelong';
var taglel = '<b class="text-danger">Akan Dilelong</b>';
}else{
var taglel = '';
}
@@ -769,7 +769,7 @@
]).draw();
}else{
if(gadai_detail['taglel'] == 1){
var taglel = 'Akan Dilelong';
var taglel = '<b class="text-danger">Akan Dilelong</b>';
}else{
var taglel = '';
}
@@ -2333,11 +2333,28 @@
success: function(success){
$('#btnsave').css('display','none');
$('#btnotp').show();
Swal.fire({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan'
})
if(success == 1){
Swal.fire({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan',
allowEscapeKey : false,
allowOutsideClick: false,
}).then((result) => {
if (result.isConfirmed) {
location.reload();
}
});
}else{
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Tidak berjaya mengemaskini maklumat pelanggan',
allowEscapeKey : false,
allowOutsideClick: false,
});
}
},
error: function (request, status, error) {
alert(request.responseText);
resources/views/homepage/khazanah/home.blade.php
+39 -12
View File
@@ -403,7 +403,42 @@
"jumlahkeping": "0"
},
success: function (data) {
console.log(data);
if(data == 0){
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Tidak berjaya mengemaskini denominasi',
allowEscapeKey : false,
allowOutsideClick: false,
}).then((result) => {
if (result.isConfirmed) {
$('#editbtn').removeClass('d-none');
$('#tutupbtn').removeClass('d-none');
$('#simpanbtn').addClass('d-none');
$('#batalbtn').addClass('d-none');
$('.editfunc').prop('readonly', true);
}
});
}else{
Swal.fire({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini denominasi',
allowEscapeKey : false,
allowOutsideClick: false,
}).then((result) => {
if (result.isConfirmed) {
$('#editbtn').removeClass('d-none');
$('#tutupbtn').removeClass('d-none');
$('#simpanbtn').addClass('d-none');
$('#batalbtn').addClass('d-none');
$('.editfunc').prop('readonly', true);
location.reload();
}
});
}
}
});
}
@@ -646,20 +681,12 @@
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Simpan'
}).then((result) => {
}).then(async (result) => {
if (result.isConfirmed) {
let savedata = await saveData();
saveData();
$('#editbtn').removeClass('d-none');
$('#tutupbtn').removeClass('d-none');
$('#simpanbtn').addClass('d-none');
$('#batalbtn').addClass('d-none');
$('.editfunc').prop('readonly', true);
location.reload();
} else if (result.isDismissed) {
}
resources/views/khazanah/info.blade.php
+24 -8
View File
@@ -359,7 +359,7 @@
<div class="mr-5 form-group float-right">
<button type="button" class="btn btn-primary" onclick="kemaskinifunc()" id="btnkemaskini">Ubah</button>
<button type="button" class="btn btn-primary" onclick="kemaskinipelanggan()" id="btnsave">Terima</button>
<button type="button" class="btn btn-primary" id="btnotp">Daftar Akaun Online</button>
{{-- <button type="button" class="btn btn-primary" id="btnotp">Daftar Akaun Online</button> --}}
</div>
</div>
<div class="modal-footer">
@@ -510,7 +510,7 @@
var urlroute = '{{ route("penebusan.khazanah", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
if(gadai_detail['taglel'] == 1){
var taglel = 'Akan Dilelong';
var taglel = '<b class="text-danger">Akan Dilelong</b>';
}else{
var taglel = '';
}
@@ -608,7 +608,7 @@
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Lelongan telah dibayar!'
text: 'Lelongan telah Dituntut!'
});
}
@@ -1254,11 +1254,27 @@
success: function(success){
$('#btnsave').css('display','none');
$('#btnotp').show();
Swal.fire({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan'
})
if(success == 1){
Swal.fire({
icon: 'success',
title: 'Berjaya',
text: 'Berjaya mengemaskini maklumat pelanggan'
}).then((result) => {
if (result.isConfirmed) {
location.reload();
}
});
}else{
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Tidak berjaya mengemaskini maklumat pelanggan',
allowEscapeKey : false,
allowOutsideClick: false,
});
}
},
error: function (request, status, error) {
alert(request.responseText);
resources/views/layouts/app.blade.php
+2 -2
View File
@@ -304,8 +304,8 @@
</div>
@php
$gadaiNumber = $gadai == null ? '0' : count($gadaiNumber);
$listSerahNumber = $listserah == null ? '0' : count($listserah);
$gadaiNumber = isset($gadai) == false ? '0' : count($gadai);
$listSerahNumber = isset($listserah) == false ? '0' : count($listserah);
if($auth_user['role_harian'] == 'teller')
{
resources/views/penebusan/index-khazanah.blade.php
+4 -4
View File
@@ -259,7 +259,7 @@
<div class="col-6" id="divbakipinjaman">
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN BARU(RM)
<b>PEMBIAYAAN BARU(RM)</b>
</div>
<div class="col-8 input-group mb-2">
<input type="text" placeholder="0.00" id="bakipinjaman" class="form-control" readonly/>
@@ -273,7 +273,7 @@
<div class="col-6" id="divperludibayar">
<div class="form-group row">
<div class="col-4">
PERLU DIBAYAR(RM)
<b>PERLU DIBAYAR(RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayar" onkeyup="bayarkey(this)" class="form-control" readonly/>
@@ -286,7 +286,7 @@
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN BARU(RM)
<b>PEMBIAYAAN BARU(RM)</b>
</div>
@php
$percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
@@ -302,7 +302,7 @@
<div class="col-6" id="divbayaranditerima">
<div class="form-group row">
<div class="col-4">
BAYARAN DITERIMA(RM)
<b>BAYARAN DITERIMA(RM)</b>
</div>
<div class="col-4">
<input type="text" id="bayaranditerima" class="form-control" readonly/>
resources/views/penebusan/index.blade.php
+6 -6
View File
@@ -247,7 +247,7 @@
<div class="col-6">
<div class="form-group row" id="divbayaran">
<div class="col-4">
BAYARAN PELANGGAN(RM)
<b>BAYARAN PELANGGAN(RM)</b>
</div>
<div class="col-8">
<input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
@@ -266,7 +266,7 @@
</diV>
<div class="form-group row" id="divperludibayartawarruq">
<div class="col-4">
PERLU DIBAYAR(RM)
<b>PERLU DIBAYAR(RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayartawarruq" class="form-control" readonly/>
@@ -285,7 +285,7 @@
<div class="col-6" id="divbakipinjaman">
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN BARU(RM)
<b>PEMBIAYAAN BARU(RM)</b>
</div>
<div class="col-8 input-group mb-2">
<input type="text" placeholder="0.00" id="bakipinjaman" class="form-control" readonly/>
@@ -299,7 +299,7 @@
<div class="col-6" id="divperludibayar">
<div class="form-group row">
<div class="col-4">
PERLU DIBAYAR(RM)
<b>PERLU DIBAYAR(RM)</b>
</div>
<div class="col-8">
<input type="text" id="perludibayar" onkeyup="bayarkey(this)" class="form-control" readonly/>
@@ -312,7 +312,7 @@
<div class="form-group row">
<div class="col-4">
PEMBIAYAAN BARU(RM)
<b>PEMBIAYAAN BARU(RM)</b>
</div>
@php
if($gadai['bakipjm'] != 0){
@@ -333,7 +333,7 @@
<div class="col-6" id="divbayaranditerima">
<div class="form-group row">
<div class="col-4">
BAYARAN DITERIMA(RM)
<b>BAYARAN DITERIMA(RM)</b>
</div>
<div class="col-4">
<input type="text" id="bayaranditerima" class="form-control" readonly/>
resources/views/print/notistuntutbaki.blade.php
+1 -1
View File
@@ -254,7 +254,7 @@
<p align="justify">Jika tuan/puan gagal menuntut wang lebihan (sekiranya ada) dalam masa empat bulan dari tarikh surat ini, wang lebihan tersebut akan diserahkan kepada Akauntan
Negara (Seksyen 25(1) Akta Pemegang Pajak Gadai 1992). Tuan/puan diminta membawa Kad Pengenalan dan Surat Akuan Gadaian semasa membuat tuntutan wang tersebut.
Negara (Seksyen 25(1) Akta Pemegang Pajak Gadai 1992). Tuan/puan diminta membawa <b>Kad Pengenalan dan Surat Akuan Gadaian</b> semasa membuat tuntutan wang tersebut.
</p>
<br>
<p>Sekian, terima kasih.</p>