update migration para3

app/Http/Controllers/MarhunController.php

@@ -452,7 +452,7 @@ class MarhunController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->where('cawangan.caw_code', $user->kodcaw)
         ->where('sts_lelong', 0)
-        ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong.fasa','lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->get()
         ->toArray();
 
@@ -647,7 +647,7 @@ class MarhunController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->where('cawangan.caw_code', $user->kodcaw)
         ->where('sts_lelong', 0)
-        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->groupBy('lelong_id')
         ->get()
         ->toArray();

app/Models/Cawangan.php

@@ -28,5 +28,6 @@ class Cawangan extends Model
         'lokasi',
         'pkb_jmc',
         'para2',
+        'para3',
     ];
 }

database/migrations/2021_12_14_041557_create_lelongs_table.php

@@ -194,6 +194,7 @@ class CreateLelongsTable extends Migration
             $table->integer('cajlelong')->nullable();
             $table->timestamps();
             $table->string('para2','9999')->nullable(); 
+            $table->string('para3','9999')->nullable(); 
 
 
             // $table->foreign('norujukan')

database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php

@@ -15,7 +15,9 @@ class AddPara2ToCawanganTable extends Migration
     {
         Schema::table('cawangan', function (Blueprint $table) {
             $table->string('para2','9999')->nullable(); 
+            $table->string('para3','9999')->nullable(); 
         });
+        
     }
 
     /**
@@ -27,6 +29,7 @@ class AddPara2ToCawanganTable extends Migration
     {
         Schema::table('cawangan', function (Blueprint $table) {
             $table->dropColumn('para2') ;
+            $table->dropColumn('para3') ;
         });
     }
 }

resources/views/marhun/senarailelongmarhun.blade.php

@@ -15,9 +15,10 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Cawangan</th>
+                        {{-- <th>Cawangan</th> --}}
                         <th>Batch Lelong</th>
                         <th>Tarikh Lelong</th>
+                        <th>Fasa</th>
                         <th>Status Lelong</th>
                         <th class="text-center">Tindakan</th>
                     </tr>
@@ -27,18 +28,19 @@
                 <tr>
                     <td>{{$loop->iteration}}</td>
                    
-                    <td>
+                    {{-- <td>
                         @foreach($lel['detailsinfo'] as $details)
                         <span class="m-2">{{$details['caw_name']}}</span><br>
                         @endforeach
 
-                    </td>
+                    </td> --}}
                     <td>{{ $lel['info']['lelong_id']}}</td>
                     <td>@php
                                 $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
                                 $t_lelong =  $myDateTime->format('d-m-Y');
                                 echo($t_lelong);
                             @endphp</td>
+                    <td>{{ $lel['info']['fasa']}}</td>
                     <td>
                         @if($lel['info']['sts_lelong'] == 0)
                             <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>

resources/views/marhun/senlelmarhun.blade.php

@@ -14,8 +14,9 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Cawangan</th>
+                        {{-- <th>Cawangan</th> --}}
                         <th>Tarikh Lelong</th>
+                        <th>Fasa</th>
                         <th>Status Lelong</th>
                         <th class="text-center">Tindakan</th>
                     </tr>
@@ -24,12 +25,17 @@
                 @foreach($arrayinfo as $lel)
                 <tr>
                     <td>{{$loop->iteration}}</td>
-                    <td>
+                    {{-- <td>
                         @foreach($lel['detailsinfo'] as $details)
                         <span class="m-2">{{$details['caw_name']}}</span><br>
                         @endforeach
-                    </td>
-                    <td>{{ $lel['info']['tarikh_lelong']}}</td>
+                    </td> --}}
+                    <td> @php 
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                        $datez = $myDateTime->format('d-m-Y');
+                        echo($datez);
+                        @endphp</td>
+                    <td>{{ $lel['info']['fasa']}}</td>
                     <td>
                         @if($lel['info']['sts_lelong'] == 0)
                             <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>