From bc997656abfd8bb17896ff3c2b04e5ee91b69d33 Mon Sep 17 00:00:00 2001
From: faiqahzaman <zmnfqh@gmail.com>
Date: Thu, 21 Apr 2022 10:33:13 +0800
Subject: [PATCH] update senarai tangguhlelong

---
 app/Http/Controllers/MarhunController.php     | 48 +++++++++++++++----
 .../views/pengesahan/lelbidmarhun.blade.php   | 36 +++++++-------
 .../pengesahan/senaraitangguhlelong.blade.php |  7 ++-
 routes/web.php                                |  2 +-
 4 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index aeab4529..6234b622 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -665,6 +665,20 @@ class MarhunController extends Controller
     {
         $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id')
         ->where('tangguhlelong.lelong_id', $id)
+        ->select('tangguhlelong.id as tangguhlelong_id',
+                 'tangguhlelong.lelongbid_id',
+                 'tangguhlelong.norujukan',
+                 'tangguhlelong.tarikhtangguh', 
+                 'tangguhlelong.ditangguh_pada',
+                 'tangguhlelong.ditangguh_oleh',
+                 'tangguhlelong.nota',
+                 'lelong.id as lelong_id',
+                 'lelong.tarikh_lelong',
+                 'lelong.harga_emas_asas',
+                 'lelong.jbg',
+                 'lelong.cajlelong',
+                 'lelong.sts_lelong'
+        )
         ->get();
 
         foreach($tangguhlelong as $index1=>$tanguhlel)
@@ -673,22 +687,38 @@ class MarhunController extends Controller
             ->where('lelong_id', $id)
             ->first();
 
-            $tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name;
+            $tangguhlelong[$index1]['details'] = $tanguhlel;
+            $tangguhlelong[$index1]['nama_caw'] = $getkodcaw;
         }
 
         return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id'));
     }
 
-    public function lelbidmarhun($id, $norujukan)
+    public function lelbidmarhun($id, $norujukan, $tangguhlelong_id)
     {
-        $marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
-        ->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
-        ->where('tangguhlelong.norujukan', $norujukan)
+        $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan')
+        ->where('gadaimarhun.norujukan', $norujukan)
+        ->where('tangguhlelong.id', $tangguhlelong_id)
+        ->select('tangguhlelong.id as tangguhlelong_id',
+                 'tangguhlelong.lelong_id',
+                 'tangguhlelong.lelongbid_id',
+                 'tangguhlelong.norujukan',
+                 'tangguhlelong.pinjaman',
+                 'tangguhlelong.tarikhtangguh',
+                 'tangguhlelong.nota as tangguh_nota',
+                 'tangguhlelong.pinjaman',
+                 'gadaimarhun.id as gadaimarhun_id',
+                 'gadaimarhun.bil',
+                 'gadaimarhun.marhun',
+                 'gadaimarhun.nota as gadai_nota',
+                 'gadaimarhun.karat',
+                 'gadaimarhun.berat',
+                 'gadaimarhun.harga',
+                 'gadaimarhun.n_marhun'
+        )
         ->get();
-
-        $status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first();
-
-        return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status'));
+                    
+        return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan'));
 
     }
     
diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php
index 8c77ba14..47b5d0d3 100644
--- a/resources/views/pengesahan/lelbidmarhun.blade.php
+++ b/resources/views/pengesahan/lelbidmarhun.blade.php
@@ -10,42 +10,40 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
+
+            <div class="container">
+                <div class="row mb-2">
+                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+                        <p> <b>Norujukan : </b> {{ $tangguhlelong[0]['norujukan'] }}</p>
+                        <p> <b>Pembiayaan : </b> {{ $tangguhlelong[0]['pinjaman'] }}</p>
+                        <p> <b>Remark : </b> {{ $tangguhlelong[0]['tangguh_nota'] }}</p>
+                    </div>
+                </div>
+            </div>
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
-                            <th>No Rujukan</th>
                             <th>Marhun</th>
                             <th>Karat</th>
                             <th>Berat</th>
                             <th>Harga (RM)</th>
                             <th>Nilai Marhun</th>
                             <th>Nota</th>
-                            <th>Status</th>
                         </tr>
                     </thead>
                     <tbody>                        
-                        @foreach ($marhuns as $marhun)
+                        @foreach ($tangguhlelong as $index1=>$tangguhlel)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $marhun->norujukan }}</td>
-                            <td>{{ $marhun->marhun }}</td>
-                            <td>{{ $marhun->karat }}</td>
-                            <td>{{ $marhun->berat }}</td>
-                            <td>{{ $marhun->harga }}</td>
-                            <td>{{ $marhun->n_marhun }}</td>
-                            <td>{{ $marhun->nota }}</td>
-                            <td>
-                                @if($status->status_ubah ==  1)
-                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PERUBAHAN MUTU</button>
-                                @elseif($status->status_ubah == 2)
-                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENAMBAHAN MARHUN</button>
-                                @elseif($status->status_ubah == 3)
-                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>PENGHAPUSAN MARHUN</button>
-                                @endif
-                            </td>
+                            <td>{{ $tangguhlel->marhun }}</td>
+                            <td>{{ $tangguhlel->karat }}</td>
+                            <td>{{ $tangguhlel->berat }}</td>
+                            <td>{{ $tangguhlel->harga }}</td>
+                            <td>{{ $tangguhlel->n_marhun }}</td>
+                            <td>{{ $tangguhlel->gadai_nota }}</td>
                         </tr>
                         @endforeach
                     </tbody>
diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php
index 660370bb..78c5f1e4 100644
--- a/resources/views/pengesahan/senaraitangguhlelong.blade.php
+++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php
@@ -17,23 +17,22 @@
                         <tr>
                             <th>Bil</th>
                             <th>Nama Cawangan</th>
-                            <th>Tarikh Lelong Asal</th>
+                            <th>Tarikh Lelong</th>
                             <th>Tarikh Tangguh</th>
                             <th>No Rujukan</th>
                             <th class="text-center">Action</th>
                         </tr>
                     </thead>
                     <tbody>
-                        
                         @foreach ($tangguhlelong as $tangguhlel)
                         <tr>
                             <td>{{ $loop->iteration }}</td>
-                            <td>{{ $tangguhlel['nama_caw'] }}</td>
+                            <td>{{ $tangguhlel['nama_caw']['caw_name'] }}</td>
                             <td>{{ $tangguhlel->tarikh_lelong }}</td>
                             <td>{{ $tangguhlel->tarikhtangguh }}</td>
                             <td>{{ $tangguhlel->norujukan }}</td>
                             <td>
-                            <a  href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            <a  href="{{ route('pengesahan.lelbidmarhun', [ $id, $tangguhlel->norujukan, 'tangguhlelong_id'=>$tangguhlel['details']['tangguhlelong_id'] ]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/routes/web.php b/routes/web.php
index 5b5d0fed..21c2360a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -193,7 +193,7 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']);
     Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']);
     Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
-    Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
+    Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
 });
 
 Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {