Merge branch 'main' into amir_dev

app/Http/Controllers/HomeController.php

@@ -46,9 +46,14 @@ class HomeController extends Controller
         $semakCountArray = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->join('lelongbid', function($join){
+            $join->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id')
+                 ->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id');
+        })
+        ->where('lelong.tarikh_lelong', $dateTime)
+        ->where('lelongbid.status_semak',1)
         ->select('lelong.fasa','cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong')
-        ->where('tarikh_lelong', $dateTime)
-        ->groupBy('lelong_id')
+        ->groupBy('cawangan_lelong.lelong_id','cawangan_lelong.caw_id')
         ->get()
         ->toArray();
 

app/Http/Controllers/SerahanController.php

@@ -302,6 +302,8 @@ class SerahanController extends Controller
         
 
         $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->join('lelongbidmarhun','lelongbid.id','=','lelongbidmarhun.lelongbid_id')
+        ->join('jenisemas','lelongbidmarhun.marhun','jenisemas.marhun')
         ->join('payment','lelongbid.norujukan','=','payment.norujukan')
         ->join('resit','payment.resit_id','=','resit.id')
         ->where('lelongbidder.user_id',$user_id)

app/Http/Controllers/TangguhLelongController.php

@@ -249,7 +249,7 @@ class TangguhLelongController extends Controller
                          'lelongbid.cajlelong',
                          'lelongbid.baki',
                          'lelongbid.berat',
-                         'lelongbid.marhun',
+                         'lelongbid.marhun'
                 )
                 ->get()->toArray();
 
@@ -398,7 +398,7 @@ class TangguhLelongController extends Controller
                      'lelongbid.cajlelong',
                      'lelongbid.baki',
                      'lelongbid.berat',
-                     'lelongbid.marhun',
+                     'lelongbid.marhun'
             )
             ->get()->toArray();
             // dd($lelongbidmarhun);

database/migrations/2022_03_07_061858_create_pengesahan_table.php

@@ -40,6 +40,29 @@ class CreatePengesahanTable extends Migration
             //     ->onDelete('cascade');
 
         });
+
+
+        Schema::create('scanmarhun', function (Blueprint $table) {
+            $table->id();
+            $table->string('kodcaw')->nullable();
+            $table->unsignedBigInteger('lelong_id')->unsigned();
+            $table->integer('fasa');
+            $table->string('norujukan')->nullable();
+            $table->decimal('nilaimarhun', $precision = 9, $scale = 2);
+            $table->string('drp','100')->nullable(); 
+            $table->string('kpd','20')->nullable(); 
+            $table->decimal('bulan', $precision = 3, $scale = 0);
+            $table->decimal('tahun', $precision = 5, $scale = 0);
+            $table->integer('tag');
+            $table->datetime('tarikh')->nullable();
+            $table->time('masa')->nullable();
+            $table->string('namateller','30')->nullable(); 
+
+
+            $table->foreign('lelong_id')
+                ->references('id')->on('lelong')
+                ->onDelete('cascade');
+        });
     }
 
     /**

resources/views/home.blade.php

@@ -85,6 +85,7 @@
                         
                         <br><strong>LELONGAN HARI INI</strong>
                         @foreach ($arrayinfo as $lel)
+                      
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td>{{ $lel['info']['lelong_id'] }}</td>
@@ -132,9 +133,9 @@
                                 
                                 <!-- @if($lel['info']['sts_lelong'] == 0) -->
                                     <!-- <a  href="{{ route('lelong.refreshhome',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
-                                    @if(sizeof($sag) == 0)
+                                    
                                         <a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><button class="btn btn-danger float-right " id="btnstart" >Offline</button></a>
-                                    @endif
+                                    
                                     
                                     <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                     <!-- <a  href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"  style="margin-right:40px"><i class="fas fa-users-cog"></i></a> -->
@@ -147,9 +148,9 @@
                                     <!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
                                     <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
                                 <!-- @else -->
-                                @if(sizeof($sag) == 0)
+                                
                                     <a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><button class="btn btn-danger float-right " id="btnstart" >Offline</button></a></a>
-                                @endif
+                                
                                     <!-- @endif -->
                             @endhasrole
                             <!-- @hasrole('operasi')
@@ -164,6 +165,7 @@
                             @endhasrole -->
                             </td>
                         </tr>
+                    
                         @endforeach
                         @endisset
                       

resources/views/includes/sidebar.blade.php

@@ -89,11 +89,11 @@
             <a href="{{url('jananotis/notislelong')}}">Jana Notis Lelong</a>
           </li>
         </ul>
-        <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
+        {{-- <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
           <li class="{{ (request()->is('jananotis/pembida/*') || request()->is('jananotis/pembida') ) ? 'active' : '' }}">
             <a href="{{url('jananotis/send-email')}}">Notis Pembida</a>
           </li>
-        </ul>
+        </ul> --}}
       </li>
       <li class="{{ ( request()->is('tangguhlelong/*')) ? 'active' : '' }}">
         <a href="{{url('tangguhlelong/senleluntuktangguh')}}">Tangguh Lelong</a>
@@ -169,9 +169,9 @@
       <li class="{{ (request()->is('analisa/*')) ? 'active' : '' }}">
         <a href="#analisaSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Simulasi</a>
         <ul class="list-unstyled collapse {{ (request()->is('analisa/*')) ? 'show' : '' }}" id="analisaSubmenu" >
-          <li class="{{ (request()->is('analisa/simulasipercubaan/*') || request()->is('analisa/simulasipercubaan') ) ? 'active' : '' }}">
+          {{-- <li class="{{ (request()->is('analisa/simulasipercubaan/*') || request()->is('analisa/simulasipercubaan') ) ? 'active' : '' }}">
             <a href="{{url('analisa/simulasipercubaan')}}">Simulasi Percubaan</a>
-          </li>
+          </li> --}}
           <li class="{{ (request()->is('analisa/janasimulasi/*') || request()->is('analisa/janasimulasi') ) ? 'active' : '' }}">
             <a href="{{url('analisa/janasimulasi')}}">Jana Simulasi</a>
           </li>

resources/views/pdf/slipserahan.blade.php

@@ -124,7 +124,7 @@
                           <tr>
                             <td>{{$index+1}}</td>
                             <td>{{$info['norujukan']}}</td>
-                            <td>{{$info['marhun']}}</td>
+                            <td>{{$info['descpt']}}</td>
                             <td>{{ number_format($info['berat'], 2, '.', ',') }}</td>
                             <td>{{ number_format($info['hargabida'], 2, '.', ',') }}</td>
                           </tr>

resources/views/tangguhlelong/senarailelongtangguh.blade.php

@@ -60,7 +60,7 @@
                             <td> 
                                 @if($lel['info']['sts_lelong'] == 0)
                                 {{-- @foreach($lel['detailsinfo'] as $details) --}}
-                                <a  href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian" style="margin-right:40px"><i class="fas fa-search"></i></a>
+                                <!-- <a  href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian" style="margin-right:40px"><i class="fas fa-search"></i></a> -->
                                 <a  href="{{ route('tangguhlelong.listtangguh', [$lel['info']['lelong_id'], $details['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Tangguh" style="margin-right:40px"><i class="fas fa-list"></i></a>
                                 {{-- @endforeach --}}
                                 @endif