KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix skit2

Browse Source
This commit is contained in:
hafifierahman
2021-11-02 01:21:26 +08:00
parent 7cd9fc6572
commit 3f08a09c39
2 changed files with 84 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/pembayaran/checkout.blade.php
+37 -36
View File
@@ -99,11 +99,11 @@
<td>
<select name="sltbayaran" class="form-control mb-2" data-upah="{{ $koskeuntungan }}" data-jenis="arrahn">
<option selected disabled>Pilih Bayaran</option>
<option value="fixed">Amaun Tetap</option>
<option value="otheramount">Amaun Lain</option>
<option value="fixed">Amaun Semasa</option>
{{-- <option value="otheramount">Amaun Lain</option> --}}
</select>
<input type="text" data-pinjaman="{{ $bayar['pinjaman'] }}" data-upah="{{ $koskeuntungan }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="arrahn" name="txtbayaranarrahn" readonly class="form-control txtbayaran"/>
<input type="text" data-pinjaman="{{ $bayar['pinjaman'] }}" data-taglel="{{ $bayar['taglel'] }}" data-upah="{{ $koskeuntungan }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="arrahn" name="txtbayaranarrahn" readonly class="form-control txtbayaran"/>
<input type="hidden" name="txtbayaranhidden[]" class="bayaran"/>
<input type="hidden" name="txtupahhidden[]" value="{{ $koskeuntungan }}"/>
@@ -162,11 +162,11 @@
<select name="sltbayaran" class="form-control mb-2" data-upah="{{ $upahtawarruq }}" data-jenis="tawarruq">
<option selected disabled>Pilih Bayaran</option>
<option value="fixed">Amaun Tetap</option>
<option value="fixed">Amaun Semasa</option>
<option value="otheramount">Amaun Lain</option>
</select>
<input type="text" data-bakipjm="{{ $bayar['bakipjm'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" readonly class="form-control txtbayaran"/>
<input type="text" data-bakipjm="{{ $bayar['bakipjm'] }}" data-taglel="{{ $bayar['taglel'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" readonly class="form-control txtbayaran"/>
<input type="hidden" name="txtbayaranhidden[]" class="bayaran"/>
<input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}"/>
@@ -255,7 +255,7 @@
<div class="d-flex justify-content-end col-12 mt-3 align-self-end">
<button type="submit" id="bayarsbmt" class="btn btn-primary" onclick="loadingbtn();">Bayar</button>
<button type="submit" id="bayarsbmt" class="btn btn-primary" disabled onclick="loadingbtn();">Bayar</button>
</div>
</div>
@@ -307,17 +307,20 @@
let selected = $('option:selected',this).attr('value');
let jenis = $(this).data('jenis');
let upah = $(this).data('upah');
let taglel = $(this).data('taglel');
if(selected === 'fixed')
{
$(this).closest('tr').find("input").attr('readonly',true);
$(this).closest('tr').find(".txtbayaran").val(upah);
$(this).closest('tr').find(".bayaran").val(upah);
calculateall(jenis);
calculateall(jenis,taglel);
}else{
// $(this).closest('tr').find("input").val();
$(this).closest('tr').find("input").attr('readonly',false);
calculateall(jenis);
calculateall(jenis,taglel);
}
});
@@ -327,6 +330,7 @@
let pinjaman = $(this).data('pinjaman');
let jenis = $(this).data('jenis');
let nm = $(this).data('nm');
let taglel = $(this).data('taglel');
let bayar = Number(this.value);
@@ -341,23 +345,14 @@
)
$(this).val(upah);
$(this).closest('tr').find('.bayaran').val(upah);
calculateall(jenis);
calculateall(jenis,taglel);
return false;
}
if(bayar <= 0){
$("#bayarsbmt").prop('disabled', true);
Swal.fire(
'Amaran!',
'Bayaran tidak boleh ditinggalkan kosong!',
'error'
)
}else{
$("#bayarsbmt").prop('disabled', false);
}
$(this).closest('tr').find('.bayaran').val(this.value);
calculateall(jenis);
calculateall(jenis,taglel);
});
$("input[name=txtbayarantawarruq]").change(function(e){
@@ -366,6 +361,7 @@
let bakipinjam = $(this).data('bakipjm');
let jenis = $(this).data('jenis');
let nm = $(this).data('nm');
let taglel = $(this).data('taglel');
let bayar = Number(this.value);
@@ -380,42 +376,47 @@
)
$(this).val(upah);
$(this).closest('tr').find('.bayaran').val(upah);
calculateall(jenis);
calculateall(jenis,taglel);
return false;
}
if(bayar <= 0){
$("#bayarsbmt").prop('disabled', true);
Swal.fire(
'Amaran!',
'Bayaran tidak boleh ditinggalkan kosong!',
'error'
)
}else{
$("#bayarsbmt").prop('disabled', false);
}
$(this).closest('tr').find('.bayaran').val(this.value);
calculateall(jenis);
calculateall(jenis,taglel);
});
function calculateall(jenis)
function calculateall(jenis,taglel)
{
var $row = $(this).closest('tr');
var sumarrahn = 0;
var sumtawarruq = 0;
var sum = 0;
var counterrorbayar = 0;
$('#belum_tawarruq').find('input[name=txtbayaranarrahn]').each(function() {
sumarrahn += parseFloat(this.value) || 0;
if(this.value <= 0 || this.value == ''){
counterrorbayar++;
}
});
$('#selepas_tawarruq').find('input[name=txtbayarantawarruq]').each(function() {
sumtawarruq += parseFloat(this.value) || 0;
if(this.value <= 0 || this.value == ''){
counterrorbayar++;
}
});
sum = sumarrahn + sumtawarruq;
if(counterrorbayar > 0){
$("#bayarsbmt").prop('disabled', true);
}else{
$("#bayarsbmt").prop('disabled', false);
}
$("#spanbayaranarrahn").text(sumarrahn.toFixed(2));
$("#spanbayarantawarruq").text(sumtawarruq.toFixed(2));
$('#spanjumlah').text(formatter.format(sum));
resources/views/pembayaran/senaraibayaran.blade.php
+47 -7
View File
@@ -91,8 +91,28 @@
@foreach($belum_tebus as $index=>$bt)
@if($bt['hargajualan'] == '')
@php
$koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json();
$searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json();
$searchLelong = Http::get(config('api.url').'/api/search/lelong',[
'kodcaw' => $bt['kodcaw'],
'norujukan' => $bt['norujukan']
])->json();
$tarikh_hari_ini = Carbon\Carbon::now()->toDateString();
if($searchLelong){
$t_lelong = Carbon\Carbon::parse($searchLelong['t_lelong'].' 00:00:00');
$tarikhini = Carbon\Carbon::parse($tarikh_hari_ini.' 00:00:00');
$diff=date_diff($tarikhini,$t_lelong);
$diff = (int)$diff->format("%R%a");
if($diff <= 2){
// 'messageamaran'=>'Rekod Gadaian Dalam Proses Lelong, Sila Hadir ke Cawangan.'
}elseif($searchLelong['t_jual'] != null && $searchLelong['hargajual'] != 0.00){
// 'messageamaran'=>'Rekod Gadaian Telah Dilelong.'
}
}
@endphp
<tr {{ ($searchonline) ? 'style=background-color:#81ecec;' : '' }}>
<td scope="row">
@@ -146,13 +166,32 @@
@foreach($belum_tebus as $index=>$bt)
@if($bt['hargajualan'] != '')
@php
$searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json();
$koskeuntungan = Http::get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json();
$keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100);
$ten_percent = floatval($bt['nilaimarhun']) * 0.1;
$baki_pinjaman = floatval($bt['bakipjm']);
$max_bayaran = $baki_pinjaman - $ten_percent;
@endphp
$searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json();
$searchLelong = Http::get(config('api.url').'/api/search/lelong',[
'kodcaw' => $bt['kodcaw'],
'norujukan' => $bt['norujukan']
])->json();
if($searchLelong){
$t_lelong = Carbon\Carbon::parse($searchLelong['t_lelong'].' 00:00:00');
$tarikhini = Carbon\Carbon::parse($tarikh_hari_ini.' 00:00:00');
$diff=date_diff($tarikhini,$t_lelong);
$diff = (int)$diff->format("%R%a");
if($diff <= 2){
// 'messageamaran'=>'Rekod Gadaian Dalam Proses Lelong, Sila Hadir ke Cawangan.'
}elseif($searchLelong['t_jual'] != null && $searchLelong['hargajual'] != 0.00){
// 'messageamaran'=>'Rekod Gadaian Telah Dilelong.'
}
}
$koskeuntungan = Http::get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json();
$keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100);
$ten_percent = floatval($bt['nilaimarhun']) * 0.1;
$baki_pinjaman = floatval($bt['bakipjm']);
$max_bayaran = $baki_pinjaman - $ten_percent;
@endphp
<tr {{ ($searchonline) ? 'style=background-color:#81ecec;' : '' }}>
<th scope="row">
<div class="media align-items-center">
@@ -178,6 +217,7 @@
</td>
<td>
<input type="checkbox" name="chkboxsag[]" value="{{ $bt['norujukan'] }}" id="sag-{{ $loop->iteration }}" data-norujukan="{{ $bt['norujukan'] }}" {{ ($searchonline || $koskeuntungan <= 0) ? 'disabled' : '' }}/>
{{-- <i data-toggle="tooltip" title="Hooray!" class="fas fa-exclamation-circle ml-3 text-right" style="font-size: 20px;"></i> --}}
</td>
</tr>
@endif