Merge branch 'nisha' into 'main'

update migration tangguhlelong

See merge request online-sistem1/lelong!234

app/Http/Controllers/TangguhLelongController.php

@@ -580,16 +580,16 @@ class TangguhLelongController extends Controller
                     $pengesahan->diminta_pada = $currentdate;
                     $pengesahan->save();
                 }        
+                
+                $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw)
+                ->first();
 
                 $customer =  Customer::where('kpbaru','=',$nokp)
                 ->orWhere('kplama','=',$nokp)
                 ->join('poskod','customer.poskod','=','poskod.poskod')  
                 ->join('daerah','poskod.koddaerah','=','daerah.koddaerah')
                 ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri')
-                ->first();
-            
-                $cwgn = Cawangan::where('caw_code','=',$bidmarhun->kodcaw)
-                ->first();
+                ->first();               
 
                 $lelongbid[$index1]['nama'] = ($customer) ? $customer : dd($nokp);
             }
@@ -610,7 +610,7 @@ class TangguhLelongController extends Controller
             // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc);
             
         }
-        // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','t_mohon','nokp'));
+        // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'));
         $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'))
             ->setPaper('a4', 'potrait');
         

database/migrations/2022_03_09_122631_create_tangguhlelong_table.php

@@ -26,7 +26,7 @@ class CreateTangguhlelongTable extends Migration
             $table->string('nota')->nullable();;
             $table->timestamps();
             $table->integer('status')->nullable(); //new added
-            $table->string('filetype')->nullable();
+            $table->string('file_type')->nullable();
 
             // $table->foreign('lelong_id')
             // ->references('id')->on('lelong')

resources/views/pdf/brgtangguhlelong.blade.php

@@ -154,8 +154,7 @@
           <td width="15%">Alamat Pelanggan</td>
           <td width="1%">:</td>
           <td width="23%">{{ strtoupper($borang['nama']['alamat1']) }} 
-            {{-- {!! ($borang['nama']['alamat1'] === null || $borang['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($borang['nama']['alamat1']) !!} <br>  --}}
-          {!! ($borang['nama']['alamat2'] === null || $borang['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($borang['nama']['alamat2']) !!} <br> 
+             <br> 
           {{ ' ' . $borang['nama']['poskod'] . ' ' . strtoupper($borang['nama']['namadaerah']) . ' ' . strtoupper($borang['nama']['negeri'])}}</td>
 
           <td></td>
@@ -182,8 +181,12 @@
             @endphp</td>
           
         </tr>
-        <tr></tr>
-        <tr></tr>
+        <tr>
+          <td></td>
+        </tr>
+        <tr>
+          <td></td>
+        </tr>
         @php     
             $myDateTime = DateTime::createFromFormat('Y-m-d', $borang['t_lelong']);
             $tlelong = $myDateTime->format('d-m-Y');
@@ -237,7 +240,7 @@
         
       </table>
 
-      <p>
+      <div style="margin-top:20px">
         <table class="tablestyle" cellspacing="0" cellpadding="5" style="float:right;" border="1" width="100%" height="90" align="left">
           <thead>
           <tr>
@@ -269,10 +272,9 @@
           </tr>
           @endforeach
         </table><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-      </p>
+      </div>
   
     
-    <p>
       <table class="tablestyle" border="0" width="100%" align="left">
         <tr>
           <td>Tandatangan Pelanggan</td>
@@ -299,7 +301,9 @@
         <td></td>
         <td>_______________________________</td>
         </tr>
-        <tr></tr>
+        <tr>
+          <td></td>
+        </tr>
         <tr>
         <td></td>
         <td></td>
@@ -331,7 +335,9 @@
         <td></td>
         <td></td>  
         </tr>
-        <tr></tr>
+        <tr>
+          <td></td>
+        </tr>
         <tr>
         <td></td>
         <td></td>