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

Merge branch 'pipiv2' of https://gitlab.com/online-sistem1/kaunter into pipi

Browse Source
This commit is contained in:
fifi97
2021-04-09 13:40:13 +08:00
parent 565c48a50d 1c5571e1f0
commit 05716fba62
7 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
-1
View File
@@ -2011,7 +2011,6 @@ class KhazanahController extends Controller
$totalhartasemasa += $hs['amaun']; $totalhartasemasa += $hs['amaun'];
} }
$tanggungansemasa = []; $tanggungansemasa = [];
// $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
app/Http/Controllers/PenebusanController.php
+5 -4
View File
@@ -30,8 +30,9 @@ class PenebusanController extends Controller
$gadai = $gadaidetail[0][0]; $gadai = $gadaidetail[0][0];
$nilaihargasemasa = $this->tukaranhargaemas($norujukan);
return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama')); return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
} }
public function bayaransuransTawarruq(Request $request) public function bayaransuransTawarruq(Request $request)
@@ -509,10 +510,10 @@ class PenebusanController extends Controller
return 0; return 0;
} }
public function tukaranhargaemas(Request $request) public function tukaranhargaemas($norujukan)
{ {
$marhunsaglama = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); $marhunsaglama = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json();
$marhunsaglama = $marhunsaglama[0]; $marhunsaglama = $marhunsaglama[0];
$totalnilaimarhun = 0; $totalnilaimarhun = 0;
@@ -528,7 +529,7 @@ class PenebusanController extends Controller
} }
return response($totalnilaimarhun); return $totalnilaimarhun;
} }
resources/views/auth/login.blade.php
+9 -5
View File
@@ -4,20 +4,24 @@
<!-- Modal --> <!-- Modal -->
<div class="modal fade" id="forgotpasswordmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="forgotpasswordmodal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Modal title</h5> <h5 class="modal-title" id="exampleModalLabel">Forgot Password</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
...
<h4 class="font-weight-bold mb-4">Sila Hubungi Bahagian IT</h4>
<h5><b>Phone:</b> it</h5>
<h5><b>Email:</b> it</h5>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> </div>
</div> </div>
</div> </div>
resources/views/gadaian/index.blade.php
+12 -4
View File
@@ -11,7 +11,15 @@
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-12 col-lg-12"> <div class="col-md-12 col-lg-12">
<h3 class="text-center text-uppercase">gadaian</h3>
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item"><a href="#">Pelanggan</a></li>
<li class="breadcrumb-item active" aria-current="page">Gadaian</li>
</ol>
</nav>
<div class="form-group row col-12"> <div class="form-group row col-12">
<input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}"> <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
<input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}"> <input type="hidden" name="nokp" id="nokp" value="{{ $customer_info['kpbaru'] }}">
@@ -22,7 +30,7 @@
<div class="col-6 text-left"> <div class="col-6 text-left">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-4"> <div class="col-md-4">
No Rujukan <b>No Rujukan</b>
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}"> <input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
@@ -36,8 +44,8 @@
</div> </div>
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<table class="table" id="myTable"> <table class="table table-striped table-hover" id="myTable">
<thead> <thead class="thead-dark">
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>Recno</th> <th>Recno</th>
resources/views/homepage/penilai/home.blade.php
+2 -2
View File
@@ -15,7 +15,7 @@
<div class="modal-body"> <div class="modal-body">
<h4>Marhun</h4> <h4>Marhun</h4>
<table id="biasa" class="table table-striped table-bordered text-center" style="width:100%"> <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
<thead> <thead class="thead-dark">
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>Jenis Marhun</th> <th>Jenis Marhun</th>
@@ -64,7 +64,7 @@
<div class="modal-body"> <div class="modal-body">
<h4>Marhun</h4> <h4>Marhun</h4>
<table id="biasa" class="table table-striped table-bordered text-center" style="width:100%"> <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
<thead> <thead class="thead-dark">
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>Jenis Marhun</th> <th>Jenis Marhun</th>
resources/views/layouts/login.blade.php
+4
View File
@@ -16,6 +16,10 @@
<link rel="dns-prefetch" href="//fonts.gstatic.com"> <link rel="dns-prefetch" href="//fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
<script src="{{ asset('js/jquery.min.js') }}"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
<!-- Styles --> <!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet"> <link href="{{ asset('css/app.css') }}" rel="stylesheet">
<link href="{{ asset('css/main.css') }}" rel="stylesheet"> <link href="{{ asset('css/main.css') }}" rel="stylesheet">
resources/views/penebusan/index.blade.php
+50 -34
View File
@@ -105,10 +105,12 @@
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>Marhun</th> <th>Marhun</th>
<th>Nilai Marhun</th> <th>N. Marhun</th>
<th>N. Marhun Semasa</th>
<th>Berat/gram</th> <th>Berat/gram</th>
<th>Karat</th> <th>Karat</th>
<th>Harga</th> <th>Harga</th>
<th>Harga Semasa</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -121,9 +123,21 @@
@endphp @endphp
<td>{{ $marhunperibadi['descpt'] }}</td> <td>{{ $marhunperibadi['descpt'] }}</td>
<td>RM {{ number_format($m['n_marhun'],2) }}</td> <td>RM {{ number_format($m['n_marhun'],2) }}</td>
<td>@php
$karatbaru = str_replace('.','-',$m['karat']);
$hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
$hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']);
echo "RM " . number_format($hargaemassemasa,2);
@endphp</td>
<td>{{ $m['berat'] }}</td> <td>{{ $m['berat'] }}</td>
<td>{{ $m['karat'] }}</td> <td>{{ $m['karat'] }}</td>
<td>RM {{ $m['harga'] }}</td> <td>RM {{ $m['harga'] }}</td>
<td>RM {{ number_format(floatval($hargabaru['harga']),2) }} @php if($m['harga'] > $hargabaru['harga']) echo '<span class="fas fa-arrow-down text-danger"></span>'; if($m['harga'] < $hargabaru['harga']) echo '<span class="fas fa-arrow-up text-success"></span>';
if($m['harga'] === $hargabaru['harga']) echo '<span class="fas fa-minus text-info"></span>';
@endphp</td>
</tr> </tr>
@php $count++; @endphp @php $count++; @endphp
@endforeach @endforeach
@@ -131,8 +145,9 @@
<tr> <tr>
<td colspan="2"><b>JUMLAH</b></td> <td colspan="2"><b>JUMLAH</b></td>
<td id="nilai_marhun_total">RM {{ number_format($gadai['nilaimarhun'],2) }}</td> <td id="nilai_marhun_total">RM {{ number_format($gadai['nilaimarhun'],2) }}</td>
<td id="nilai_marhun_total">RM {{ number_format($nilaihargasemasa,2) }}</td>
<td id="berat_marhun_total">{{ number_format($gadai['berat'],2) }}</td> <td id="berat_marhun_total">{{ number_format($gadai['berat'],2) }}</td>
<td colspan="2"></td> <td colspan="3"></td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
@@ -191,13 +206,14 @@
<div class="col-4"> <div class="col-4">
PEMBIAYAAN HARGA SEMASA (RM) PEMBIAYAAN HARGA SEMASA (RM)
</div> </div>
{{-- @php @php
$percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
@endphp --}} $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
@endphp
<div class="col-8 input-group mb-5"> <div class="col-8 input-group mb-5">
<input type="text" id="hargapembiayaansemasa" class="form-control" aria-describedby="basic-hargaemas" readonly/> <input type="text" id="hargapembiayaansemasa" class="form-control" value="{{ number_format($gadai['bakipjm'],2) }}" aria-describedby="basic-hargaemas" readonly/>
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text" id="basic-hargaemas">40.88</span> <span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_hargaemassemasa,2) }}</span>
</div> </div>
</div> </div>
</diV> </diV>
@@ -272,7 +288,7 @@
<span class="input-group-text" id="basic-addon2">{{ number_format($percent_asal,2) }}</span> <span class="input-group-text" id="basic-addon2">{{ number_format($percent_asal,2) }}</span>
</div> </div>
</div> </div>
</diV> </div>
</div> </div>
<div class="col-6" id="divbayaranditerima"> <div class="col-6" id="divbayaranditerima">
<div class="form-group row"> <div class="form-group row">
@@ -282,7 +298,7 @@
<div class="col-4"> <div class="col-4">
<input type="text" id="bayaranditerima" class="form-control" readonly/> <input type="text" id="bayaranditerima" class="form-control" readonly/>
</div> </div>
</diV> </div>
</div> </div>
@@ -377,8 +393,9 @@
function tebusan(){ function tebusan(){
if(hargajualan != null ){ if(hargajualan != null ){
let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}"; let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}";
let maxgadaipembiayaanbaru = "{{ $maxgadaipemb = ($nilaihargasemasa * 0.7) - $gadai['bakipjm'] }}";
$('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2)); $('#tambahpinjamsebenar').val(Number(maxgadaipembiayaanbaru).toFixed(2));
$('#divpembiayaanasal').hide(); $('#divpembiayaanasal').hide();
$('#divbakihargajualan').show(); $('#divbakihargajualan').show();
@@ -761,21 +778,32 @@
var maxpinjam = parseFloat($('#tambahpinjamsebenar').val()); var maxpinjam = parseFloat($('#tambahpinjamsebenar').val());
var pinjambaru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"")); var pinjambaru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
var pinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")); var pinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,""));
var pembiayaanbaru = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"")); //pembiayaan yang baru
var nm = parseFloat("{{ $gadai['nilaimarhun'] }}"); var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
const percentpinj = parseFloat("{{ $percent_asal }}"); const percentpinj = parseFloat("{{ $percent_asal }}");
const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru
console.log(percentpemb);
var totalpinjbaru=0; var totalpinjbaru=0;
totalpinjbaru = pinjam + parseFloat(e.value); totalpinjbaru = pinjam + parseFloat(e.value);
$(e).val() == '' ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2)); $(e).val() == '' ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2));
$(e).val() == '' ? $('#hargapembiayaansemasa').val(pinjam.toFixed(2)) : $('#hargapembiayaansemasa').val(totalpinjbaru.toFixed(2));
// if(parseFloat($(e).val()) > maxpinjam) // if(parseFloat($(e).val()) > maxpinjam)
// $(e).val(maxpinjam); // $(e).val(maxpinjam);
var total = totalpinjbaru/nm * 100; var total = totalpinjbaru/nm * 100;
var totalsemasa = totalpinjbaru/nmsemasa * 100;
$(e).val() == '' ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2)); $(e).val() == '' ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2));
$(e).val() == '' ? $('#basic-hargaemas').text(percentpemb.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2));
} }
let teller = "{{ Auth::user()->name }}"; let teller = "{{ Auth::user()->name }}";
@@ -1203,7 +1231,7 @@
/////////// ///////////
}else if($('#sltjenistebus').find(":selected").val() == 'P'){ }else if($('#sltjenistebus').find(":selected").val() == 'P'){
let pinjamanbaru = $('#pinjamanbaru').val(); let pinjamanbaru = $('#hargapembiayaansemasa').val();
let jenisbayarantebus = ''; let jenisbayarantebus = '';
if(hargajualan == null){ if(hargajualan == null){
jenisbayarantebus = "nottawarruq"; jenisbayarantebus = "nottawarruq";
@@ -1221,7 +1249,7 @@
return false; return false;
} }
if(parseFloat($('#basic-addon2').text()) > 70 && parseFloat($('#basic-addon2').text()) <= 75){ if(parseFloat($('#basic-hargaemas').text()) > 70 && parseFloat($('#basic-hargaemas').text()) <= 75){
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -1241,9 +1269,9 @@
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text(); let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
let jumpinjam = $('#pinjamanbaru').val(); let jumpinjam = $('#hargapembiayaansemasa').val();
let teller = "{{ Auth::user()->name }}"; let teller = "{{ Auth::user()->name }}";
Swal.fire({ Swal.fire({
@@ -1329,7 +1357,7 @@
event.preventDefault(); event.preventDefault();
return false; return false;
}else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){ }else if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80) || pinjamanbaru >= 10000){
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
@@ -1340,7 +1368,7 @@
}); });
let text = ''; let text = '';
if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80)) if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
{ {
text = 'Tetapan margin melebihi 75% untuk Operasi!'; text = 'Tetapan margin melebihi 75% untuk Operasi!';
}else if(pinjamanbaru >= 10000) }else if(pinjamanbaru >= 10000)
@@ -1360,9 +1388,9 @@
}).then((result) => { }).then((result) => {
if (result.isConfirmed) { if (result.isConfirmed) {
let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text(); let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
let komen = ''; let komen = '';
if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80)) if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
{ {
komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
}else if(pinjamanbaru >= 10000) }else if(pinjamanbaru >= 10000)
@@ -1370,7 +1398,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
} }
let jumpinjam = $('#pinjamanbaru').val(); let jumpinjam = $('#hargapembiayaansemasa').val();
let teller = "{{ Auth::user()->name }}"; let teller = "{{ Auth::user()->name }}";
Swal.fire({ Swal.fire({
@@ -1459,7 +1487,7 @@
event.preventDefault(); event.preventDefault();
return false; return false;
}else if(parseFloat($('#basic-addon2').text()) > 80){ }else if(parseFloat($('#basic-hargaemas').text()) > 80){
$("#terima_transaksi").prop('disabled', false); $("#terima_transaksi").prop('disabled', false);
Swal.fire( Swal.fire(
'Amaran!', 'Amaran!',
@@ -1484,27 +1512,15 @@
} }
//Buat Harga Baru Emas Semasa
$.ajax({
method: "get",
url: "{{ route('tukaran.hargaemas') }}",
data: {
'norujukan' : norujukan
},
success:function(data){
console.log(data);
}
});
return; return;
var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jenistebus = $('#sltjenistebus').find(":selected").val(); var jenistebus = $('#sltjenistebus').find(":selected").val();
var jbg = "{{ $gadai['tempoh'] }}"; var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}";
var nilai_marhun = "{{ $gadai['nilaimarhun']}}"; var nilai_marhun = "{{ $nilaihargasemasa }}";
var pinjaman_lama = "{{ $gadai['bakipjm'] }}"; var pinjaman_lama = "{{ $gadai['bakipjm'] }}";
var pinjaman = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"")); var pinjaman = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,""));
var ansuran = 0; var ansuran = 0;
var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,"")); var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,""));
var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,"")); var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,""));