From d8a51d060a30f92b0f11b41b5333f4808c715f31 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Mon, 29 Aug 2022 16:03:22 +0800
Subject: [PATCH] update slip serahan, migrate table scanmarhun

---
 app/Http/Controllers/SerahanController.php    |  2 ++
 ...2_03_07_061858_create_pengesahan_table.php | 23 +++++++++++++++++++
 resources/views/includes/sidebar.blade.php    |  8 +++----
 resources/views/pdf/slipserahan.blade.php     |  2 +-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php
index ac0bf4d3..6c02b8db 100644
--- a/app/Http/Controllers/SerahanController.php
+++ b/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)
diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php
index 6cb2646b..815341a7 100644
--- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php
+++ b/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');
+        });
     }
 
     /**
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 156cb0c6..9713f378 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/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>
diff --git a/resources/views/pdf/slipserahan.blade.php b/resources/views/pdf/slipserahan.blade.php
index 9f703c7c..ebb788ad 100644
--- a/resources/views/pdf/slipserahan.blade.php
+++ b/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>