diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index b814a808..694562cc 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -499,7 +499,8 @@ class SimulasiController extends Controller foreach($cawangansim as $cawsim) { $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first(); - $databid = SimulasiBid::where('simulasi_id','=',$simulasi_id)->get(); + $databid = SimulasiBid::where('simulasi_id','=',$simulasi_id) + ->get(); @@ -577,23 +578,14 @@ class SimulasiController extends Controller $total9K += SimulasiBidMarhun::where('simulasibid_id','=',$bid->id) ->where('karat','=','9.0K') ->sum('berat'); + + } - array_push($arraycaw,[ - 'cawangan'=>$cawangan->caw_name, - 't_lelong'=>$simulasi->tarikh_lelong, - 'bil_marhun'=>sizeof($databid), - 'berat'=>$berat, - 'n_marhun'=>$nilai_marhun, - 'pinjaman'=>$pinjaman, - 'upah'=>0, - 'hargaasas'=>$hargaasas, - 'cajlelong'=>$cajlelong, - 'rugilelong'=>$rugilelong, - 'bakilelong'=>$bakilelong, - ]); + + $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $berat; @@ -604,6 +596,7 @@ class SimulasiController extends Controller $total_cazlelong = $total_cazlelong + $cajlelong; $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; + } @@ -630,7 +623,10 @@ class SimulasiController extends Controller 'total14K', 'total9K', 'simkarat', - 'simulasi_id'))->setPaper('a4', 'landscape'); + 'simulasi_id', + 'databid', + 'cawangan', + 'bid'))->setPaper('a4', 'potrait'); return $pdf->download('Simulasi Keseluruhan.pdf'); diff --git a/resources/views/pdf/simrpt2.blade.php b/resources/views/pdf/simrpt2.blade.php index b2074986..cbfbb8a2 100644 --- a/resources/views/pdf/simrpt2.blade.php +++ b/resources/views/pdf/simrpt2.blade.php @@ -3,7 +3,7 @@