diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 59d46330..366e13b1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -51,14 +51,7 @@ class LelongController extends Controller */ public function index() { - // $lelong = Lelong::all(); - - // foreach($lelong as $lel) - // { - // $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') - // ->where('lelong_id', $lel['id']) - // ->get()->toArray(); - // } + $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') @@ -222,6 +215,9 @@ class LelongController extends Controller $total_cazlelong = $total_cazlelong + $cajlelong; $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; + + $data = Lelong::where('lelong.id','=',$lelong_id) + ->get(); } @@ -249,7 +245,8 @@ class LelongController extends Controller 'total9K', 'lelkarat', 'lelong_id', - 'jeniskarat')); + 'jeniskarat', + 'data')); } public function create($id) @@ -806,6 +803,7 @@ class LelongController extends Controller 'lelongbid.cajlelong', 'lelongbid.baki', 'lelongbid.status_jual', + 'lelongbid.jbg' ) ->get(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 81ad2daf..886eddf1 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -350,6 +350,8 @@ class SimulasiController extends Controller $rugilelong = 0; $bakilelong = 0; + + foreach($databid as $bid) { $marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid->id)->get(); @@ -442,6 +444,9 @@ class SimulasiController extends Controller $total_cazlelong = $total_cazlelong + $cajlelong; $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; + + $data = Simulasi::where('simulasi.id','=',$simulasi_id) + ->get(); } @@ -470,7 +475,8 @@ class SimulasiController extends Controller 'total9K', 'simkarat', 'simulasi_id', - 'jeniskarat')); + 'jeniskarat', + 'data')); } public function delete($id) @@ -748,6 +754,7 @@ class SimulasiController extends Controller 'simulasibid.cajlelong', 'simulasibid.baki', 'simulasibid.status_jual', + 'simulasibid.jbg' ) ->get(); diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 7188949c..f3184b2c 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -24,6 +24,7 @@