Merge branch 'amirah' into 'main'

update slip serahan, migrate table scanmarhun

See merge request online-sistem1/lelong!181

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)

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()->default(0);
+            $table->string('kodcaw')->nullable()->default(0);
+            $table->unsignedBigInteger('lelong_id')->unsigned()->default(0);
+            $table->integer('fasa')->default(0);
+            $table->string('norujukan')->nullable()->default(0);
+            $table->decimal('nilaimarhun', $precision = 9, $scale = 2)->default(0);
+            $table->string('drp','100')->nullable()->default(0); 
+            $table->string('kpd','20')->nullable()->default(0); 
+            $table->decimal('bulan', $precision = 3, $scale = 0)->default(0);
+            $table->decimal('tahun', $precision = 5, $scale = 0)->default(0);
+            $table->integer('tag')->default(0)->default(0);
+            $table->datetime('tarikh')->nullable()->default(0);
+            $table->time('masa')->nullable()->default(0);
+            $table->string('namateller','30')->nullable(); 
+
+
+            $table->foreign('lelong_id')
+                ->references('id')->on('lelong')
+                ->onDelete('cascade');
+        });
     }
 
     /**

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>