update all

app/Http/Controllers/LelongController.php

@@ -52,7 +52,15 @@ class LelongController extends Controller
     public function index()
     {
         $lelong = Lelong::all();
-        return view('lelong.senarailelong',compact('lelong'));
+        
+        foreach($lelong as $lel)
+        {
+            $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
+            ->where('lelong_id', $lel['id'])
+            ->get()->toArray();
+        }
+
+        return view('lelong.senarailelong',compact('lelong', 'caw_lelong'));
     }
 
     public function show($id)

app/Http/Controllers/MarhunController.php

@@ -338,7 +338,7 @@ class MarhunController extends Controller
 
     public function terimaperubahan(Request $request)
     {
-        dd($request->all());
+        // dd($request->all());
         //update mutu marhun - gadaimarhun
         $user =  Auth::user();
 

config/database.php

@@ -62,26 +62,6 @@ return [
                 PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
             ]) : [],
         ],
-        
-        'mysql1' => [
-            'driver' => 'mysql',
-            'url' => env('DATABASE_URL_1'),
-            'host' => env('DB_HOST_1', '127.0.0.1'),
-            'port' => env('DB_PORT_1', '3306'),
-            'database' => env('DB_DATABASE_1', 'forge'),
-            'username' => env('DB_USERNAME_1', 'forge'),
-            'password' => env('DB_PASSWORD_1', ''),
-            'unix_socket' => env('DB_SOCKET_1', ''),
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'prefix' => '',
-            'prefix_indexes' => true,
-            'strict' => true,
-            'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
-        ],
 
         'mysql2' => [
             'driver' => 'mysql',

resources/views/lelong/senarailelong.blade.php

@@ -16,6 +16,7 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
+                            <th>Cawangan</th>
                             <th>Tarikh Lelong</th>
                             <th>Masa Tamat Lelong</th>
                             <th>Harga Emas Asas</th>
@@ -29,6 +30,7 @@
                         @foreach ($lelong as $lel)
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
+                            <td>{{ $caw_lelong[0]['caw_name'] }}</td>
                             <td>{{ $lel->tarikh_lelong }}</td>
                             <td>{{ $lel->masatamat_lelong }}</td>
                             <td>{{ $lel->harga_emas_asas }}</td>
@@ -91,14 +93,14 @@
         }
     });
 
-    var tablelelong = $('#tablelelong').DataTable( {
+    var tablelelong = $('#tablelelong').DataTable({
         "columnDefs": [ 
             {
             "targets": 0,
             "orderable": false
             }, 
             {
-            "targets": 6,
+            "targets": 7,
             "orderable": false
             }
         ],

resources/views/marhun/senarailelongmarhun.blade.php

@@ -24,7 +24,11 @@
                 <tr>
                     <td>{{$loop->iteration}}</td>
                     <td>{{ $data->tarikh_lelong }}</td>
-                    <td>{{ $data->sts_lelong }}</td>
+                    <td>
+                        @if($data->sts_lelong == 0)
+                            <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                        @endif
+                    </td>
                     <td><a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$data['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px" ><i class="fas fa-download"></i></a>
                         <a href=" {{ route('marhun.senaraimarhun', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun" ><i class="far fa-edit"></i></a></td>
                 </tr>

resources/views/pengesahan/mutumarhun.blade.php

@@ -87,7 +87,7 @@
             <div class="modal-footer" style="margin-top:2%;">
                 <a  href="{{ route('pengesahan.perubahanmutumarhun', $id) }}" class="btn btn-primary">Kembali</a>
                 <button type="button" class="btn btn-danger" onclick="functerima(this)" id="tangguhlelong" >Tangguh Lelong</button>
-                <button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Terima</button>
+                <button type="button" class="btn btn-success" onclick="functerima(this)" id="terima" >Teruskan Lelong</button>
             </div>
         </form>
         </div>