From ce61d2461d740c2188310e70a898546f83876e13 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Tue, 30 Aug 2022 09:07:43 +0800
Subject: [PATCH] filter sidebar khazanah, pc, penilai

---
 .../Mobile/LelongMobileController.php         |   2 +-
 resources/views/includes/sidebar.blade.php    |  15 ++-
 .../views/marhun/senaraimarhun.blade.php      |   2 +-
 .../senarailelongubahmutu.blade.php           | 121 +++++++++---------
 4 files changed, 78 insertions(+), 62 deletions(-)

diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index 25a3d726..531b0e9b 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -1014,7 +1014,7 @@ class LelongMobileController extends Controller
             $lelong[$index]['status'] = $status;
         }
 
-        if ($lelong) {
+        if (empty($lelong)) {
             return response()->json([
                 'success' => true,
                 'lelong' => $lelong,
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 9713f378..6474c392 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -48,9 +48,9 @@
     
       @endhasrole
       @hasrole('khazanah')
-      <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
+      <!-- <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
         <a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
-      </li>
+      </li> -->
 
       <li class="{{ (request()->is('tangguhlelmarhun/*')) ? 'active' : '' }}">
         <a href="#marhunSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Tangguh Lelong</a>
@@ -60,6 +60,9 @@
           </li>
         </ul>
       </li>
+      <li class="{{ (request()->is('marhun/scanbarcode') )}}">
+        <a href="{{url('marhun/scanbarcode')}}">Scan Barcode</a>
+      </li>
       @endhasrole
       @hasrole('penilai')
       <li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
@@ -95,6 +98,14 @@
           </li>
         </ul> --}}
       </li>
+      <li class="{{ (request()->is('Pengesahan/*')) ? 'active' : '' }}">
+        <a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Kelulusan</a>
+        <ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
+          <li class="{{ (request()->is('pengesahan/senarailelongubahmutu/*') || request()->is('pengesahan/senarailelongubahmutu') ) ? 'active' : '' }}">
+            <a href="{{url('pengesahan/senarailelongubahmutu')}}">Kemaskini Marhun</a>
+          </li>
+        </ul>
+      </li>
       <li class="{{ ( request()->is('tangguhlelong/*')) ? 'active' : '' }}">
         <a href="{{url('tangguhlelong/senleluntuktangguh')}}">Tangguh Lelong</a>
       </li>
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index a8d3c14b..e34d81d7 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -70,7 +70,7 @@
                                         @endif
                                     </td>
                                     <td class="text-center">
-                                        <button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal"><i class="far fa-edit"></i></button>
+                                        <!-- <button type="button" class="btn btn-primary" onclick="kemaskini(this)" data-lelong="{{$bid->lelong_id}}" data-all="{{$bid}}" data-surat="{{$bid->id}}" data-marhun="{{ json_encode($bid->marhun) }}" data-toggle="modal" data-target="#noRujukanModal"><i class="far fa-edit"></i></button> -->
                                         <a type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Lihat Butiran" href="{{ route('marhun.show', [$bid->id, $bid->lelong_id]) }}"><i class="far fa-edit"></i></a>
                                     </td>
                                 </tr>
diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php
index 1d408c52..66fae227 100644
--- a/resources/views/pengesahan/senarailelongubahmutu.blade.php
+++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php
@@ -3,65 +3,70 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
-            @if ($message = Session::get('success'))
-                <div class="alert alert-success">
-                    <p>{{ $message }}</p>
+        <div class="col-md-11 mx-auto p-4">
+            <div class="card">
+                <div class="card-header">Kelulusan Kemaskini Marhun</div>
+                <div class="card-body">
+                
+                    @if ($message = Session::get('success'))
+                        <div class="alert alert-success">
+                            <p>{{ $message }}</p>
+                        </div>
+                    @endif
+                    <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>No</th>
+                                <th>ID Lelong</th>
+                                <th>Cawangan</th>
+                                <th>Tarikh Lelong</th>
+                                <th>Harga Emas Asas</th>
+                                <th>Tempoh</th>
+                                <th>Caj Lelong</th>
+                                <th>Status Lelong</th>
+                                <th class="text-center">Pengesahan</th>
+                                <th class="text-center">Telah Sah</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($arrayinfo as $lel)
+                            <tr>
+                                <td>{{$loop->iteration}}</td>
+                                <td>{{ $lel['info']['lelong_id'] }}</td>
+                                <td align = 'left'>
+                                    @foreach($lel['detailsinfo'] as $details)
+                                    <span class="m-2">{{$details['caw_name']}}</span><br>
+                                    @endforeach
+                                </td>
+                                <td>  @php 
+                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
+                                                $datez = $myDateTime->format('d-m-Y');
+                                                echo($datez);
+                                            
+                                            @endphp</td>
+                                <td>{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}</td>
+                                <td>{{ $lel['info']['jbg'] }}</td>
+                                <td>{{ $lel['info']['cajlelong'] }}</td>
+                                <td>
+                                    @if($lel['info']['sts_lelong'] == 0)
+                                        <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                                    @endif
+                                </td>
+                                <td>
+                                        <a  href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                                </td>
+                                <td>
+                                        <a  href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
+                                </td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                </form>
                 </div>
-            @endif
-            <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>No</th>
-                            <th>ID Lelong</th>
-                            <th>Cawangan</th>
-                            <th>Tarikh Lelong</th>
-                            <th>Harga Emas Asas</th>
-                            <th>Tempoh</th>
-                            <th>Caj Lelong</th>
-                            <th>Status Lelong</th>
-                            <th class="text-center">Pengesahan</th>
-                            <th class="text-center">Telah Sah</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach($arrayinfo as $lel)
-                        <tr>
-                            <td>{{$loop->iteration}}</td>
-                            <td>{{ $lel['info']['lelong_id'] }}</td>
-                            <td align = 'left'>
-                                @foreach($lel['detailsinfo'] as $details)
-                                <span class="m-2">{{$details['caw_name']}}</span><br>
-                                @endforeach
-                            </td>
-                            <td>  @php 
-                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
-                                              $datez = $myDateTime->format('d-m-Y');
-                                              echo($datez);
-                                          
-                                          @endphp</td>
-                            <td>{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}</td>
-                            <td>{{ $lel['info']['jbg'] }}</td>
-                            <td>{{ $lel['info']['cajlelong'] }}</td>
-                            <td>
-                                @if($lel['info']['sts_lelong'] == 0)
-                                    <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
-                                @endif
-                            </td>
-                            <td>
-                                    <a  href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
-                            </td>
-                            <td>
-                                    <a  href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </form>
+            </div>
         </div>
         
     </div>