Merged in izzati-ujrah-feat-pelelong-berlesen-new (pull request #57)

tambah features pelelong berlesen

resources/views/includes/sidebar.blade.php

@@ -953,6 +953,10 @@
         <li class="{{ (request()->is('lelong/senarailelong/*') || request()->is('lelong/senarailelong') ) ? 'active' : '' }}">
           <a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
         </li>
+        <li
+        class="{{ request()->is('lelong/senarailelongtaklaku/*') || request()->is('lelong/senarailelongtaklaku') ? 'active' : '' }}">
+        <a href="{{ url('lelong/senarailelongtaklaku') }}">Senarai Lelong Tidak Laku</a>
+    </li>
       </ul>
     </li>
     <li>
@@ -976,6 +980,31 @@
         </li>
       </ul>
     </li>
+    <li class="{{ request()->is('report/') ? 'active' : '' }}">
+      <a href="#reportSubmenu" data-toggle="collapse" aria-expanded="false">
+          <div class="sidebar-menu">
+              <div class="sidebar-menu-main-title">
+                  <span class="material-symbols-rounded sidebar-menu-item-main">
+                      dynamic_feed
+                  </span>
+                  Pembida
+              </div>
+              <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+          </div>
+      </a>
+      <ul class="list-unstyled collapse {{ request()->is('report/*') ? 'show' : '' }}" id="reportSubmenu">
+          <li
+              class="{{ request()->is('report/lapbidaanpembidaindex/*') || request()->is('report/lapbidaanpembidaindex') ? 'active' : '' }}">
+              <a href="{{ url('report/lapbidaanpembidaindex') }}">Bidaan Pembida</a>
+          </li>
+      </ul>
+      <ul class="list-unstyled collapse {{ request()->is('report/*') ? 'show' : '' }}" id="reportSubmenu">
+          <li
+              class="{{ request()->is('report/laplelongindex/*') || request()->is('report/laplelongindex') ? 'active' : '' }}">
+              <a href="{{ url('report/laplelongindex') }}">Lelong Keseluruhan</a>
+          </li>
+      </ul>
+  </li>
     @endhasrole
     @hasrole('account')
     <li class="{{ (request()->is('account/senarailelongan')) ? 'active' : '' }}">

resources/views/lelong/lelongtaklaku.blade.php

@@ -64,7 +64,9 @@
                         <th>Rugi (RM)</th>
                         <th>Baki (RM)</th> --}}
                         <th>Status Lelong (RM)</th>
+                        @hasrole('operasi')
                         <th>Tindakan</th>
+                        @endhasrole
                     </tr>
             </thead>
             <tbody>
@@ -95,9 +97,12 @@
                     @if($leltaklaku->status_jual == 0)
                         <td style = "color:red" ><b>TIDAK LAKU</b> </td>
                     @endif
+
+                    @hasrole('operasi')
                     <td>
                     <input type="checkbox" aria-label="Checkbox for following text input" >
                     </td>
+                    @endhasrole
                    
                 </tr>
             @endforeach
@@ -128,7 +133,6 @@
                 <td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
                 <td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td> --}}
                 <td></td>
-                <td></td>
             </tr>
         </tfoot>
 

resources/views/lelong/senarailelongtaklaku.blade.php

@@ -34,7 +34,9 @@
                             <th>Harga Emas Asas</th>
                             <th>Tempoh</th>
                             <th>Caj Lelong</th>
+                            @hasrole('operasi')
                             <th class="text-center">Tindakan</th>
+                            @endhasrole
                     </tr>
             </thead>
             <tbody>
@@ -59,7 +61,9 @@
                         <td>{{ $data['laporan']['harga_emas_asas'] }}</td>
                         <td>{{ $data['laporan']['jbg'] }}</td>
                         <td>{{ $data['laporan']['cajlelong'] }}</td>
+                        @hasrole('operasi')
                         <td><a class="btn m-1 btn-info" href=" {{ route('lelong.temprenewlelongxlaku', ['lelong_id'=>$data['laporan']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Tak Laku" ><i class="far fa-edit"></i></a></td>
+                        @endhasrole
                     </tr>
                 @endforeach
             </tbody>

resources/views/pdf/pdfsenarailapbidaan.blade.php

@@ -3,7 +3,7 @@
 <style>
 #sim {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
+	font-size:12px;
 	border-collapse: collapse;
     width: 100%;
 }
@@ -36,7 +36,7 @@
 
 #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
+	font-size:12px;
 	border-collapse: collapse;
     width: 100%;
 }
@@ -112,6 +112,10 @@ th{
 tr:nth-child(even) {
   /* background-color: #f2f2f2; */
 
+}
+
+input[type="checkbox"] {
+    margin-bottom: -8px; /* Adjust this value to change the spacing */
 }
   
   </style>
@@ -167,6 +171,9 @@ tr:nth-child(even) {
                           <th width="15%" align="right">Harga Bidaan (RM)</th> 
                           <th width="15%" align="right">Tambahan Bidaan (RM)</th> 
                           <th width="12%" align="left">Masa Bidaan</th>
+                          @hasrole('jurulelong')
+                          <th width="12%" align="left">Semakan</th>
+                          @endhasrole
                         </tr>
                         </thead>
 
@@ -202,6 +209,12 @@ tr:nth-child(even) {
                             @endphp</span><br>
                           @endforeach
                             </td>
+                            <td>
+                              @foreach($laporan['details'] as $details)
+                              <span class="m-2"><input class="m-4" type="checkbox" ></span>
+                              <br>
+                              @endforeach
+                            </td>
                         </tr>  
         
                         @endforeach