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

aliran tunai dan fix beberapa

Browse Source
This commit is contained in:
hafifierahman
2021-01-26 06:42:02 +08:00
parent cc12f0aeb6
commit 1d71a49eaf
7 changed files with 220 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/edit.blade.php
+38 -5
View File
@@ -45,7 +45,7 @@
</div>
</div>
<div class="col-12 text-right mb-2">
<button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
<button type="button" style="margin:auto" id="daft" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
</div>
<div class="card">
<div class="card-body">
@@ -59,6 +59,7 @@
<th>Karat</th>
<th>Berat</th>
<th>Nota</th>
<th>Harga</th>
<th>Action</th>
</tr>
</thead>
@@ -84,13 +85,26 @@
</div>
</diV>
</div>
@php
if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
$kadarupah = 1.25/100;
}else if($gadaiannorujukan['nilaimarhun'] >= 401 && $gadaiannorujukan['nilaimarhun'] < 2001){
$kadarupah = 1.5/100;
}else if($gadaiannorujukan['nilaimarhun'] >= 2001 ){
$kadarupah = 1.7/100;
}
$keuntungan_sebulan = $gadaiannorujukan['pinjaman'] * $kadarupah;
$keuntungan_6bln = $keuntungan_sebulan * 6;
@endphp
<div class="col-3">
<div class="form-group row">
<div class="col-md-6">
Keuntungan Sebulan
</div>
<div class="col-md-6">
<input type="text" class="form-control" readonly name="keuntungan_sebulan" id="keuntungan_sebulan">
<input type="text" class="form-control" readonly name="keuntungan_sebulan" id="keuntungan_sebulan" value="{{ number_format((float)$keuntungan_sebulan,2) }}">
</div>
</diV>
</div>
@@ -106,7 +120,8 @@
<div class="col-7 input-group">
<input type="text" class="form-control" name="pinjaman" value="{{ $gadaiannorujukan['pinjaman'] }}" id="pinjaman">
<div class="input-group-append">
<span class="input-group-text span-pinjaman">0 %</span>
@php $percentpinjam = ($gadaiannorujukan['pinjaman']/$gadaiannorujukan['nilaimarhun'])*100; @endphp
<span class="input-group-text span-pinjaman">{{ number_format((float)$percentpinjam,2) }}%</span>
</div>
</div>
</diV>
@@ -117,7 +132,7 @@
Keuntungan 6 Bulan
</div>
<div class="col-md-6">
<input type="text" class="form-control" readonly name="keuntungan_6bln" id="keuntungan_6bln">
<input type="text" class="form-control" readonly name="keuntungan_6bln" id="keuntungan_6bln" value="{{ number_format((float)$keuntungan_6bln,2) }}">
</div>
</diV>
</div>
@@ -141,7 +156,8 @@
<input type="text" name="kadarkeuntungan" id="kadarkeuntungan" value="" hidden>
<input type="text" name="kuantiti_marhun" id="kuantiti_marhun" value="" hidden>
<input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden>
<a href="{{ route('customer_info') }}" class="float-right btn btn-danger mr-2">Batal</a>
{{-- <a href="{{ route('customer_info') }}" class="float-right btn btn-danger mr-2">Batal</a> --}}
<a href="{{ route('gadai.batalmarhun',['norujukan'=>$norujukan]) }}" class="float-right btn btn-danger mr-2">Batal</a>
<input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
</div>
</div>
@@ -314,6 +330,11 @@
"targets": [ 1 ],
"visible": false,
"searchable": false
},
{
"targets": [ 7 ],
"visible": false,
"searchable": false
}
]
});
@@ -350,6 +371,7 @@
marhun_detail['karat'],
formatter.format(marhun_detail['berat']),
marhun_detail['nota'],
marhun_detail['harga'],
"<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button>"
]).draw();
@@ -420,12 +442,23 @@
function editmarhun(e)
{
let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data();
let nm = recno[3];let karat = recno[4];let berat = recno[5];
let harga = recno[7];
$('#sltkarat').val(karat);
$('#berat').val(berat);
$('#nilaimarhun').val(nm);
$('#harga').val(harga);
$('#norujukedit').val(norujuk);
$('#recno').val(recno[1]);
$('#editMarhunModal').modal();
}
// $( "#daft" ).one( "click", function() {
// alert( "This will be displayed only once." );
// });
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
resources/views/khazanah/khazanahserahan.blade.php
+1 -2
View File
@@ -28,7 +28,6 @@
</div>
<br>
<input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/>
<div class="row">
@@ -45,7 +44,7 @@
<div class="col-6">
<button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-primary">Panduan Format Bundle</button>
<input type="button" onclick="triggersubmit();" class="btn btn-primary" value="Terima"/>
<a href="{{ url('/pendahuluan') }}" class="btn btn-primary">Batal</a>
<a href="{{ url('/serahan') }}" class="btn btn-primary">Batal</a>
</div>
</div>
<br>
resources/views/khazanah/pendahuluanserah.blade.php
+40 -39
View File
@@ -59,6 +59,7 @@
</li>
</ul>
{{-- {{ dd($denominasi)}} --}}
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
@@ -76,33 +77,33 @@
</tr>
<tr>
<td>RM1</td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['0']['bd1'] }}" readonly/></td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['bd1'] }}" readonly/></td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['0']['b1'] }}" readonly/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['b1'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['0']['bd20'] }}" readonly/> </td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['bd20'] }}" readonly/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['0']['b20'] }}" readonly/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['b20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['0']['bd5'] }}" readonly/> </td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['bd5'] }}" readonly/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['0']['b5'] }}" readonly/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['b5'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['0']['bd50'] }}" readonly/> </td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['bd50'] }}" readonly/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['0']['b50'] }} " readonly/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['b50'] }} " readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['0']['bd10'] }}" readonly/> </td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['bd10'] }}" readonly/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['0']['b10'] }}" readonly/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['b10'] }}" readonly/> </td>
<td>RM100 </td> <td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['0']['bd100'] }}" readonly/> </td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['bd100'] }}" readonly/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['0']['b100'] }}" readonly/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['b100'] }}" readonly/> </td>
</tr>
</table>
<br>
@@ -110,7 +111,7 @@
<table class="table table-bordered">
<tr>
<th colspan="6"> Total Wang Tunai Bundle (RM) </th>
<th> <input type="text" class="form-control" name="totalbundle" id="totalbundle" value="{{ $denominasi['0']['jumlahbundle'] }}" readonly/> </th>
<th> <input type="text" class="form-control" name="totalbundle" id="totalbundle" value="{{ $denominasi['jumlahbundle'] }}" readonly/> </th>
</tr>
@@ -136,53 +137,53 @@
<tr>
<td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['k01'] }}" readonly/> </td>
<td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['k1'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['k05'] }}" readonly/> </td>
<td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['k5'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['0']['k010'] }}" readonly/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['k010'] }}" readonly/> </td>
<td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['0']['k10'] }}" readonly/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['k10'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['0']['k020'] }}" readonly/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['k020'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['0']['k20'] }}" readonly/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['k20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['0']['k050'] }}" readonly/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['k050'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['0']['k50'] }}" readonly/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['k50'] }}" readonly/> </td>
</tr>
<tr>
<td></td>
@@ -190,9 +191,9 @@
<td></td>
<td></td>
<td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}" readonly/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['k100'] }}" readonly/> </td>
</tr>
</table>
<br>
@@ -200,7 +201,7 @@
<table class="table table-bordered">
<tr>
<th colspan="6"> Total Wang Tunai Keping (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['jumlahkeping'] }}" readonly/> </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['jumlahkeping'] }}" readonly/> </th>
</tr>
@@ -213,15 +214,15 @@
<table class="table table-bordered">
<tr>
<th> Total Keseluruhan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['txtjumlah'] }}" readonly/> </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['txtjumlah'] }}" readonly/> </th>
</tr>
<tr>
<th> Baki Akhir Sistem (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['txtjumlah'] - $denominasi['0']['lebihan'] }}" readonly/> </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['txtjumlah'] - $denominasi['lebihan'] }}" readonly/> </th>
</tr>
<tr>
<th> Lebihan/Kekurangan (RM) </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['0']['lebihan'] }}" readonly/> </th>
<th> <input type="text" class="form-control" value=" {{ $denominasi['lebihan'] }}" readonly/> </th>
</tr>
</table>
resources/views/modal/editmarhun.blade.php
-2
View File
@@ -48,8 +48,6 @@
<input type="text" name="nilaimarhun" id="nilaimarhun" class="form-control col-6" readonly/>
</div>
</div>
</div>