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

'fix'

Browse Source
This commit is contained in:
LAPTOP-DGCU80CH\user1
2020-11-08 15:58:31 +08:00
parent 0b35f899a1
commit b50b8b5109
6 changed files with 242 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+4 -3
View File
@@ -29,7 +29,8 @@ class CustomersController extends Controller
$search = false;
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('customers.index',compact('search','cawangan_info'));
$bank = Http::get(config('api.url') . '/api/bank')->json();
return view('customers.index',compact('search','cawangan_info','bank'));
}
public function info(){
@@ -43,7 +44,7 @@ class CustomersController extends Controller
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$bank = Http::get(config('api.url') . '/api/bank')->json();
$customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
if($customers_info){
$customer_info = $customers_info[0];
@@ -56,7 +57,7 @@ class CustomersController extends Controller
Session::put('customer_info',$customer_info);
return redirect()->route('customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info]);
}else{
return view('customers.index',compact('customer_info','search','noic','cawangan_info'));
return view('customers.index',compact('customer_info','search','noic','cawangan_info','bank'));
}
}
app/Http/Controllers/GadaianController.php
+6 -1
View File
@@ -31,9 +31,14 @@ class GadaianController extends Controller
// $limit_pinjaman_semasa = $customer_info['limit_pinjaman'] - $customer_info['pinjaman_semasa'];
$limit_pinjaman_semasa = 0;
$auth_user = Auth::user();
$gadai_transaction = sizeof(Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json());
$gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
$new_transaction = sprintf("%04d",$gadai_transaction+1);
$norujukan = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
$gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
'norujukan' => $norujukan,
'nopelanggan' => $customer_info['nopelanggan'],
'nokp' => $noic
]);
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('gadaian.index',compact('customer_info','limit_pinjaman_semasa','cawangan_info','norujukan'));
}
resources/views/customers/index.blade.php
+45 -32
View File
@@ -56,9 +56,9 @@
<div class="col-md-4">Poskod</div>
<div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off"></div>
<div class="col-md-4">Daerah</div>
<div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" autocomplete="off"></div>
<div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
<div class="col-md-4">Negeri</div>
<div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" autocomplete="off"></div>
<div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
<div class="col-md-4">No Telefon 1</div>
<div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off"></div>
<div class="col-md-4">No Telefon 2</div>
@@ -84,6 +84,7 @@
<div class="col-md-4">Agama</div>
<div class="col-md-8">
<select class="form-control" name="agama" id="agama">
<option disabled selected value> -- Pilih Agama -- </option>
<option value="islam">Islam</option>
<option value="hindu">Hindu</option>
<option value="buddha">Buddha</option>
@@ -91,11 +92,12 @@
<option value="lain">Lain-lain</option>
</select>
</div>
<div class="col-md-4">Kumpulan PKINK/Ahli Sahabat</div>
<div class="col-md-4">Ahli</div>
<div class="col-md-8">
<select class="form-control" name="kumpulan_sahabat" id="kumpulan_sahabat">
<option value="0">Tidak</option>
<option value="1">Ya</option>
<option value="tidak">Tidak</option>
<option value="PKINK">Kumpulan PKINK</option>
<option value="sahabat">Sahabat</option>
</select>
</div>
</div>
@@ -122,6 +124,7 @@
<div class="col-md-4">Bangsa</div>
<div class="col-md-8">
<select class="form-control" name="bangsa" id="bangsa">
<option disabled selected value> -- Pilih Bangsa -- </option>
<option value="melayu">Melayu</option>
<option value="cina">Cina</option>
<option value="india">India</option>
@@ -129,7 +132,13 @@
</select>
</div>
<div class="col-md-4">Bank</div>
<div class="col-md-8"><select class="select2" name="bank_name" data-placeholder="Pilih Bank" id="bank_name"></select></div>
<div class="col-md-8">
<select class="form-control" name="bank_name" data-placeholder="Pilih Bank" id="bank_name">
@foreach($bank as $banks)
<option value="{{ $banks['abbreviation'] }}">{{ $banks['name'] }}</option>
@endforeach
</select>
</div>
<div class="col-md-4">No Akaun Bank</div>
<div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="no_akaun"></div>
</div>
@@ -149,36 +158,14 @@
</div>
</div>
<script>
var bank_name = [];
$(document).ready(function(){
var noic = $('#noic').val();
identifyIC(noic);
console.log(bank_name);
$('#bank_name').select2({
ajax:{
url:'http://localhost:8000/api/bank',
type:'get',
dataType:'json',
processResult:function(data){
return{
results: $.each(data,function(index,bank){
return{
text: bank.text,
id:bank.id
}
})
}
}
cache:true
}
});
});
$(document).on("click", ".browse", function() {
var file = $(this).parents().find(".file");
file.trigger("click");
@@ -195,6 +182,34 @@
// read the image file as a data URL.
reader.readAsDataURL(this.files[0]);
});
$('#poskod').change(function(){
var poskod = this.value;
$.ajax({
method:'GET',
url:'http://localhost:8000/api/poskod/'+poskod,
success:function(poskod_detail){
// console.log(poskod_detail);
var koddaerah = poskod_detail['koddaerah'];
var kodnegeri = poskod_detail['kodnegeri'];
$.ajax({
url:'http://localhost:8000/api/negeri/'+kodnegeri,
method:'GET',
success:function(negeri){
$('#negeri').val(negeri['negeri']);
}
});
$.ajax({
url:'http://localhost:8000/api/daerah/'+koddaerah,
method:'GET',
success:function(daerah){
$('#daerah').val(daerah['namadaerah']);
}
});
}
});
});
function identifyIC(noic){
@@ -205,8 +220,6 @@
var nl = noic.slice(6,8);
var last_ic = noic.slice(8,12);
console.log(last_ic);
var now = new Date().getFullYear().toString();
var decade = now.substr(0, 2);
resources/views/customers/info.blade.php
+14 -4
View File
@@ -104,7 +104,13 @@
</div>
</div>
<script>
var tablegadai = $('#myTable').DataTable();
var tablegadai = $('#myTable').DataTable({
"scrollX": true
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
})
function gadaiTable(data){
var counter = 1;
tablegadai.clear().draw();
@@ -114,10 +120,14 @@
counter,
gadai_detail['norujukan'],
gadai_detail['t_gadai'],
'RM '+ gadai_detail['pinjaman'].toLocaleString("en-GB"),
'RM '+ gadai_detail['nilaimarhun'].toLocaleString("en-GB"),
'RM '+formatter.format(gadai_detail['pinjaman']),
'RM '+ formatter.format(gadai_detail['nilaimarhun']),
'0',
'RM '+ parseFloat(((gadai_detail['kadarupah']/100)*gadai_detail['pinjaman']*gadai_detail['tempoh']).toLocaleString("en-GB")).toFixed(2)
'RM '+ formatter.format((gadai_detail['kadarupah']/100)*gadai_detail['pinjaman']*gadai_detail['tempoh']),
gadai_detail['t_matang'],
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
'RM ' + formatter.format((Number(gadai_detail['kadarupah'])*Number(gadai_detail['pinjaman'])).toFixed(2)),
''
]).draw();
counter = counter + 1;
resources/views/gadaian/index.blade.php
+171 -71
View File
@@ -3,7 +3,7 @@
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<div class="col-md-12 col-lg-12">
<h3 class="text-center text-uppercase">gadaian</h3>
<div class="form-group row col-12">
<div class="col-6">
@@ -88,55 +88,64 @@
<div class="col-12 form-group row">
<div class="col-4">
<div class="form-group row">
<div class="col-4">
PINJAMAN MAX
<div class="col-5">
Pinjaman Max
</div>
<div class="col-8">
<div class="col-7 input-group">
<input type="text" class="form-control" readonly name="pinjaman_max_teller" id="pinjaman_max_teller">
<div class="input-group-append">
<span class="input-group-text span-pinjaman-max"></span>
</div>
</div>
</diV>
</div>
<div class="col-4">
<div class="col-3">
<div class="form-group row">
<div class="col-4">
UPAH SEBULAN
<div class="col-6">
Upah Sebulan
</div>
<div class="col-8">
<div class="col-6">
<input type="text" class="form-control" readonly name="upah_sebulan" id="upah_sebulan">
</div>
</diV>
</div>
<div class="col-4">
<div class="col-5">
<div class="form-group row">
</diV>
</div>
<div class="col-4">
<div class="form-group row">
<div class="col-4">
PINJAMAN
<div class="col-5">
Pinjaman
</div>
<div class="col-8">
<div class="col-7 input-group">
<input type="text" class="form-control" name="pinjaman" id="pinjaman">
<div class="input-group-append">
<span class="input-group-text span-pinjaman">0 %</span>
</div>
</div>
</diV>
</div>
<div class="col-4">
<div class="col-3">
<div class="form-group row">
<div class="col-4">
UPAH 6 BULAN
<div class="col-6">
Upah 6 Bulan
</div>
<div class="col-8">
<div class="col-6">
<input type="text" class="form-control" readonly name="upah_6bln" id="upah_6bln">
</div>
</diV>
</div>
<div class="col-4">
<div class="col-5">
<div class="form-group row">
<div class="col-4">
PINJAMAN MAX PELULUS
<div class="col-6">
Pinjaman Max Pelulus
</div>
<div class="col-8">
<div class="col-6 input-group">
<input type="text" class="form-control" readonly name="pinjaman_max_pelulus" id="pinjaman_max_pelulus">
<div class="input-group-append">
<span class="input-group-text span-pinjaman-max-pelulus"></span>
</div>
</div>
</diV>
</div>
@@ -163,7 +172,7 @@
<div class="form-group row">
<input type="hidden" name="kodcaw" id="kodcaw" value="">
<div class="col-md-4">No Rujukan</div>
<div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhun" id="norujukan_marhun" value=""></div>
<div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhun" id="norujukan_marhun" value="{{ $norujukan }}"></div>
<div class="col-md-4">Marhun</div>
<div class="col-md-8">
<select class="form-control" name="marhun" id="marhun">
@@ -218,7 +227,7 @@
<div class="modal-footer">
<div class="form-group row">
<input class="btn btn-primary mr-2" type="button" name="tambah_marhun" id="tambah_marhun" value="Tambah">
<input class="btn btn-primary mr-2" type="submit" name="terima_marhun" id="terima_marhun" value="Terima">
<input class="btn btn-primary mr-2" type="button" name="terima_marhun" id="terima_marhun" value="Terima">
<button type="button" class="btn btn-danger" name="batal_marhun" id="batal_marhun">Batal</button>
</div>
</div>
@@ -230,17 +239,11 @@
</div>
</div>
<script>
function disableF5(e) { if ((e.which || e.keyCode) == 116) e.preventDefault(); };
$(document).ready( function () {
$(document).on("keydown", disableF5);
var norujukan = $('#norujukan').val();
$.ajax({
method:'GET',
url:'http://localhost:8000/api/marhun/'+norujukan,
success:function(data){
marhuntable(data);
}
});
getMarhun(norujukan);
$.ajax({
method:'GET',
@@ -264,6 +267,16 @@
});
});
function getMarhun(norujukan){
$.ajax({
method:'GET',
url:'http://localhost:8000/api/marhun/'+norujukan,
success:function(data){
marhuntable(data);
}
});
}
$('#karat').change(function(){
var karat = this.value;
karat = karat.replace(/\./g,'-');
@@ -296,8 +309,8 @@
success:function(data){
var nilai_marhun = data['harga2'] * berat;
$('#harga').val(data['harga2']);
$('#nilai_marhun').val(nilai_marhun);
$('#harga').val(formatter.format(data['harga2']));
$('#nilai_marhun').val(formatter.format(nilai_marhun));
}
})
}
@@ -313,10 +326,13 @@
allowClear: true,
closeOnSelect: false
});
var total_nilai_marhun = 0;
var total_berat = 0;
var kadarupah = 0;
var marhun_details = '';
var jumlah_marhun = 0;
var jumlah_nilai_marhun = 0;
function marhuntable(data){
var counter = 1;
total_nilai_marhun = 0;
@@ -329,22 +345,40 @@
marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +",";
tablemarhun.row.add([
counter,
marhun_detail['bil'],
marhun_detail['marhun'],
" ",
marhun_detail['n_marhun'],
'RM ' + formatter.format(marhun_detail['n_marhun']),
marhun_detail['karat'],
marhun_detail['berat'],
formatter.format(marhun_detail['berat']),
marhun_detail['nota']
]).draw();
counter = counter + 1;
});
});
var max_teller = total_nilai_marhun * 0.7;
var max_pelulus = total_nilai_marhun * 0.75;
var pinjaman_pelulus = 0;
var pinjaman_teller = 0;
$.ajax({
method:'GET',
url:'http://localhost:8000/api/maxpinjaman',
success:function(data){
$.each(data,function(index,pinjaman){
if(pinjaman['user_type'] == 'teller'){
pinjaman_teller = pinjaman['max'];
}
if(pinjaman['user_type'] == 'ppc'){
pinjaman_pelulus = pinjaman['max'];
}
});
$('.span-pinjaman-max-pelulus').text(pinjaman_pelulus + ' %');
$('.span-pinjaman-max').text(pinjaman_teller + ' %');
}
});
var max_teller = total_nilai_marhun * (pinjaman_teller/100);
var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100);
$('#pinjaman_max_teller').val(max_teller.toFixed(2));
$('#pinjaman_max_pelulus').val(max_pelulus.toFixed(2));
$('#pinjaman_max_teller').val(formatter.format(max_teller.toFixed(2)));
$('#pinjaman_max_pelulus').val(formatter.format(max_pelulus.toFixed(2)));
}
$('#pinjaman').change(function(){
@@ -361,8 +395,66 @@
var upah_sebulan = pinjaman * kadarupah;
var upah_6bln = upah_sebulan * 6;
$('#upah_sebulan').val(upah_sebulan.toFixed(2));
$('#upah_6bln').val(upah_6bln.toFixed(2));
percent_pinjaman = Number(pinjaman)/Number(total_nilai_marhun);
$('.span-pinjaman').text(percent_pinjaman.toFixed(2) + ' %');
$('#upah_sebulan').val(formatter.format(upah_sebulan.toFixed(2)));
$('#upah_6bln').val(formatter.format(upah_6bln.toFixed(2)));
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
$('#terima_marhun').click(function(){
var kodcaw = $('#kodcaw').val();
var norujukan = $('#norujukan').val();
var marhun = $('#marhun').val();
var karat = $('#karat').val();
var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val();
var nilaimarhun = $('#nilai_marhun').val();
var nota_array = $('#nota').val();
if(marhun == null && karat == null && berat_emas == null){
$('#daftar_marhun').modal('hide');
}
else{
$.ajax({
method:'POST',
url:'http://localhost:8000/api/marhun/'+kodcaw,
dataType:'json',
data:{
'norujukan': norujukan,
'marhun' : marhun,
'nota':nota,
'karat' : karat,
'berat_emas' :berat_emas,
'harga' : harga,
'nilai_marhun' : nilai_marhun
},
success:function(data){
alert('Tambah Marhun Berjaya');
$('#nota').val('').trigger("change");
$('#marhun').val(0);
$('#karat').val(0);
$('#berat_emas').val("");
$('#harga').val("");
$('#nilai_marhun').val("");
jumlah_marhun += 1;
jumlah_nilai_marhun += Number(nilai_marhun);
$('#bilangan_marhun').val(jumlah_marhun);
$('#jumlah_nilai_marhun').val(jumlah_nilai_marhun);
getMarhun(norujukan);
$('#daftar_marhun').modal('hide');
},
error: function(xhRequest, ErrorText, thrownError){
alert('Tambah Marhun Tidak Berjaya');
console.log(xhRequest);
}
});
}
});
$('#tambah_marhun').click(function(){
@@ -372,7 +464,10 @@
var karat = $('#karat').val();
var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val();
var nilai_marhun = $('#nilai_marhun').val();
var nilaimarhun = $('#nilai_marhun').val();
var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
var nota_array = $('#nota').val();
var nota = nota_array.toString();
$.ajax({
method:'POST',
@@ -381,6 +476,7 @@
data:{
'norujukan': norujukan,
'marhun' : marhun,
'nota':nota,
'karat' : karat,
'berat_emas' :berat_emas,
'harga' : harga,
@@ -388,11 +484,18 @@
},
success:function(data){
alert('Tambah Marhun Berjaya');
$('#nota').val('').trigger("change");
$('#marhun').val(0);
$('#karat').val(0);
$('#berat_emas').val("");
$('#harga').val("");
$('#nilai_marhun').val("");
jumlah_marhun += 1;
jumlah_nilai_marhun += Number(nilai_marhun);
$('#bilangan_marhun').val(jumlah_marhun);
$('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
getMarhun(norujukan);
},
error: function(xhRequest, ErrorText, thrownError){
alert('Tambah Marhun Tidak Berjaya');
@@ -408,36 +511,33 @@
var bangsa = $('#bangsa').val();
var nopelanggan = $('#nopelanggan').val();
var norujukan = $('#norujukan').val();
var pinjaman = $('#pinjaman').val();
var pinjaman = Number($('#pinjaman').val());
var percentpinj = Number(pinjaman)/Number(total_nilai_marhun);
// console.log(kodcaw,nokp,jantina,bangsa,nopelanggan,norujukan,pinjaman,percentpinj);
// $.ajax({
// method:'POST',
// url: 'http://localhost:8000/api/gadai/'+kodcaw,
// dataType:'json',
// data:{
// 'kodcaw': kodcaw,
// 'norujukan' : norujukan,
// 'nopelanggan' : nopelanggan,
// 'nokp' : nokp,
// 'nilaimarhun' : total_nilai_marhun.toFixed(2),
// 'berat' : total_berat,
// 'pinjaman' : pinjaman.toFixed(2),
// 'kadarupah' : kadarupah
// 'marhun' : marhun_details,
// 'jantina' : jantina,
// 'bangsa' : bangsa,
// 'percentpinj' : percentpinj.toFixed(2)
// },
// success:function(data){
// alert('Gadai Berjaya');
// },
// error: function(xhRequest, ErrorText, thrownError){
// alert('Gadai Tidak Berjaya');
// console.log(xhRequest);
// }
// });
$.ajax({
method:'PUT',
url: 'http://localhost:8000/api/gadai/norujukan/'+kodcaw+'/'+norujukan,
dataType:'json',
data:{
'kodcaw': kodcaw,
'nilaimarhun' : total_nilai_marhun.toFixed(2),
'berat' : total_berat,
'pinjaman' : pinjaman.toFixed(2),
'kadarupah' : kadarupah,
'marhun' : marhun_details,
'jantina' : jantina,
'bangsa' : bangsa,
'percentpinj' : percentpinj.toFixed(2)
},
success:function(data){
alert('Gadai Berjaya');
},
error: function(xhRequest, ErrorText, thrownError){
alert('Gadai Tidak Berjaya');
console.log(xhRequest);
}
});
})
</script>
@endsection
resources/views/layouts/app.blade.php
+2 -2
View File
@@ -27,10 +27,10 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
<link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script src="{{ asset('js/jquery.min.js') }}"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script src="{{ asset('js/select2.min.js') }}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/numeral.js/2.0.6/numeral.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@10"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
<script src="{{ asset('vendor/DataTables/datatables.min.js') }}"></script>