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

add petak kat baki pelanggan

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-05 09:24:34 +08:00
parent 2c981c4404
commit 5103b0b698
4 changed files with 101 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+10 -1
View File
@@ -19,6 +19,9 @@ use App\Http\Controllers\AliranTunaiController;
class GadaianController extends Controller
{
public $AliranTunaiController;
public $customerService;
public function __construct()
{
$this->middleware('auth');
@@ -208,6 +211,8 @@ class GadaianController extends Controller
$total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
$keuntungan_sebln = $request->keuntungan_sebulan;
$keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
$onepercent = $request->onepercent;
$ujrah = $request->ujrah;
$margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
// dd($margin_pinjaman);
@@ -228,7 +233,11 @@ class GadaianController extends Controller
'upah12' => $keuntungan12bulan,
'hargajualan' => $hargajualan,
'kuantiti_marhun' => $request->kuantiti_marhun,
'transaction' => 'Ubah Gadai'
'transaction' => 'Ubah Gadai',
'kadarujrah' => round($kadarupah, 2),
'ujrah' => $ujrah,
'onepercent' => $onepercent,
'margin_semasa' => $margin_pinjaman,
])->json();
$update_komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/update',[
'unit_komuditi' => round($request->pinjaman, 2),
resources/views/gadaian/edit.blade.php
+55 -14
View File
@@ -71,13 +71,18 @@
</diV>
</div>
@php
if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
$kadarupah = 1.2/100;
}else if($gadaiannorujukan['nilaimarhun'] >= 401 && $gadaiannorujukan['nilaimarhun'] < 2001){
$kadarupah = 1.5/100;
}else if($gadaiannorujukan['nilaimarhun'] >= 2001 ){
$kadarupah = 1.7/100;
}
$kadarupah = Http::get(config('api.url'). '/api/kadarujrah',[
'nilaimarhun' => $gadaiannorujukan['nilaimarhun']
'kodcaw' => $gadaiannorujukan['kodcaw']
]);
// if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
// $kadarupah = 1.2/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;
@@ -97,6 +102,26 @@
<div class="form-group row">
</diV>
</div>
<div class="col-3 d-none">
<div class="form-group row">
<div class="col-md-6">
Ujrah
</div>
<div class="col-md-6">
<input type="text" class="form-control" readonly name="ujrah" id="ujrah">
</div>
</div>
</div>
<div class="col-3 d-none">
<div class="form-group row">
<div class="col-md-6">
One Percent
</div>
<div class="col-md-6">
<input type="text" class="form-control" readonly name="onepercent" id="onepercent">
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group row">
<div class="col-5">
@@ -216,6 +241,8 @@
</div>
<script>
var api_url = "<?php echo $api_url ?>";
var kodcaw_ujrah = "<?php echo $cawangan_info['kodcaw'] ?>";
$('form input').keydown(function (e) {
if (e.keyCode == 13) {
e.preventDefault();
@@ -396,13 +423,27 @@
$('.buttonpunya').html("<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
}
if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
kadarupah = 1.2/100;
}else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
kadarupah = 1.5/100;
}else if(total_nilai_marhun >= 2001 ){
kadarupah = 1.7/100;
}
// if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
// kadarupah = 1.2/100;
// }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
// kadarupah = 1.5/100;
// }else if(total_nilai_marhun >= 2001 ){
// kadarupah = 1.7/100;
// }
$.ajax({
method:'GET',
url: api_url + '/api/kadarujrah',
async:false,
data:{
'nilaimarhun' : total_nilai_marhun,
'kodcaw' : kodcaw_ujrah
},
success:function(data){
kadarupah = data;
}
});
$('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
$('#marhun_detail').val(marhun_details);
$('#total_berat').val(formatter.format(total_berat));
resources/views/layouts/app.blade.php
+18
View File
@@ -85,6 +85,24 @@
padding-left: 0px;
}
fieldset.scheduler-border {
border: 1px dashed #eb2f06 !important;
padding: 10px 5px 5px 5px;
margin-left:-5px;
margin-right:-5px;
margin-bottom:5px;
-webkit-box-shadow: 0px 0px 0px 0px #000;
box-shadow: 0px 0px 0px 0px #000;
}
legend.scheduler-border {
font-size: 1.2em !important;
font-weight: bold !important;
text-align: left !important;
width:auto;
padding:0 10px;
border-bottom:none;
}
</style>
</head>
resources/views/penebusan/index.blade.php
+18 -16
View File
@@ -261,14 +261,24 @@
<input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
</div>
</div>
<div class="form-group row" id="divduitPelanggan">
<div class="col-4">
<span>DUIT PELANGGAN(RM)</span>
<fieldset class="scheduler-border">
<div class="form-group row" id="divduitPelanggan">
<div class="col-4">
<span>DUIT PELANGGAN(RM)</span>
</div>
<div class="col-8">
<input type="text" id="duitPelanggan" onkeyup="bayaranPelanggan(this)" placeholder="0.00" class="form-control"/>
</div>
</div>
<div class="col-8">
<input type="text" id="duitPelanggan" onkeyup="bayaranPelanggan(this)" placeholder="0.00" class="form-control"/>
<div class="form-group row" id="divbakiPelanggan">
<div class="col-4">
<b>BAKI (RM)</b>
</div>
<div class="col-8">
<input type="text" id="bakiPelanggan" class="form-control" value="0.00" readonly/>
</div>
</div>
</div>
</fieldset>
<div class="form-group row" id="divtambahpinjaman">
<div class="col-4">
TAMBAH PEMBIAYAAN(RM)
@@ -288,14 +298,6 @@
<input type="text" id="perludibayartawarruq" class="form-control" readonly/>
</div>
</div>
<div class="form-group row" id="divbakiPelanggan">
<div class="col-4">
<b>BAKI (RM)</b>
</div>
<div class="col-8">
<input type="text" id="bakiPelanggan" class="form-control" value="0.00" readonly/>
</div>
</div>
<div class="form-group row" id="divbayaranminima">
<div class="col-4">
BAYARAN MINIMA
@@ -2207,7 +2209,7 @@
// return false;
// }
if(marginsemasa > 75 && marginsemasa <= 80){
if((marginsemasa > 75 && marginsemasa <= 80) && jenisAT != 'hargalama'){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
@@ -3311,7 +3313,7 @@ function funcexcuse(toggle){
let percenthargasemasa = parseFloat('{{ number_format($percent_hargaemassemasa,2) }}');
var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
let jumlebmargin = parseFloat('{{ ($percent_hargaemassemasa > 80) ? $bayaranlebihan : 0 }}');
let totalbayaran = (percenthargasemasa > 80) ? (jumlebmargin + jumupah) : jumupah;
let totalbayaran = jumlebmargin + jumupah;
$('#basic-addon2').text((percenthargasemasa > 80) ? '80.00' : percenthargasemasa);
$('#pinjamanbaru').val(formatter.format(pembiayaan));