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 fixkaunter

Browse Source
This commit is contained in:
fifi97
2022-03-16 10:32:11 +08:00
parent d331b31db3 7043c87e5e
commit bb465edb97
46 changed files with 1570 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/gadaian.blade.php
+7 -7
View File
@@ -116,9 +116,9 @@
<td>{{ $index+1 }}</td>
<td>
@php
$marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
$marhun = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
@endphp
<a style="user-select: none;" href="#" data-toggle="modal" data-berat="{{$gadaian['berat']}}" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}"
<a style="user-select: none;" href="#" data-toggle="modal" data-berat="{{$gadaian['berat']}}" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}"
data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
</td>
<td>{{ number_format($gadaian['pinjaman'],2) }}</td>
@@ -141,7 +141,7 @@
</div>
</div>
<table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
<thead class="thead-dark">
<thead class="thead-dark">
<tr>
<th>Bil</th>
<th>No Rujukan</th>
@@ -159,7 +159,7 @@
<td>{{ $index+1 }}</td>
<td>
@php
$marhun_detail = Http::get($api_url . '/api/marhun/' . $marhun['norujukan'] )->json();
$marhun_detail = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/marhun/' . $marhun['norujukan'] )->json();
@endphp
<a href="#" data-toggle="modal" data-berat="{{$marhun['berat']}}" data-marhun="{{ json_encode($marhun_detail) }}" data-norujukan="{{$marhun['norujukan']}}" data-hargajualan="{{$marhun['hargajualan']}}" data-kodcaw="{{ $marhun['kodcaw'] }}" data-target="#marhunModal"> {{$marhun['norujukan']}}</a>
</td>
@@ -181,7 +181,7 @@
<input class="form-control col-md-3" type="text" value="{{ number_format($total_nm,2) }}" readonly/>
</div>
</div>
</div>
<div class="row mt-2 d-flex justify-content-end">
<a href="{{ route('laporanscanbarcode') }}" target="_blank" class="btn btn-info mr-md-2">Rekod Barcode Gadaian</a>
@@ -200,7 +200,7 @@
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
//modal
var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({
@@ -228,7 +228,7 @@
$(document).ready(function(){
$('#norujukan_barcode').focus();
})
$('#marhunModal').on('show.bs.modal', function(event) {
var button = $(event.relatedTarget); // button yg trigger
var arraymarhun = button.data('marhun');
resources/views/khazanah/index.blade.php
+26 -26
View File
@@ -134,7 +134,7 @@
<div class="col-md-8">
<select class="form-control" name="bank_name" data-placeholder="Pilih Bank" id="bank_name">
<option disabled selected value> -- Pilih Bank -- </option>
@foreach($bank as $banks)
@foreach($bank as $banks)
<option value="{{ $banks['abbreviation'] }}">{{ $banks['name'] }}</option>
@endforeach
</select>
@@ -143,24 +143,24 @@
<div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="no_akaun" placeholder="No Akaun Bank"></div>
<div class="col-md-4">Tujuan Gadai</div>
@php
$tujuangadai = Http::get($api_url . '/api/tujuangadai')->json();
$tujuangadai = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/tujuangadai')->json();
@endphp
<div class="col-md-8">
<select class="form-control" name="tujuan_gadai" data-placeholder="Pilih Tujuan Gadai" id="tujuan_gadai">
<option disabled selected value> -- Pilih Tujuan Gadai -- </option>
@foreach($tujuangadai as $tujuan)
@foreach($tujuangadai as $tujuan)
<option value="{{ $tujuan['keterangan'] }}">{{ $tujuan['keterangan'] }}</option>
@endforeach
</select>
</div>
<div class="col-md-4">Pekerjaan</div>
@php
$pekerjaan = Http::get($api_url . '/api/pekerjaan')->json();
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<div class="col-md-8">
<select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="pekerjaan">
<option disabled selected value> -- Pilih Pekerjaan -- </option>
@foreach($pekerjaan as $kerja)
@foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
@endforeach
</select>
@@ -170,7 +170,7 @@
</div>
</div>
</div>
</div>
<div class="modal-footer">
<input type="text" hidden name="idtype" value="nokp">
@@ -256,7 +256,7 @@
<div class="col-md-8">
<select class="form-control" name="bank_name" data-placeholder="Pilih Bank" id="passport_bank_name">
<option disabled selected value> -- Pilih Bank -- </option>
@foreach($bank as $banks)
@foreach($bank as $banks)
<option value="{{ $banks['abbreviation'] }}">{{ $banks['name'] }}</option>
@endforeach
</select>
@@ -265,24 +265,24 @@
<div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="passport_no_akaun" placeholder="No Akaun Bank"></div>
<div class="col-md-4">Tujuan Gadai</div>
@php
$tujuangadai = Http::get($api_url . '/api/tujuangadai')->json();
$tujuangadai = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/tujuangadai')->json();
@endphp
<div class="col-md-8">
<select class="form-control" name="tujuan_gadai" data-placeholder="Pilih Tujuan Gadai" id="passport_tujuan_gadai">
<option disabled selected value> -- Pilih Tujuan Gadai -- </option>
@foreach($tujuangadai as $tujuan)
@foreach($tujuangadai as $tujuan)
<option value="{{ $tujuan['keterangan'] }}">{{ $tujuan['keterangan'] }}</option>
@endforeach
</select>
</div>
<div class="col-md-4">Pekerjaan</div>
@php
$pekerjaan = Http::get($api_url . '/api/pekerjaan')->json();
$pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json();
@endphp
<div class="col-md-8">
<select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="passport_pekerjaan">
<option disabled selected value> -- Pilih Pekerjaan -- </option>
@foreach($pekerjaan as $kerja)
@foreach($pekerjaan as $kerja)
<option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
@endforeach
</select>
@@ -326,19 +326,19 @@
event.preventDefault();
return false;
}
});
function calculatePassportAge(){
var passport_lahir = $('#passport_tarikh_lahir').val();
var passport_lahir = $('#passport_tarikh_lahir').val();
var split_date = passport_lahir.split('/');
var count_leap_year = countLeapYears(split_date[2],split_date[1],split_date[0]) - 1;
var start = new Date(split_date[2] + '-' + split_date[1] + '-' + split_date[0]),
end = new Date(),
diff = new Date(end - start),
var start = new Date(split_date[2] + '-' + split_date[1] + '-' + split_date[0]),
end = new Date(),
diff = new Date(end - start),
days = ((diff/1000/60/60/24)- count_leap_year)/365;
var age = parseInt(days);
$('#passport_age').val(age);
}
@@ -363,7 +363,7 @@
$('#warganegara').prop('checked',true);
}
});
$(document).on("click", ".browse", function() {
var file = $(this).parents().find(".file");
file.trigger("click");
@@ -677,7 +677,7 @@
}
return true;
}
function identifyIC(noic){
if(noic.match(/^(\d{2})(\d{2})(\d{2})-?\d{2}-?\d{4}$/)) {
var year = noic.slice(0,2);
@@ -757,12 +757,12 @@
var tarikh_lahir_test = date.getFullYear() + '-' + month + '-' + day;
var count_leap_year = countLeapYears(date.getFullYear(),month,day) - 1;
var start = new Date(tarikh_lahir_test),
end = new Date(),
diff = new Date(end - start),
var start = new Date(tarikh_lahir_test),
end = new Date(),
diff = new Date(end - start),
days = ((diff/1000/60/60/24)- count_leap_year)/365;
var age = parseInt(days);
$('#age').val(age);
var tarikh_lahir = day + '/' + month + '/' + date.getFullYear();
@@ -803,7 +803,7 @@
return leapYearCount;
}
var regex = /^[a-zA-Z0-9]+$/g;
function verifynokp(){
var id_type = $('#customerIDType').val();
var nokp = $('#noic').val();
resources/views/khazanah/info.blade.php
+43 -43
View File
@@ -10,7 +10,7 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12 col-lg-12">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -18,7 +18,7 @@
<li class="breadcrumb-item active" aria-current="page">Pelanggan</li>
</ol>
</nav>
<div class="form-group row col-md-12">
<div class="col-md-6">
<div class="form-group row">
@@ -54,7 +54,7 @@
</div>
<div class="col-md-8">
@php
$outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa/'.$cawangan_info['kodcaw'])->json();
$outstanding_semasa = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa/'.$cawangan_info['kodcaw'])->json();
@endphp
<input type="text" class="form-control" name="outstanding_semasa" id="outstanding_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
</div>
@@ -84,7 +84,7 @@
</div>
<div class="col-md-6">
<div class="form-group row">
<div class="col-md-4">
<b>No Telefon</b>
@@ -102,7 +102,7 @@
<input type="text" class="form-control" name="nota_semasa" id="nota_semasa" readonly value="{{ $customer_info['nota'] }}">
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<b>Rugi Lelong</b>
@@ -191,7 +191,7 @@
</thead>
</table>
<table id="lelongTable" class="table table-striped table-hover">
<table id="lelongTable" class="table table-striped table-hover">
<thead class="thead-dark">
<tr>
<th>Bil</th>
@@ -208,8 +208,8 @@
</table>
<div class="text-center">
<button class="btn btn-primary" onclick="histfunc()">Rekod Gadaian</button>
<button class="btn btn-primary" onclick="saghilangfunc()">Surat Akuan Hilang</button>
<button class="btn btn-primary" onclick="histfunc()">Rekod Gadaian</button>
<button class="btn btn-primary" onclick="saghilangfunc()">Surat Akuan Hilang</button>
</div>
</div>
@@ -279,11 +279,11 @@
</div>
<div class='col-md-7'>
@php
$bank = Http::get($api_url . '/api/bank')->json();
$bank = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/bank')->json();
@endphp
<select class="form-control" name="kodbank" data-placeholder="Pilih Bank" id="kodbank" disabled="true">
<option value="-" selected disabled>-</option>
@foreach($bank as $banks)
@foreach($bank as $banks)
<option value="{{ $banks['abbreviation'] }}" {{ $banks['abbreviation'] == $customer_info['kodbank'] ? 'selected' : ''}}>{{ $banks['name'] }}</option>
@endforeach
</select>
@@ -323,11 +323,11 @@
</div>
<div class='col-md-8'>
@php
$poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
$poskod = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
if(empty($poskod)){
$poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
}
$daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
$daerah = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp
<input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah ? $daerah['namadaerah'] : 'NIL' }}" class='form-control'>
</div>
@@ -338,7 +338,7 @@
</div>
<div class='col-md-8'>
@php
$negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
$negeri = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
@endphp
<input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri ? $negeri['negeri'] : 'NIL' }}" class='form-control'>
</div>
@@ -358,7 +358,7 @@
<button type="button" class="btn btn-primary" onclick="kemaskinifunc()" id="btnkemaskini">Kemaskini</button>
<button type="button" class="btn btn-primary" onclick="kemaskinipelanggan()" id="btnsave">Save</button>
<button type="button" class="btn btn-primary" id="btnotp">Daftar Akaun Online</button>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
@@ -389,7 +389,7 @@
<div id="otp_generate" style="display:none;">
<div class="row form-group">
<div class="col-md-4">
OTP Token :
OTP Token :
</div>
<div class="col-md-4">
<span id="otp_number"></span>
@@ -536,7 +536,7 @@
]).draw();
}
}else if(jenistebus == "sudah_tebus"){
tabledahtebus.row.add([
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
gadai_detail['norujukan'],
@@ -615,7 +615,7 @@
$('#btnsave').css('display','none');
var noic = $("#noic").val();
$.ajax({
method:"GET",
url: api_url + "/api/customers/"+noic+"/gadai/belum_tebus/"+kodcaw,
@@ -722,7 +722,7 @@
if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
{
if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
let histid = '';
if($("input[name='options']:checked").val() == 'belum_tebus'){
histid = $('input[name="belum"]:checked').val();
@@ -747,7 +747,7 @@
}else{
$('#AGHModalEdit').modal('show');
$('#norujukanhiddenedit').val(noruj);
swal.close();
swal.close();
}
return;
@@ -795,10 +795,10 @@
title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
});
}else{
$('#AGHModal').modal('show');
$('#AGHModal').modal('show');
$('#norujukanhidden').val(histid);
}
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
@@ -808,7 +808,7 @@
}
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let histid = $('input[name="sudahtebus"]:checked').val();
Swal.fire({
icon: 'error',
title: 'Amaran',
@@ -816,16 +816,16 @@
});
}
// }else if($("input[name='options']:checked").val() == 'lelong'){
// let histid = $('input[name="sudahtebus"]:checked').val();
//
//
// Swal.fire({
// icon: 'error',
// title: 'Amaran',
// text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
// });
//
//
// }
}
@@ -845,7 +845,7 @@
});
}
});
});
$('#negeriaghedit').change(function(){
@@ -870,7 +870,7 @@
optionText = textopt;
optionValue = valueopt;
$('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
}
@@ -882,7 +882,7 @@
$('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
}
function rekodasal(gadaian){
$('#hargajualanmodal').text('RM ' + formatter.format(gadaian[0][0]['hargajualan']));
@@ -892,7 +892,7 @@
function historybayarantable(data){
var counter = 1;
historybayarandatatable.clear().draw();
$.each(data,function(index,bayaran){
@@ -900,7 +900,7 @@
urlroute = urlroute.replace(':id', bayaran['id']);
historybayarandatatable.row.add([
counter,
bayaran['created_at'],
bayaran['created_at'],
"RM " + bayaran['duit_masuk'],
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
]).draw();
@@ -935,7 +935,7 @@
var urlroute = '{{ route("resit.khazanah.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
}
break;
case 'A':
var urlroute = '{{ route("resit.khazanah.belumansurans", ":id") }}';
@@ -946,10 +946,10 @@
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
break;
}
historytebusbayaran.row.add([
counter,
tebusaz['norujukan'],
tebusaz['norujukan'],
tebusaz['jenistebus'],
tebusaz['pinjaman'],
tebusaz['jbg'],
@@ -972,11 +972,11 @@
let nokp = $('#nokpwakil').val();
let norujukan = $('#norujukanwakil').val();
$.ajax({
method:'POST',
url: "{{ route('wakil.create') }}",
data:{
data:{
"_token": "{{ csrf_token() }}",
"nopelanggan" : nopelanggan,
"nowakil" : nowakil,
@@ -1002,7 +1002,7 @@
icon: 'success',
title: 'Berjaya Mendaftar Wakil Pelanggan!'
}).then(function(){
$.ajax({
method:'put',
url: api_url + '/api/ubahwakil/' + kodcaw,
@@ -1015,7 +1015,7 @@
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Penukaran Wakil berjaya'
text: 'Penukaran Wakil berjaya'
}).then(async function(){
return true;
location.reload();
@@ -1024,13 +1024,13 @@
Swal.fire({
icon: 'info',
title: 'Pemberitahuan!',
text: 'Wakil telah didaftarkan dengan IC tersebut!'
text: 'Wakil telah didaftarkan dengan IC tersebut!'
}).then(async function(){
return true;
location.reload();
});
}
}
});
});
@@ -1077,7 +1077,7 @@
$('#notelwakil').val(data['telefon']);
$('#nopelangganwakil').val(data['nopelanggan']);
}
},error: function (request, status, error) {
console.log(request.responseText);
@@ -1260,7 +1260,7 @@
var errortelefon1 = 0;
var errortelefon2 = 0;
if(!($('#telefon').val().length >= 9 && $('#telefon').val().length < 12)){
$('#errortelefon').show();
$('#errortelefon').text("*lebih kecil dari 10 dan lebih besar dari 12");
@@ -1288,7 +1288,7 @@
$('#telefon2').removeClass('is-invalid');
errortelefon2--;
}
if(errortelefon1 <= 0 && errortelefon2 <= 0){
$('#btnkemaskini').removeClass('btn-danger');
$('#btnkemaskini').addClass('btn-primary');
@@ -1339,7 +1339,7 @@
$('#otp_form').hide();
$('#otp_generate').show();
$('#otp_number').text(otp_token['otp']);
}
}
},
error: function(xhRequest, ErrorText, thrownError){
console.log(xhRequest);
resources/views/khazanah/tebus.blade.php
+15 -15
View File
@@ -44,7 +44,7 @@
<div class="row justify-content-center">
<div class="col-md-12">
<div class="card">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -83,7 +83,7 @@
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="gadaian-semasa" role="tabpanel" aria-labelledby="gadaian-semasa-tab">
<table class='table table-striped table-hover' id='table-gadaian-semasa'>
<thead class="thead-dark">
<tr>
@@ -98,13 +98,13 @@
@foreach($listserah as $ls)
<tr>
<td>{{ $loop->iteration }}</td>
<td>
<td>
@php
$marhun = Http::get($api_url . '/api/marhun/' . $ls['norujukan'] )->json();
$marhun = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/marhun/' . $ls['norujukan'] )->json();
// dd($marhun);
@endphp
<a href="#" style="user-select: none;" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}"
<a href="#" style="user-select: none;" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}"
data-target="#marhunModal"> {{$ls['norujukan']}} </a></td>
<td>{{ $ls['teller'] }}</td>
<td>{{ $ls['jenistebus'] }}</td>
@@ -115,8 +115,8 @@
</table>
</div>
<div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
<table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
<thead class="thead-dark">
<tr>
@@ -131,13 +131,13 @@
@foreach($senaraitebus as $index)
<tr>
<td>{{$loop->iteration}}</td>
<td>
<td>
@php
$marhun = Http::get($api_url . '/api/marhun/' . $index['norujukan'] )->json();
$marhun = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/marhun/' . $index['norujukan'] )->json();
@endphp
<a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$index['norujukan']}}" data-kodcaw="{{ $index['kodcaw'] }}"
<a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$index['norujukan']}}" data-kodcaw="{{ $index['kodcaw'] }}"
data-target="#marhunModal"> {{$index['norujukan']}} </a></td>
<td></td>
<td>{{$index['jenistebus']}}</td>
@@ -150,13 +150,13 @@
</div>
<div class="row mt-5">
<div class="mx-auto">
</div>
<div class="form-group d-flex justify-content-end mr-4">
<a href="{{ url('menu') }}" class="btn btn-primary">Cetak</a>
</div>
</div>
</div>
</div>
</div>