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

Merge branch 'pipiv2' into 'new-master'

Browse Source 
fix tuntutbaki

See merge request online-sistem1/kaunter!127
This commit is contained in:
hafifie rahman
2021-05-11 08:39:14 +00:00
parent bb0d049909 b9c89b1d6a
commit 401e7048a4
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+8 -2
View File
@@ -1431,7 +1431,7 @@ class AliranTunaiController extends Controller
$gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
$ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json();
$tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json();
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
$totalserahan = 0;
@@ -1501,11 +1501,17 @@ class AliranTunaiController extends Controller
$totalupahlama += $upahlama['upahDibayar'];
}
$totaltuntutbaki = 0;
foreach($tuntutbaki as $index1=>$tb)
{
$totaltuntutbaki += $tb['jumlah'];
}
$penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai);
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan));
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
$errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
app/Http/Controllers/LelongController.php
+4 -2
View File
@@ -91,8 +91,10 @@ class LelongController extends Controller
$bakiakhir = $baki;
$bakiakhir -= $request->jumlah;
if($request->jenis == 'T')
$bakiakhir -= $request->jumlah;
else
$bakiakhir += -($request->jumlah);
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
resources/views/lelongan/index.blade.php
+4 -4
View File
@@ -207,6 +207,8 @@
buttonsStyling: false
});
let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Tuntutan Baki Pelanggan!",
@@ -246,9 +248,9 @@
}
let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val();let bakiupah = $('#keuntungan').val();
let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
$.ajax({
method:'post',
@@ -273,8 +275,6 @@
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
console.log(data);
if(data.norujukan == norujukan)
{