fix laporan
This commit is contained in:
@@ -14,6 +14,7 @@ use App\Panjar;
|
||||
use App\Lelong;
|
||||
use App\Advansur;
|
||||
use App\Vault;
|
||||
use App\Tunai;
|
||||
use App\Denominasi;
|
||||
|
||||
use Carbon\Carbon;
|
||||
@@ -72,7 +73,32 @@ class LaporanController extends Controller
|
||||
//e
|
||||
/* Imbang Duga */
|
||||
|
||||
|
||||
$totalbakiakhirtunai = 0;
|
||||
|
||||
$vault=Vault::on($cawangan['mysql'])
|
||||
->where('kodcaw','=',$request->kodcaw)
|
||||
->where('tarikh','<=', $request->tarikh)
|
||||
->orderby('tarikh','desc')->first();
|
||||
|
||||
$tunai = Tunai::on($cawangan['mysql'])
|
||||
->where('kodcaw','=',$request->kodcaw)
|
||||
->where('tarikh','=', $request->tarikh)
|
||||
->get();
|
||||
|
||||
$total = 0;
|
||||
foreach($tunai as $index=>$money)
|
||||
{
|
||||
$total+=$money['baki'];
|
||||
}
|
||||
|
||||
|
||||
if($total != 0)
|
||||
{
|
||||
$totalbakiakhirtunai = $vault['bakiakhir'] + $total;
|
||||
}else
|
||||
{
|
||||
$totalbakiakhirtunai = $vault['bakiakhir'];
|
||||
}
|
||||
|
||||
/* Stok Audit */
|
||||
|
||||
@@ -153,7 +179,8 @@ class LaporanController extends Controller
|
||||
'total_keuntungan'=>floatval($total_keuntungan),
|
||||
'petibesi_sistem'=>$petibesi_sistem,
|
||||
'petibesi_deno'=>$petibesi_deno,
|
||||
'stokaudit'=>$stokaudit
|
||||
'stokaudit'=>$stokaudit,
|
||||
'petibesiimbangduga'=>$totalbakiakhirtunai
|
||||
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user