Merge branch 'amirah' into 'main'

Amirah

See merge request online-sistem1/lelong!10

app/Http/Controllers/LelongController.php

@@ -900,6 +900,10 @@ class LelongController extends Controller
 
     }
 
+    public function lapbrglelongdetailsindex (Request $request){
+        // dd('hiio');
+    }
+
     public function lapbidaanpembidaindex (Request $request){
 
 

app/Http/Controllers/MarhunController.php

@@ -338,7 +338,8 @@ class MarhunController extends Controller
         
     public function exportmarhundetails($lelong_id)
     {
-        $lelongs= LelongBid::where('lelong_id','=',$lelong_id)->get()->toArray();
+        $lelongs= LelongBid::where('lelong_id','=',$lelong_id)
+        ->get()->toArray();
 
         $arraycaw= [];
 

resources/views/includes/sidebar.blade.php

@@ -157,6 +157,11 @@
             <a href="{{url('lelong/lapbrglelongindex')}}">Barang Lelong</a>
           </li>
         </ul>
+        <ul class="list-unstyled collapse {{ (request()->is('lelong/*')) ? 'show' : '' }}" id="laporanSubmenu" >
+          <li class="{{ (request()->is('lelong/lapbrglelongdetailsindex/*') || request()->is('lelong/lapbrglelongdetailsindex') ) ? 'active' : '' }}">
+            <a href="{{url('lelong/lapbrglelongdetailsindex')}}">Barang Lelong Details</a>
+          </li>
+        </ul>
         <ul class="list-unstyled collapse {{ (request()->is('lelong/*')) ? 'show' : '' }}" id="laporanSubmenu" >
           <li class="{{ (request()->is('lelong/lapbidaanpembidaindex/*') || request()->is('lelong/lapbidaanpembidaindex') ) ? 'active' : '' }}">
             <a href="{{url('lelong/lapbidaanpembidaindex')}}">Nama Pembida</a>

resources/views/pdf/marhundetails.blade.php

@@ -148,9 +148,7 @@ tr:nth-child(even) {
                         </tr>                                         
       @endforeach
                       </table> 
-
-
-               
-                      
+              
+                                
                     
 </tbody>

routes/web.php

@@ -109,6 +109,8 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']);
     Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']);    
 
+    Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']);
+
     Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']);
     Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']);
     Route::post('/pdfsenarailapbidaan',['as' =>'lelong.pdfsenarailapbidaan','uses'=>'LelongController@pdfsenarailapbidaan']);