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

Merge branch 'pipi' into 'master'

Browse Source 
fix penebusan separuh

See merge request online-sistem1/kaunter!82
This commit is contained in:
hafifie rahman
2021-03-02 08:06:23 +00:00
parent f6a84944f3 85a2d0d525
commit cc1fdb2cec
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+11 -2
View File
@@ -183,9 +183,18 @@ class AliranTunaiController extends Controller
}else{ }else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk; if($tebus_detail['jenistebus'] == 'S')
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
$bakiakhir = $bakiakhir + $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'];
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
$bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
}
// $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$bakiakhir = $bakiakhir + $tebus_detail['bakipjm'];
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
'kodlaluan' => $tebus_detail['teller'], 'kodlaluan' => $tebus_detail['teller'],
app/Http/Controllers/KhazanahController.php
+6 -1
View File
@@ -242,7 +242,12 @@ class KhazanahController extends Controller
}else{ }else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk; if($tebus_detail['jenistebus'] == 'S')
{
$totalmasuk = $tebus_detail['pinjaman'] + $tebus_detail['bakiupah'] + $masuk;
}else{
$totalmasuk = $tebus_detail['bakipjm'] + $masuk;
}
// $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
resources/views/penebusan/index.blade.php
+2 -2
View File
@@ -1071,8 +1071,8 @@
var pinjamanbaru = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,""); var pinjamanbaru = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
var ansuran = 0; var ansuran = 0;
var addpinjaman = 0; var addpinjaman = 0;
var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");; var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");
var bakiupah = 0; var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
var historygadaian = "{{ $gadai['norujukan'] }}"; var historygadaian = "{{ $gadai['norujukan'] }}";
var marhun = "{{ $gadai['marhun'] }}"; var marhun = "{{ $gadai['marhun'] }}";
var noic = "{{ $gadai['nokp'] }}"; var noic = "{{ $gadai['nokp'] }}";