From a1ccf93d6f12b52ab3a64c353d27c89078325e2a Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 24 Nov 2022 15:20:21 +0800
Subject: [PATCH 01/23] update scanbarcode, laporan semakan marhun,

---
 app/Http/Controllers/NotisController.php      |  5 +-
 app/Http/Controllers/ReportController.php     | 59 ++++++++++++++---
 resources/views/marhun/scanbarcode.blade.php  | 11 ++--
 .../views/marhun/scanbarcodemasuk.blade.php   |  3 +
 .../views/pdf/listlelongdetails.blade.php     |  2 +-
 resources/views/pdf/pdflaplelong.blade.php    | 66 ++++++++++++-------
 6 files changed, 108 insertions(+), 38 deletions(-)

diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index fbce6251..8069a8a6 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -162,7 +162,10 @@ class NotisController extends Controller
             ->where('nokp','=',$cal['nokp'])
             ->get();
             // dd($listsag);
-            foreach($listsag as $index=>$listing){
+
+            
+            foreach($listsag as $index=>$listing)
+            {
 
                 $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 106353f2..aec74bf4 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -89,12 +89,14 @@ class ReportController extends Controller
         $arraydetails = [];
         $arrayinfo = [];
 
-
         $test = Lelong::with(['cawangan','lelongBid'])
         ->find($lelong_id);
 
-        $cawangan = $test->cawangan;
-        $lelong_bid = $test->lelongBid;
+        $cawangan = $test->cawangan
+        ->where('kodcaw','=',$kodcaw);
+
+        $lelong_bid = $test->lelongBid
+        ->where('kodcaw','=',$kodcaw);
    
 
 
@@ -207,7 +209,7 @@ class ReportController extends Controller
       
 
           
-        $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo'
+        $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo','nilai_marhun'
                                                         ))->setPaper('a4', 'potrait');
         
         return $pdf->download('Senarai Lelong Details.pdf');
@@ -347,7 +349,14 @@ class ReportController extends Controller
         $total_hargalelong = 0;
         $total_bakirugi = 0;
         $total_hargaasas = 0;
+        $jumlahmargin = 0;
         $arrayinfocaw = [];
+        $arraydetails = [];
+        $rugilelong = 0;
+        $bakilelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+
 
         $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -372,12 +381,29 @@ class ReportController extends Controller
         ->where('lelongbidder.status_bidder','=','1')
         ->where('lelongbid.kodcaw',$kodcaw)
         ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
-        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
+        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder','bakiupah')
         ->get()->toArray();
 
         foreach($laporanlelong as $index1=>$laplelong)
         {
-                     
+
+            $margin = ($laplelong['pinjaman']/ $laplelong['nilaimarhun'])*100;
+
+            $lelong = Lelong::where('id',$lelong_id)->get();
+            $sumcajlelong =  $laplelong['hargaasas'] * ($lelong[0]['cajlelong']/100);
+            $totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong,1,1);
+
+            if($totalbaki > 0)
+            {
+                $bakilelong = $bakilelong + $totalbaki;  
+            }
+            else
+            {
+                $rugilelong = $rugilelong - $totalbaki;
+            }
+
+
+                                 
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
             $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
             $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan'];
@@ -385,14 +411,29 @@ class ReportController extends Controller
             $total_hargalelong = $total_hargalelong + $laplelong['hargabida'];
             $total_bakirugi = $total_bakirugi + $laplelong['baki'];
             $total_hargaasas = $total_hargaasas + $laplelong['hargaasas'];
+
+            array_push($arraydetails,['laplelong' => $laplelong,
+                                      'margin' => $margin,
+                                      'rugilelong'=>$rugilelong,
+                                      'bakilelong'=>$bakilelong,
+                                    
+                                    
+                                    ]);
+
+            $total_rugilelong = $total_rugilelong + $rugilelong;
+            $total_bakilelong = $total_bakilelong + $bakilelong;
+
                                    
         }   
 
 
-        $pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
-        'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw'))
 
-        ->setPaper('a4', 'potrait');
+
+        $pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
+        'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw','margin','arraydetails',
+        'total_rugilelong','total_bakilelong'))
+
+        ->setPaper('a4', 'landscape');
         return $pdf->download('Laporan Lelong Keseluruhan.pdf');
        
 
diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php
index c085a4e6..ac1a5a82 100644
--- a/resources/views/marhun/scanbarcode.blade.php
+++ b/resources/views/marhun/scanbarcode.blade.php
@@ -23,8 +23,8 @@
                         {{ $message }}
                     </div>
                     @endif
-                    {{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
-                    <a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a> --}}
+                    <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
+                    <a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
 
                     <p>Tarikh Lelong:
                         @php
@@ -38,9 +38,10 @@
                         <li class="nav-item">
                             <a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">Senarai SAG Akan Dilelong</a>
                         </li>
-                        {{-- <li class="nav-item">
-                            <a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a>
-                        </li> --}}
+                        <li class="nav-item">
+                            {{-- <a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a> --}}
+                            <a class="nav-link" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
+                        </li>
                     </ul>
                     <div class="tab-content" id="myTabContent">
                         <div class="tab-pane fade show active" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
diff --git a/resources/views/marhun/scanbarcodemasuk.blade.php b/resources/views/marhun/scanbarcodemasuk.blade.php
index 6dbf066a..373d0c23 100644
--- a/resources/views/marhun/scanbarcodemasuk.blade.php
+++ b/resources/views/marhun/scanbarcodemasuk.blade.php
@@ -36,6 +36,9 @@
                     </p>
 
                     <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{route('marhun.scanbarcode',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link active" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a>
                         </li>                     
diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php
index bc13f395..c8434cd8 100644
--- a/resources/views/pdf/listlelongdetails.blade.php
+++ b/resources/views/pdf/listlelongdetails.blade.php
@@ -160,7 +160,7 @@ tr:nth-child(even) {
                           <td colspan="4" align="left"></td>
                           <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
-                          <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                          <td>{{ number_format($marhun['nmarhuns'], 2, '.', ',') }}</td>
                           <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                           <td></td>
                         </tr>  
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 9b719534..86ae623c 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -120,41 +120,42 @@ tr:nth-child(even) {
                             <th>No Rujukan</th>
                             <th>Nilai Marhun</th>
                             <th>Pembiayaan</th>
+                            <th>Margin%</th>
                             <th>Upah Simpan</th>
                             <th>Caj Lelong</th>
                             <th>Harga Lelong</th>
                             <th>Baki</th>
-                            <th>Rugi</th>
                             <th>Harga Asas</th>
-                            <th>Nama Pembeli</th>                        >
+                            <th>Nama Pembeli</th>             
 
                         </tr>
                         </thead>
 
-              @foreach ($laporanlelong as $laporan)
+              @foreach ($arraydetails as $laporan)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
-                    <td>{{ $laporan['norujukan'] }}</td>
-                    <td>{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
+                    <td>{{ $laporan['laplelong']['norujukan'] }}</td>
+                    <td>{{ number_format($laporan['laplelong']['nilaimarhun'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['pinjaman'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['margin'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['upahsimpan'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['cajlelong'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['hargabida'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['baki'], 2, '.', ',')}}</td>
+
                     <?php
                         $rugi = 0;
                         $baki = 0;
-                         if(strpos($laporan['baki'], '-') !== false)
+                         if(strpos($laporan['laplelong']['baki'], '-') !== false)
                          {
-                            $rugi  = $laporan['baki'];
+                            $rugi  = $laporan['laplelong']['baki'];
                          }
                          else {
-                            $baki = $laporan['baki'];
+                            $baki = $laporan['laplelong']['baki'];
                          }
                     ?>
-                     <td>{{ number_format($baki, 2, '.', ',') }}</td>
-                     <td>{{ number_format($rugi, 2, '.', ',') }}</td>
-                     <td>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
-                     <td>{{$laporan['nama_bidder']}}</td>
+                     <td>{{ number_format($laporan['laplelong']['hargaasas'], 2, '.', ',')}}</td>
+                     <td>{{$laporan['laplelong']['nama_bidder']}}</td>
                     
                 </tr>                
               @endforeach
@@ -165,32 +166,53 @@ tr:nth-child(even) {
                 <td colspan="2" align="left"><strong>Jumlah Keseluruhan</strong></td>
                 <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
+                <td></td>
                 <td><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_hargalelong, 2,'.',',') }}</strong></td>
+
+
                 <?php
                 $total_rugi = 0;
                 $total_baki = 0;
                  if(strpos($total_bakirugi, '-') !== false)
                  {
                      $total_rugi  = $total_bakirugi;
-                     
                     }
                     else {
                     $total_baki = $total_bakirugi;
 
                  }
-            ?>
+
+                ?>
                 <td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td>
-                <td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
                 <td><strong>{{number_format($total_hargaasas, 2, '.', ',')}}</strong></td>
                 <td></td>
-              </tr>                                         
-                       
+              </tr> 
+
+           
+          
+          </table>
+
+          <table  cellspacing="0" cellpadding="1" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+            <br><br><br><br><br><br><br><br><br><br>
 
           
-          </table>  
+           
+            <tr>              
+              <td>Jumlah Baki A: {{$total_bakilelong}}</td>         
+              <td>Jumlah Baki B: {{$total_rugilelong}}</td>          
+              <td><b>Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}<b></td>
+            </tr>
+  
+          </table>
 
+
+          
+
+          
+
+         
                     
 
 

From 6d1b9bbbabfd0e6994de785af1587df8b7146175 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Thu, 24 Nov 2022 15:49:00 +0800
Subject: [PATCH 02/23] Add export data

---
 app/Http/Controllers/LelongController.php   |  48 +++++--
 app/Models/Cawangan.php                     |   5 +
 app/Models/Lelong.php                       |  17 ++-
 app/Models/LelongBid.php                    |   7 +-
 app/Models/Pengesahan.php                   |   9 +-
 resources/views/lelong/exportData.blade.php | 145 +++++++++++++++-----
 6 files changed, 187 insertions(+), 44 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 171fbf07..4d5af294 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -93,20 +93,52 @@ class LelongController extends Controller
     public function exportData($lelongid)
     {
 
-        $lelong = Lelong::with('cawangan')->where('lelong.id', $lelongid)->first();
+        $lelong = Lelong::with(['cawangan', 'lelongBidJual'])->find($lelongid);
+        $allCawangan = $lelong->cawangan->keyBy('caw_code');
+        $lelongBid = $lelong->lelongBidJual->groupBy('kodcaw');
+
+        foreach ($lelongBid as $index => $lelong_bid) {
+            foreach ($allCawangan as $data => $cawangan) {
+                if ($data == $index) {
+                    $cawangan['lelongBid'] = $lelong_bid;
+                }
+            }
+        }
+
+        foreach ($lelong->cawangan as $index => $caw) {
+            $allLelongBid = $caw->lelongBid->count();
+            $settlePayment = $caw->lelongBid->where('status_payment', 1)->count();
+
+            $lelong->cawangan[$index]['lelong_laku'] = $allLelongBid;
+            $lelong->cawangan[$index]['selesai_bayar'] = $settlePayment;
+        }
+        $lelong['jumlah_lelong_laku'] = $lelong->lelongBidJual->count();
 
         return view('lelong.exportData', compact('lelong'));
     }
 
     public function exportDataToApi(Request $request)
     {
+        $lelongDetails = Lelong::find($request->lelong_id);
         $cawanganLelong = CawanganLelong::with('cawangan')->where('caw_id', $request->cawangan)->where('lelong_id', $request->lelong_id)->first();
-        $lelongBidMaster = LelongBid::where('lelong_id', $request->lelong_id)
+        $lelongBidMaster = LelongBid::with('payment:norujukan,status_payment_opt,remark')
+        ->where('lelong_id', $request->lelong_id)
             ->where('status_jual', 1)
             ->where('status_payment', 1)
             ->where('kodcaw', $cawanganLelong->cawangan->caw_code)
             ->get();
 
+
+        foreach ($lelongBidMaster as $index => $lelongBid) {
+            if ($lelongBid->payment->status_payment_opt == 1) {
+                $lelongBidMaster[$index]['payment_method'] =  "TUNAI";
+                $lelongBidMaster[$index]['teller'] =  "LELONG";
+            } elseif ($lelongBid->payment->status_payment_opt == 2) {
+                $lelongBidMaster[$index]['payment_method'] =  "BAYARAN ONLINE";
+                $lelongBidMaster[$index]['teller'] =  "LELONG ONLINE";
+            }
+        }
+
         $lelongbid = $lelongBidMaster->pluck('id');
         $lelongbidId = $lelongBidMaster->keyBy('id');
 
@@ -120,25 +152,25 @@ class LelongController extends Controller
 
         $paymentOnline = Payment::where('lelong_id', $request->lelong_id)
         ->where('status', '=', 2)
+        ->where('status_payment_opt', '=', 2)
         ->where('remark', '=', 'BERJAYA BAYARAN ONLINE')
         ->where('kodcaw', '=', $cawanganLelong->cawangan->caw_code)
         ->sum('total_payment');
 
         $paymentTunai = Payment::where('lelong_id', $request->lelong_id)
-        ->where('status', '=', 1)
+        ->where('status', '=', 2)
+        ->where('status_payment_opt', '=', 1)
+        ->where('remark', '=', 'TUNAI')
         ->where('kodcaw', '=', $cawanganLelong->cawangan->caw_code)
         ->sum('total_payment');
-        // dd($paymentOnline, $paymentTunai);
-
-        // dd($lelongBidMaster->toArray(), $lelongbidmarhun->toArray(), floatval($paymentOnline), floatval($paymentTunai));
-
-
 
         $exportData = Http::withOptions(['verify' => config('app.api_verify')])->post(
             config('app.api_url') . 'exportLelong',
             [
                 'kodcaw' => $cawanganLelong->cawangan->caw_code,
                 'tarikh' => $request->tarikh_lelong,
+                'masadari' => $lelongDetails->masamula_lelong,
+                'masahingga' => $lelongDetails->masatamat_lelong,
                 'lelongbid' => $lelongBidMaster->toArray(),
                 'lelongbidmarhun' => $lelongbidmarhun->toArray(),
                 'gldetail' => floatval($paymentOnline),
diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php
index cd57db68..02b14463 100644
--- a/app/Models/Cawangan.php
+++ b/app/Models/Cawangan.php
@@ -61,6 +61,11 @@ class Cawangan extends Model
         return $this->hasMany(LelongBid::class, 'caw_id', 'id');
     }
 
+    public function lelongBidJual()
+    {
+        return $this->hasMany(LelongBid::class, 'caw_id', 'id')->where('status_jual', 1);
+    }
+
     public function user()
     {
         return $this->belongsTo(User::class, 'kodcaw', 'caw_code');
diff --git a/app/Models/Lelong.php b/app/Models/Lelong.php
index 8f12511d..9dc93407 100644
--- a/app/Models/Lelong.php
+++ b/app/Models/Lelong.php
@@ -36,6 +36,16 @@ class Lelong extends Model
         return $this->hasMany(LelongBid::class, 'lelong_id', 'id');
     }
 
+    public function lelongBidJual() 
+    {   
+        return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_jual', 1);
+    }
+
+    public function lelongBidBelumSemak() 
+    {   
+        return $this->hasMany(LelongBid::class, 'lelong_id', 'id')->where('status_semak', 0);
+    }
+
     public function lelKarat()
     {
         return $this->hasMany(LelKarat::class, 'lelong_id', 'id');
@@ -43,6 +53,11 @@ class Lelong extends Model
 
     public function pengesahan()
     {
-        return $this->hasMany(Pengesahan::class,'lelong_id','id');
+        return $this->hasMany(Pengesahan::class, 'lelong_id', 'id');
+    }
+
+    public function pengesahanTelahSah()
+    {
+        return $this->hasMany(Pengesahan::class, 'lelong_id', 'id')->whereNotNull('disahkan_oleh');
     }
 }
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index 2b1cbd5a..6aac38d6 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -74,6 +74,11 @@ class LelongBid extends Model
 
     public function pengesahan()
     {
-        return $this->belongsTo(Pengesahan::class, 'id', 'lelongbid_id');
+        return $this->hasMany(Pengesahan::class, 'lelongbid_id', 'id');
+    }
+
+    public function payment()
+    {
+        return $this->hasOne(Payment::class, 'norujukan', 'norujukan')->where('status', 2);
     }
 }
diff --git a/app/Models/Pengesahan.php b/app/Models/Pengesahan.php
index c8855205..3dfb2307 100644
--- a/app/Models/Pengesahan.php
+++ b/app/Models/Pengesahan.php
@@ -28,8 +28,13 @@ class Pengesahan extends Model
         return $this->belongsTo(LelongBidMarhun::class, 'lelongbidmarhun_id' , 'id');
     }
 
-    public function lelong()
+    public function lelong() 
     {
-        return $this->belongsTo(Lelong::class,'lelong_id','id');
+        return $this->belongsTo(Lelong::class, 'lelong_id', 'id');
+    }
+
+    public function lelongbid()
+    {
+        return $this->belongsTo(LelongBid::class, 'lelongbid_id', 'id');
     }
 }
diff --git a/resources/views/lelong/exportData.blade.php b/resources/views/lelong/exportData.blade.php
index 380919e1..abf4036c 100644
--- a/resources/views/lelong/exportData.blade.php
+++ b/resources/views/lelong/exportData.blade.php
@@ -4,54 +4,135 @@
 
 <div class="container">
     <div class="card">
-        <div class="card-header">Export Data Lelong</div>
-        <div class="card-body">
-            <a href="{{ route('lelong.senarailelong') }}" class="btn btn-light">
-                <h3><i class="fas fa-arrow-alt-circle-left"></i></h3>
+        <div class="card-header header-style">
+            <a href="{{ route('lelong.senarailelong') }}" class="header-style-icon">
+                <i class="fas fa-arrow-left"></i>
             </a>
+            <div class="header-style-title">
+                export data lelong : {{$lelong['tarikh_lelong']}}
+            </div>
+        </div>
+        <div class="card-body">
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 {{ $message }}
             </div>
             @endif
-            <p>Batch Lelong: {{$lelong['id']}}</p>
-            <p>Tarikh Lelong: {{$lelong['tarikh_lelong']}}</p>
-            <p>Masa Mula Lelong: {{$lelong['masamula_lelong']}}</p>
-            <p>Masa Tamat Lelong: {{$lelong['masatamat_lelong']}}</p>
-            <table class="table table-striped  table-xl text-center" id="senarailelongtaklaku" style="width:100%">
-                <thead class="bg-primary text-white">
-                    <tr>
-                        <th>Bil</th>
-                        <th>Kod Cawangan</th>
-                        <th>Cawangan</th>
-                        <th>Status</th>
-                        <th>Tindakan</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <form action="{{ route('lelong.exportDataToApi') }}" method="POST">
-                        @csrf
-                        <input type="hidden" name="lelong_id" value="{{ $lelong->id }}">
-                        <input type="hidden" name="tarikh_lelong" value="{{ $lelong->tarikh_lelong }}">
+            <div class="row">
+                <div class="col-md-12 col-lg-6">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label">Batch Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelong['id']}}">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label">Masa Mula Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelong['masamula_lelong']}}">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label">Masa Tamat Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelong['masatamat_lelong']}}">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label">Jumlah Surat Laku</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelong['jumlah_lelong_laku']}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="overflow-x: auto;">
+                <table class="table table-bordered text-center" id="sayasukatido" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>Kod Cawangan</th>
+                            <th>Cawangan</th>
+                            <th>Status</th>
+                            <th>Tindakan</th>
+                        </tr>
+                    </thead>
+                    <tbody>
                         @foreach($lelong->cawangan as $data)
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td>{{$data->caw_code}}</td>
                             <td>{{$data->caw_name}}</td>
-                            @if($data->pivot->export_data_sts == null)
-                            <td><span class="badge badge-danger">Belum Selesai</span></td>
-                            <td><button type="submit" name="cawangan" value="{{ $data->id }}" class="btn btn-sm btn-primary">EXPORT <i class="fas fa-file-export"></i></button></td>
-                            @elseif($data->pivot->export_data_sts == "SUCCESS")
-                            <td class="text-success">Selesai</td>
-                            <td></td>
+                            <td>
+                                <p>Surat Laku: {{$data->lelong_laku}}</p>
+                                <p>Selesai Bayar: {{$data->selesai_bayar}}</p>
+                            </td>
+                            @if($data->pivot->export_data_sts == "SUCCESS")
+                            <td class="text-success">Selesai Export</td>
+                            @elseif($data->selesai_bayar == $data->lelong_laku)
+                            <td>
+                                <form action="{{ route('lelong.exportDataToApi') }}" method="POST">
+                                    @csrf
+                                    <input type="hidden" name="lelong_id" value="{{ $lelong->id }}">
+                                    <input type="hidden" name="tarikh_lelong" value="{{ $lelong->tarikh_lelong }}">
+                                    <button type="submit" name="cawangan" value="{{ $data->id }}" class="btn btn-primary">EXPORT <i class="fas fa-file-export"></i></button>
+                                </form>
+                            </td>
+                            @elseif($data->selesai_bayar < $data->lelong_laku)
+                                <td>Bayaran belum diselesai sepenuhnya</td>
                             @endif
                         </tr>
                         @endforeach
-                    </form>
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
 </div>
 
+<script>
+    var tablesayasukatido = $('#sayasukatido').DataTable({
+        // "pageLength": 50,
+    });
+
+    $('#confirmExport').confirm({
+        title: 'Export Data Lelong',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'blue',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
+            },
+            Daftar: {
+                btnClass: 'btn-blue',
+                action: function() {
+                    $("#submitexport").submit();
+                    console.log('lallu');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+</script>
+
 @endsection
\ No newline at end of file

From 2de49a7038a6ba7118797728f51263dca42924ce Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Thu, 24 Nov 2022 16:12:21 +0800
Subject: [PATCH 03/23] update checking taraf

---
 app/Http/Controllers/PenggunaController.php | 32 ++++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php
index fe55e4e1..7540a017 100644
--- a/app/Http/Controllers/PenggunaController.php
+++ b/app/Http/Controllers/PenggunaController.php
@@ -91,6 +91,22 @@ class PenggunaController extends Controller
             {
                 return redirect()->route('pengguna.index')->with('failed','Maaf, Nama Pengguna / Emel Berikut Telah Wujud !');
             } else {
+
+                $allroles = Role::all()->pluck('name');
+                $arraytaraf = [];
+                $counttaraf = 0;
+                foreach($allroles as $index=>$taraf) {
+                    $req = 'taraf'.$taraf;
+                    if($request->$req)
+                    {
+                        $counttaraf++;
+                        array_push($arraytaraf,$taraf);
+                    }
+                }
+                if($counttaraf < 1){
+                    return redirect()->route('pengguna.index')->with('failed','Maaf, Taraf Tidak Dipilih');
+                }
+
                 $user = new User;
                 $user->name = $request->name;
                 $user->username = $request->username;
@@ -103,18 +119,12 @@ class PenggunaController extends Controller
                 $user->user_type = 1;
                 $user->save();
 
-                $allroles = Role::all()->pluck('name');
-                $arraytaraf = [];
-                foreach($allroles as $index=>$taraf) {
-                    $req = 'taraf'.$taraf;
-                    if($request->$req)
-                    {
-                        array_push($arraytaraf,$taraf);
-                    }
-                }
                 $user->syncRoles($arraytaraf);
-                return redirect()->route('pengguna.index')
-                    ->with('success', 'Pengguna Berjaya Disimpan');
+                    return redirect()->route('pengguna.index')
+                        ->with('success', 'Pengguna Berjaya Disimpan');
+            
+                
+                
             }
     
     }

From 548489f520ddd942babea8c40edc8170b975d1f0 Mon Sep 17 00:00:00 2001
From: root <root@bida.arrahn>
Date: Thu, 24 Nov 2022 17:44:22 +0800
Subject: [PATCH 04/23] Fix at server

---
 app/Http/Controllers/LelongController.php     |  4 ++--
 app/Http/Controllers/SimulasiController.php   |  6 +++---
 .../views/simulasi/senaraimarhunlel.blade.php | 21 ++++++++++++-------
 .../simulasi/senaraitempsimulasi.blade.php    |  6 ++++--
 .../views/simulasi/showsimulasi.blade.php     | 13 +++++++-----
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 4d5af294..bb27120c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -247,7 +247,7 @@ class LelongController extends Controller
                 $bakiupah += $lel_bid->bakiupah;
                 $berat += $lel_bid->berat;
                 $hargaasas += $lel_bid->hargaasas;
-                $cajlelong += $lel_bid->cajlelong;
+                //$cajlelong += $lel_bid->cajlelong;
 
                 $sumcajlelong =  $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
                 $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
@@ -5245,4 +5245,4 @@ class LelongController extends Controller
 
  
 }
-       
\ No newline at end of file
+       
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 5dfdd098..008d6546 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -977,10 +977,10 @@ class SimulasiController extends Controller
                 $bakiupah += $sim_bid->bakiupah;
                 $berat += $sim_bid->berat;
                 $hargaasas += $sim_bid->hargaasas;
-                $cajlelong += $sim_bid->cajlelong;
+          
 
-                $sumcajlelong =  $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $sumcajlelong =  $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);                
+		$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
                 $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
                 if(strpos($totalbaki, '-') !== false)
                 {
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index e47316af..e2cce136 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -71,10 +71,11 @@
                                     <th>Tempoh</th>
                                     <th>Berat (gm)</th>
                                     <th>Nilai Marhun (RM)</th>
-                                    <th>Harga Asas (RM)</th>
+                                    {{--<th>Harga Asas (RM)</th>--}}
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
                                     <th>Caj Lelong (RM)</th>
+				    <th>Harga Asas (RM)</th>
                                     <th>Baki Lelong (RM)</th>
                                     <th>Tindakan</th>
                                 </tr>
@@ -91,10 +92,12 @@
                                     <td>{{ $marhun['tempoh']}}</td>
                                     <td>{{ $marhun['berat'] }}</td>
                                     <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                                    {{--<td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>--}}
                                     <td>{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}</td>
-                                    <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+				    <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>                                   
+ 				    <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+				    <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                                   {{-- <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td> --}}
                                     @php
                                     $rugi = 0;
                                     $baki = 0;
@@ -124,10 +127,12 @@
                                     <td colspan="3" class="text-center"><b>JUMLAH KESELURUHAN</b></td>
                                     <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
+                                    {{--<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>--}}
                                     <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
+				    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                                    
+				    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
+				    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
+                                    {{--<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>--}}
                                     <td>{{ number_format($bakilelong, 2, '.', ',') }}</td>
                                     <td></td>
                                 </tr>
@@ -205,4 +210,4 @@
         "pageLength": 500,
     });
 </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php
index fbdfddc4..68a56478 100644
--- a/resources/views/simulasi/senaraitempsimulasi.blade.php
+++ b/resources/views/simulasi/senaraitempsimulasi.blade.php
@@ -60,7 +60,8 @@
                 <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" class="check_all"></th>
-                            <th>Kod Cawangan</th>
+                            <th>Bil</th>
+			    <th>Kod Cawangan</th>
                             <th>Cawangan</th>
                             <th>Bil Lelong</th>
                             <th>Berat (gm)</th>
@@ -76,7 +77,8 @@
                                 
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="custom_name"></td>
-                            <td>{{ $send['kodcaw'] }}</td>
+                            <td>{{ $loop->iteration }}</td>
+			    <td>{{ $send['kodcaw'] }}</td>
                             <td >{{ $send['caw_name'] }}</td>
                             <td>{{ $send['bil_lelong'] }} </td>
                             <td>{{ number_format($send['total_berat'], 2) }} </td>
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 871f59e7..95d82c21 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -179,11 +179,12 @@
                                             <th>Cawangan</th>
                                             <th>Bil SAG</th>
                                             <th>Berat (gm)</th>
-                                            <th>Nilai Marhun (RM)</th>
+                                            <th>Nilai Marhun Asal (RM)</th>
                                             <th>Pembiayaan (RM)</th>
                                             <th>Keuntungan (RM)</th>
-                                            <th>Harga Asas (RM)</th>
+                                            {{--<th>Harga Asas (RM)</th>--}}
                                             <th>Caj (RM)</th>
+					    <th>Harga Asas (RM)</th>
                                             <th>Baki (RM)</th>
                                             <th>Rugi (RM)</th>
                                         </tr>
@@ -199,8 +200,9 @@
                                             <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                             <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                             <td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
-                                            <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                            {{--<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>--}}
                                             <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+					    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                             <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                             <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                         </tr>
@@ -214,8 +216,9 @@
                                             <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                                             <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
                                             <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+					    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
                                             <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
-                                            <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                            {{--<td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>--}}
                                             <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
                                             <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                         </tr>
@@ -504,4 +507,4 @@
     }
 </script>
 
-@endsection
\ No newline at end of file
+@endsection

From 554cd3abdcbf2380553de236236536cca94d6c01 Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Fri, 25 Nov 2022 16:25:38 +0800
Subject: [PATCH 05/23] update page jurulelong - list leong terdouble

---
 app/Http/Controllers/HomeController.php |   3 +-
 resources/views/home.blade copy 3.php   | 444 ++++++++++++++++++++++++
 2 files changed, 446 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/home.blade copy 3.php

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 9587aace..b39fe12e 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -76,8 +76,9 @@ class HomeController extends Controller
             'lelong.cajlelong',
             'lelong.sts_lelong'
             )
+        ->groupBy('cawangan_lelong.lelong_id')
         ->get()->toArray();
-        // dd($lelong, $lelong2);
+         //dd($lelong);
 
         foreach($lelong as $info)
         {
diff --git a/resources/views/home.blade copy 3.php b/resources/views/home.blade copy 3.php
new file mode 100644
index 00000000..26f7991d
--- /dev/null
+++ b/resources/views/home.blade copy 3.php	
@@ -0,0 +1,444 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row">
+    <div class="col-md-11 mx-auto">
+            <div class="card">
+                <div class="card-header">{{ __('Dashboard') }}</div>
+                <div class="card-body">
+                    @if (session('status'))
+                        <div class="alert alert-success" role="alert">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+
+                    <!-- {{ __('Selamat Datang!') }} -->
+                    @hasrole('admin')
+                        I am a admin! 
+                    @endhasrole
+                    @hasrole('khazanah')
+                        I am a khazanah!
+                        @foreach($all_lelong as $lelong)
+                        @if($lelong['sag_belum_semak'] != null)
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-lg-6 col-md-12 card p-4">
+                                    <div class="form-group row">
+                                        <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                        <div class="col-6">
+                                            <div class="input-group">
+                                                <input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group row">
+                                        <label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
+                                        <div class="col-6">
+                                            <div class="input-group">
+                                                <input type="text" readonly class="form-control bg-light text-danger" value="{{ $lelong->sag_belum_semak }}">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div> 
+                        </div> 
+                        @endif
+                        @endforeach
+                    @endhasrole
+                    @hasrole('penilai')
+                        I am a penilai!
+                        @foreach($all_lelong as $lelong)
+                        @if($lelong['sag_belum_semak'] != null)
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-lg-6 col-md-12 card p-4">
+                                    <div class="form-group row">
+                                        <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                        <div class="col-6">
+                                            <div class="input-group">
+                                                <input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group row">
+                                        <label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
+                                        <div class="col-6">
+                                            <div class="input-group">
+                                                <input type="text" readonly class="form-control bg-light text-danger" value="{{ $lelong->sag_belum_semak }}">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div> 
+                        </div> 
+                        @endif
+                        @endforeach
+                    @endhasrole
+                    @hasrole('pengurus-cawangan')
+                        I am a pengurus-cawangan!
+                        @foreach($all_lelong as $lelong)
+                        @if($lelong['sag_belum_semak'] != null)
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-lg-6 col-md-12 card p-4">
+                                    <div class="form-group row">
+                                        <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                        <div class="col-6">
+                                            <div class="input-group">
+                                                <input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="form-group row">
+                                        <label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
+                                        <div class="col-6">
+                                            <div class="input-group">
+                                                <input type="text" readonly class="form-control bg-light text-danger" value="{{ $lelong->sag_belum_semak }}">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div> 
+                        </div> 
+                        @endif
+                        @endforeach 
+                        @php
+                        @empty($arrayinfomutu)
+                    @endphp
+
+                    @if(count($arrayinfomutu)> 0)
+                        KELULUSAN UBAH MARHUN
+                        <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Batch Lelong</th>
+                            <th>Cawangan</th>
+                            <th>Tarikh Lelong</th>
+                            <th>Harga Emas Asas</th>
+                            <th>Tempoh</th>
+                            <th>Caj Lelong</th>
+                            <th>Status Lelong</th>
+                            <th class="text-center">Pengesahan</th>
+                            <th class="text-center">Telah Sah</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach($arrayinfomutu as $lel)
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['info']['lelong_id'] }}</td>
+                            <td align = 'left'>
+                                @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </td>
+                            <td>  @php 
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
+                                              $datez = $myDateTime->format('d-m-Y');
+                                              echo($datez);
+                                          
+                                          @endphp</td>
+                                        
+                            <td>{{ number_format($lel['info']['harga_emas_asas'], 2, '.', ',')}}</td>
+                            <td>{{ $lel['info']['jbg'] }}</td>
+                            <td>{{ $lel['info']['cajlelong'] }}</td>
+                            <td>
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                                @endif
+                            </td>
+                            <td>
+                                    <a  href="{{ route('pengesahan.perubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                            </td>
+                            <td>
+                                    <a  href="{{ route('pengesahan.listperubahanmutumarhun', ['id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-user"></i></a>
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+                @endif
+                     @php
+                         
+                     @endphp
+                    @endhasrole
+                    @hasrole('pengurus-cawangan-khas')
+                    I am a pengurus-cawangan-khas!
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-6 col-sm-4">
+                                <p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
+                            </div>
+                            <div class="col-6 col-sm-4">    
+                            </div>
+                        </div>
+                    </div> 
+                @endhasrole
+                    @hasrole('jurulelong')
+                        Saya jurulelong! 
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-6 col-sm-4">
+                                    <p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
+                                </div>
+                                <div class="col-6 col-sm-4">    
+                                </div>
+                            </div>
+                        </div> 
+                    
+                </div> 
+                        
+                        @if(count($arrayinfo)> 0)
+                        <table class=" table table-striped  table-xl text-center"  id="tablelelong" style="width:100%">
+
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Batch Lelong</th>
+                            <th>T.Lelong</th>
+                            <th>Fasa</th>
+                            <th>Cawangan</th>
+                            <th>Status</th>
+                            <th>Masa Tamat</th>
+                            <th>Harga Emas</th>
+                            <th>Tempoh</th>
+                            <!-- <th>Caj Lelong</th> -->
+                            <th class="text-center">Tindakan</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @empty($arrayinfo)
+                        <tr><td colspan = 10>Tiada maklumat</td></tr>
+                        @endempty 
+
+                        @isset($arrayinfo)
+                        
+                        <br><strong>LELONGAN HARI INI</strong>
+                        @foreach ($arrayinfo as $lel)
+                      
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['info']['lelong_id'] }}</td>
+                            <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
+                            <td>{{$lel['info']['fasa']}}</td>
+                            <td align = 'left'>
+                                @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </td>
+                            <td align = 'center'>
+                                @foreach($lel['detailsinfo'] as $index=>$details)
+
+                                @if($details['status_online'] == '0')
+
+                                        @if($semakCountArray[$index] > 0)
+                                        <a class="startlelongcawangan" href="{{ route('lelong.startcawangan',[$lel['info']['lelong_id'], 'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><button class="btn btn-danger float-right " id="btnstart"  disabled>Offline</button></a><br>
+                                        @elseif($semakCountArray[$index] == 0)
+                                        <a class="startlelongcawangan" href="{{ route('lelong.startcawangan',[$lel['info']['lelong_id'], 'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><button class="btn btn-danger float-right " id="btnstart">Offline</button></a><br>
+                                       
+                                        @endif
+                                    
+                                @elseif($details['status_online'] == '1')
+                                <a class="startlelongcawangan" href="{{ route('lelong.stopcawangan',[$lel['info']['lelong_id'], 'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan"><button class="btn btn-success float-right " id="btnstart">Online</button></a><br>
+                                @endif
+                                
+                                @endforeach
+                            </td>
+                            <td>  @foreach($lel['detailsinfo'] as $details)
+                                <span class="m-2">{{$details['masatamat_lelong']}}</span><br>
+                                @endforeach</td>
+                            <td>{{$lel['info']['harga_emas_asas']}}</td>
+                            <td>{{$lel['info']['jbg']}}</td>
+                            <!-- <td>{{$lel['info']['cajlelong']}}</td>                      -->
+                            
+                            <td class="text-center">
+                            @hasrole('jurulelong')
+                                
+                                <!-- @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($semakCountArray[$index] == 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> -->
+                                    <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"  style="margin-right:40px"><i class="fas fa-trophy"></i></a>
+                                    <!-- <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a> -->
+                                <!-- @elseif ($lel['info']['sts_lelong'] == 2) -->
+                                    <!-- <a  href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a> -->
+                                    <a  href="{{ route('lelong.janapemenangallcaw',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
+                                
+                                    <!-- @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 -->
+                                
+                                    <a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><button class="btn btn-success float-right " id="btnstart" >Online</button></a></a>
+                                
+                                    <!-- @endif -->
+                            @endhasrole
+                            <!-- @hasrole('operasi')
+                                
+                                @if($lel['info']['sts_lelong'] == 0)
+                                    <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a  href="{{ route('lelong.showsimulasi',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
+                                @else
+                                    <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                                @endif
+                            @endhasrole -->
+                            </td>
+                        </tr>
+                    
+                        @endforeach
+                        @endisset
+                      
+                    </tbody>
+                </table>
+                @endif
+
+
+                    @endhasrole
+                    @hasrole('operasi')
+                   
+                        <!-- I am a operasi! -->
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-6 col-sm-4">
+                                    <p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
+                                </div>
+                                <div class="col-6 col-sm-4">    
+                                </div>
+                            </div>
+                        </div>
+                        @if(count($arrayinfomenang)> 0)
+                        SENARAI PEMENANG BIDAAN MENGIKUT CAWANGAN
+                        <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>No</th>
+                                        <th>Batch Lelong</th>
+                                        <th>Tarikh Lelong</th>
+                                        <th>Cawangan</th>
+                                        <th>Status Export</th>
+                                        <th>Harga Emas Semasa</th>
+                                        <th>Tempoh</th>
+                                        <th>Caj Lelong</th>
+                                        <th>Status Lelong</th>
+                                    </tr>
+                            </thead>
+                            <tbody>
+                                @foreach($arrayinfomenang as $lel)
+                                <tr>
+                                    <td>{{ $loop->iteration }}</td>
+                                    <td>{{ $lel['detail']['lelong_id']}}</td>
+                                    <td>@php
+                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                                        $t_lelong =  $myDateTime->format('d-m-Y');
+                                        echo($t_lelong);
+                                    @endphp</td>
+                                    <td class="text-left">
+                                        @foreach($lel['detailsinfo'] as $details)
+                                        <a href=" {{ route('pembida.kaunterpembayaran', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                        <strong><span class="m-2">{{ $details['caw_name']}}</strong>
+                                        </span><br>
+                                        @endforeach
+                                    </td>
+                                    <td class="text-left">
+                                        @foreach($lel['detailsinfo'] as $details)
+                                        <span class="m-2"> @if($details['export_data_sts'] == '1')
+                                        <i class="far fa-flag"></i> Selesai Export
+                                        
+                                        @endif
+                                    
+                                        </span><br>
+                                        @endforeach
+                                    </td>
+                                    <td>{{ $lel['detail']['harga_emas_asas'] }}</td>
+                                    <td>{{ $lel['detail']['jbg'] }}</td>
+                                    <td>{{ $lel['detail']['cajlelong'] }}</td>
+                                    <td>
+                                        @if($lel['detail']['sts_lelong'] == 3)
+                                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                                        @endif
+                                    </td>
+                                
+                                </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+                        @endif
+                      
+                    @endhasrole
+                    @hasrole('account')
+                        I am a account!<br>
+                        @if(count($arrayinfoaccount)> 0)
+                        PENGESAHAN BAYARAN ONLINE
+        <table class="table table-striped  table-xl text-center" id="senarailelongan" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        <th>No</th>
+                        <th>Batch Lelong</th>
+                        <th>Tarikh Lelong</th>
+                        {{-- <th>Cawangan</th> --}}
+                        <th>Nama</th>
+                        <th>Fasa</th>
+                        <th>Status Lelong</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($arrayinfoaccount as $data)
+                <tr>
+                    <td>{{ $loop->iteration }}</td>
+                    <td>{{ $data['detail']['lelong_id']}}</td>
+                    <td>@php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['detail']['tarikh_lelong'] );
+                        $t_lelong =  $myDateTime->format('d-m-Y');
+                        echo($t_lelong);
+                    @endphp</td>
+                    <td align='left'>
+                        @foreach($data['detailsinfo'] as $details)
+                        {{-- <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a> --}}
+                       <strong><span class="m-2">{{ $details['caw_name']}}</span></strong><br>
+                           
+                        @endforeach
+                        @foreach($data['listwinner'] as $details)
+                        <a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$details['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
+                        <span class="m-2">{{ $details['caw_name']}}</span> {{$details['nama']}}<img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
+                        @endforeach
+                    </td>
+                    {{-- <td align='left'>
+                        @foreach($data['listwinner'] as $details)
+                        <a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$details['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
+                        <span class="m-2">{{ $details['caw_name']}}</span> {{$details['nama']}}<br>
+                        @endforeach
+                        
+                    </td> --}}
+                    <td>{{ $data['detail']['fasa'] }}</td>
+                    <td>
+                        @if($data['detail']['sts_lelong'] == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td>                 
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+        @endif
+                    @endhasrole
+                    @hasrole('pembida')
+                        I am a pembida!
+                    @endhasrole
+                </div>
+            </div>      
+        </div>
+    </div>
+
+            
+  
+</div>
+@endsection

From 5fe172cc8e1c35744fbe3b8b6a63dc16b0ecf4e6 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Fri, 25 Nov 2022 17:12:52 +0800
Subject: [PATCH 06/23] update susunan table

---
 app/Http/Controllers/LelongController.php     | 178 +++++++++++++--
 app/Http/Controllers/ReportController.php     |   6 +-
 app/Http/Controllers/SimulasiController.php   | 182 ++++++++++++++-
 .../views/lelong/listsagbycust.blade.php      |  75 ++++---
 .../views/lelong/senarailelongall.blade.php   |  26 ++-
 .../lelong/senarailelongtaklaku.blade.php     |  18 +-
 .../views/lelong/senaraimarhun.blade.php      |  23 +-
 resources/views/lelong/showlelong.blade.php   |   8 +-
 .../views/lelong/showlelongallsim.blade.php   | 207 +++++++++++------
 resources/views/pdf/lelreportkali.blade.php   | 155 +++++++++++++
 resources/views/pdf/pdflelongreport.blade.php |  22 +-
 .../views/pdf/pdfsimulasireport.blade.php     |  14 +-
 resources/views/pdf/simreportkali.blade.php   | 155 +++++++++++++
 resources/views/pdf/simrpt2.blade.php         |   2 +-
 .../views/simulasi/listsagbycust.blade.php    |  79 ++++---
 .../views/simulasi/senaraimarhunlel.blade.php |   8 +-
 .../simulasi/senaraisimulasiall.blade.php     |  14 +-
 .../views/simulasi/showsimulasi.blade.php     |   2 +-
 .../views/simulasi/showsimulasiall.blade.php  | 208 ++++++++++++------
 routes/web.php                                |   2 +
 20 files changed, 1091 insertions(+), 293 deletions(-)
 create mode 100644 resources/views/pdf/lelreportkali.blade.php
 create mode 100644 resources/views/pdf/simreportkali.blade.php

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index bb27120c..6b69a5c3 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3571,7 +3571,7 @@ class LelongController extends Controller
             ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
             ->get();
             // ->toArray();
-            // dd($databid);
+            dd($databid);
             $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
             ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
             ->where('cawangan_lelong.kali','=',$kali)->first();
@@ -3674,6 +3674,7 @@ class LelongController extends Controller
                                                 'total_rugilelong',
                                                 'total_bakilelong',
                                                 'data',
+                                                'kali',
                                                 'total_bakiupah',
                                                 'total_nilaimarhun'
                                             ));
@@ -3760,19 +3761,19 @@ class LelongController extends Controller
                 $hargaasas = $hargaasas + $bid['hargaasas'];
                 $cajlelong = $cajlelong + $bid['cajlelong'];
 
-                $lelongsim = Lelong::where('id',$id)->get();
-                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                // $lelongsim = Lelong::where('id',$id)->get();
+                // $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                // $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
                 
-                if($totalbaki > 0)
-                {
-                    $bakilelong = $bakilelong + $totalbaki;  
-                }
-                else
-                {
-                    $rugilelong = $rugilelong - $totalbaki;
-                }
+                // if($totalbaki > 0)
+                // {
+                //     $bakilelong = $bakilelong + $totalbaki;  
+                // }
+                // else
+                // {
+                //     $rugilelong = $rugilelong - $totalbaki;
+                // }
 
                 
 
@@ -3829,6 +3830,7 @@ class LelongController extends Controller
                                                 'total_rugilelong',
                                                 'total_bakilelong',
                                                 'data',
+                                                'kali',
                                                 'total_bakiupah',
                                                 'total_nilaimarhun'
                                             ));
@@ -5237,6 +5239,156 @@ class LelongController extends Controller
                                                 'total_nilaimarhun','tarikhkemaskini'));
     }
 
+    public function exportkali(Request $request)
+    {
+
+        $kali = $request->kali;
+        // dd($lelong_id);
+
+       
+        $lelong = Lelong::where('kali','=',$kali)->first();
+        $lelonglel = CawanganLelong::where('kali','=',$kali)->get();
+        // dd($simulasilel);
+        // $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
+        // $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 0;
+        $total_bakiupah = 0;
+
+        foreach($lelonglel as $lellel)
+        {
+            $cawangan = Cawangan::where('id','=',$lellel->caw_id)->first();
+            $databid = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+            ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah')
+            ->where('cawangan_lelong.caw_id','=', $lellel->caw_id)
+            ->where('cawangan_lelong.lelong_id','=', $lellel->lelong_id)
+            ->get();
+            // dd($databid);
+            $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
+            ->where('cawangan_lelong.lelong_id','=', $lellel->lelong_id)
+            ->where('cawangan_lelong.kali','=',$kali)->first();
+            // dd($t_simulasi);
+            // dd($databid->toArray());
+            $packet = 0;
+            $berat = 0;
+            $pinjaman =0;
+            $nilai_marhun = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+            $id = $lellel->lelong_id;
+
+            foreach($databid as $index1=>$bid)
+            {
+                $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
+                $berat = $berat + $bid['berat']; 
+                $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
+                $pinjaman =$pinjaman + $bid['pinjaman'];
+                $bakiupah = $bakiupah + $bid['bakiupah'];
+                $hargaasas = $hargaasas + $bid['hargaasas'];
+                // $cajlelong = $cajlelong + $bid['cajlelong'];
+
+                $lelongsim = Lelong::where('id',$id)->get();
+                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                
+                if($totalbaki > 0)
+                {
+                    $bakilelong = $bakilelong + $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong = $rugilelong - $totalbaki;
+                }
+                
+                
+               
+                            
+                
+            }
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawangan['id'],
+                'cawangan'=>$cawangan['caw_name'],
+                't_lelong'=>$lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($databid),
+                // 'jbg'=>$bid['jbg'],
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>$bakiupah,
+                'bakiupah'=>$bakiupah,
+                'hargaasas'=>$hargaasas,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+
+            $total_marhun = $total_marhun + sizeof($databid);
+            $total_berat = $total_berat + $berat;
+            $total_pinjaman = $total_pinjaman + $pinjaman;
+            $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_cazlelong = $total_cazlelong + $cajlelong;
+            $total_rugilelong = $total_rugilelong + $rugilelong;
+            $total_bakilelong = $total_bakilelong + $bakilelong;
+            $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            $total_bakiupah = $total_bakiupah + $bakiupah;
+            
+            
+            $data = Lelong::where('kali','=',$kali)
+            ->first();
+        }
+
+        $pdf = PDF::loadView('pdf.lelreportkali',compact('arraycaw',
+                                                    'total_marhun',
+                                                    'total_berat',
+                                                    'total_nmarhun',
+                                                    'total_pinjaman',
+                                                    'total_upah',
+                                                    'total_hargaasas',
+                                                    'total_cazlelong',
+                                                    'total_rugilelong',
+                                                    'total_bakilelong',
+                                                    'kali',
+                                                    'data',
+                                                    'total_bakiupah',
+                                                    'total_nilaimarhun'
+                                                   
+                                                    ))->setPaper('a4', 'landscape');
+                        return $pdf->download('Lelongan Simulasi Keseluruhan Mengikut Kali.pdf');
+
+    }
+
+
 
 
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index aec74bf4..bb46a616 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -605,6 +605,7 @@ class ReportController extends Controller
         $total_cajlelong = 0;
         $total_bakilelong = 0;
         $total_rugilelong = 0;  
+        $total_baki = 0;
 
         $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
         // ->join('gadai','simulasibid.norujukan','=','gadai.norujukan')
@@ -681,13 +682,14 @@ class ReportController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cajlelong = $total_cajlelong + $cal['cajlelong'];                    
+            $total_cajlelong = $total_cajlelong + $cal['cajlelong']; 
+            $total_baki = $total_baki + $cal['baki'];                   
 
             $datacaw = Cawangan::where('id','=',$cawid)
             ->get();
         }
 
-        $pdf = PDF::loadView('pdf.pdfsimulasireport',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','datacaw','total_berat','total_pinjaman','total_hargaasas','total_nilaimarhun','total_bakiupah','total_cajlelong','total_bakilelong','total_rugilelong'))
+        $pdf = PDF::loadView('pdf.pdfsimulasireport',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','datacaw','total_berat','total_pinjaman','total_hargaasas','total_nilaimarhun','total_bakiupah','total_cajlelong','total_bakilelong','total_rugilelong','total_baki'))
         ->setPaper('a4','potrait');
 
         return $pdf->download('Laporan Simulasi Cawangan.pdf');
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 008d6546..5dda42a3 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -980,8 +980,9 @@ class SimulasiController extends Controller
           
 
                 $sumcajlelong =  $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);                
-		$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+		        // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+		        $cajlelong = $cajlelong + $sim_bid['cajlelong'];
+                $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $sim_bid['cajlelong'];
                 if(strpos($totalbaki, '-') !== false)
                 {
                    $rugi  = -$totalbaki;
@@ -1165,13 +1166,16 @@ class SimulasiController extends Controller
             }
             $simulasi = Simulasi::where('id',$request->idsimulasi)->get();
             $sumcajlelong = $sumhargaasas * ($simulasi[0]['cajlelong']/100);
+            $sumcajlel = round($sumcajlelong,1,1);
+            $keuntungannew = bcdiv($keuntungan,1,1);
 
-            $totalbaki = $sumhargaasas - $detail_sag->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
+            $totalbaki = $sumhargaasas - $detail_sag->bakipjm - $keuntungannew - $sumcajlel;
+            // dump($sumhargaasas);
             $kirakeuntungan = SimulasiBid::where('norujukan',$bid['norujukan'])
             ->update([
-                'bakiupah'=> bcdiv($keuntungan,1,1),
+                'bakiupah'=> $keuntungannew,
                 'hargaasas'=> $sumhargaasas,
-                'cajlelong'=> bcdiv($sumcajlelong,1,1),
+                'cajlelong'=> $sumcajlel,
                 'baki'=> $totalbaki,
                       ]);
 
@@ -1182,10 +1186,11 @@ class SimulasiController extends Controller
              $loguser->username = $user->username;
              $loguser->nama_user = $user->name;
              $loguser->norujukan = $bid['norujukan'];
-             $loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.bcdiv($keuntungan,1,1);
+             $loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.$keuntungannew;
              $loguser->save();
 
         }
+        // dd($sumhargaasas);
 
         return redirect()->route('analisa.show',$request->idsimulasi)
                         ->with('success','Kemaskini Harga Emas Berjaya');
@@ -1417,6 +1422,7 @@ class SimulasiController extends Controller
         $rugilelong = 0;
         $bakilelong = 0;
         $keuntungan = 0;
+        $total_baki = 0;
 
         $simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
 
@@ -1444,16 +1450,17 @@ class SimulasiController extends Controller
 
             // $simulasilel = Simulasi::where('id',$simulasi_id)->get();
             $sumcajlelong =  $cal['hargaasas'] * ($simulasilel->cajlelong/100);
-            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
-            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
-            $marhuns[$index1]['baki'] =  $totalbaki;
+            $baki = $cal['baki'];
+            $marhuns[$index1]['cajlelong'] =  $cal['cajlelong'];
+            $marhuns[$index1]['baki'] =  $baki;
 
             $total_berat = $total_berat + $cal['berat'];
             $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
+            $total_baki = $total_baki + $cal['baki'];
+            $total_cazlelong = $total_cazlelong +  $cal['cajlelong'];
             
 
             array_push($arraymarhun,[
@@ -1478,7 +1485,8 @@ class SimulasiController extends Controller
         'total_hargaasas',
         'simulasilel',
         'cawanganDetail',
-        'total_cazlelong'));
+        'total_cazlelong',
+        'total_baki'));
     }
 
     public function deletemarhunlel(Request $request){
@@ -2156,7 +2164,8 @@ class SimulasiController extends Controller
                                                 'total_bakilelong',
                                                 'data',
                                                 'total_bakiupah',
-                                                'total_nilaimarhun'
+                                                'total_nilaimarhun',
+                                                'kali'
                                             ));
     }
 
@@ -2483,6 +2492,155 @@ class SimulasiController extends Controller
         
     }
 
+    public function exportkali(Request $request)
+    {
+
+        $kali = $request->kali;
+        // dd($lelong_id);
+
+       
+        $simulasi = Simulasi::where('kali','=',$kali)->first();
+        $simulasilel = CawanganSimulasi::where('kali','=',$kali)->get();
+        // dd($simulasilel);
+        // $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
+        // $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 0;
+        $total_bakiupah = 0;
+
+        foreach($simulasilel as $simlel)
+        {
+            $cawangan = Cawangan::where('id','=',$simlel->caw_id)->first();
+            $databid = SimulasiBid::join('cawangan_simulasi','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
+            ->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
+            'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah')
+            ->where('cawangan_simulasi.caw_id','=', $simlel->caw_id)
+            ->where('cawangan_simulasi.simulasi_id','=', $simlel->simulasi_id)
+            ->get();
+            // dd($databid);
+            $t_simulasi = Simulasi::join('cawangan_simulasi','cawangan_simulasi.simulasi_id','=','simulasi.id')
+            ->where('cawangan_simulasi.simulasi_id','=', $simlel->simulasi_id)
+            ->where('cawangan_simulasi.kali','=',$kali)->first();
+            // dd($t_simulasi);
+            // dd($databid->toArray());
+            $packet = 0;
+            $berat = 0;
+            $pinjaman =0;
+            $nilai_marhun = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+            $id = $simlel->simulasi_id;
+
+            foreach($databid as $index1=>$bid)
+            {
+                $marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
+                $berat = $berat + $bid['berat']; 
+                $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
+                $pinjaman =$pinjaman + $bid['pinjaman'];
+                $bakiupah = $bakiupah + $bid['bakiupah'];
+                $hargaasas = $hargaasas + $bid['hargaasas'];
+                // $cajlelong = $cajlelong + $bid['cajlelong'];
+
+                $lelongsim = Simulasi::where('id',$id)->get();
+                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                
+                if($totalbaki > 0)
+                {
+                    $bakilelong = $bakilelong + $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong = $rugilelong - $totalbaki;
+                }
+                
+                
+               
+                            
+                
+            }
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawangan['id'],
+                'cawangan'=>$cawangan['caw_name'],
+                't_simulasi'=>$simulasi['tarikh_lelong'],
+                'bil_marhun'=>sizeof($databid),
+                // 'jbg'=>$bid['jbg'],
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>$bakiupah,
+                'bakiupah'=>$bakiupah,
+                'hargaasas'=>$hargaasas,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+
+            $total_marhun = $total_marhun + sizeof($databid);
+            $total_berat = $total_berat + $berat;
+            $total_pinjaman = $total_pinjaman + $pinjaman;
+            $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_cazlelong = $total_cazlelong + $cajlelong;
+            $total_rugilelong = $total_rugilelong + $rugilelong;
+            $total_bakilelong = $total_bakilelong + $bakilelong;
+            $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            $total_bakiupah = $total_bakiupah + $bakiupah;
+            
+            
+            $data = Simulasi::where('kali','=',$kali)
+            ->first();
+        }
+
+        $pdf = PDF::loadView('pdf.simreportkali',compact('arraycaw',
+                                                    'total_marhun',
+                                                    'total_berat',
+                                                    'total_nmarhun',
+                                                    'total_pinjaman',
+                                                    'total_upah',
+                                                    'total_hargaasas',
+                                                    'total_cazlelong',
+                                                    'total_rugilelong',
+                                                    'total_bakilelong',
+                                                    'kali',
+                                                    'data',
+                                                    'total_bakiupah',
+                                                    'total_nilaimarhun'
+                                                   
+                                                    ))->setPaper('a4', 'landscape');
+                        return $pdf->download('Lelongan Simulasi Keseluruhan Mengikut Kali.pdf');
+
+    }
+
 
 
 
diff --git a/resources/views/lelong/listsagbycust.blade.php b/resources/views/lelong/listsagbycust.blade.php
index ef9c313d..1363b2cc 100644
--- a/resources/views/lelong/listsagbycust.blade.php
+++ b/resources/views/lelong/listsagbycust.blade.php
@@ -42,12 +42,12 @@
                             <th>No.Rujukan</th>   
                             <th>Tempoh</th>
                             <th>Berat(gm)</th>
-                            <th>Keuntungan Telah Bayar(RM)</th>
-                            <th>Keuntungan 6 Bulan(RM)</th>
-                            <th>Keuntungan Semasa(RM)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
                             <th>Pembiayaan Asal(RM)</th>
                             <th>Baki Pembiayaan(RM)</th>
-                            <th>Nilai Marhun (RM)</th>
+                            <th>Keuntungan 6Bulan(RM)</th>
+                            <th>Keuntungan Telah Bayar(RM)</th>
+                            <th>Keuntungan Semasa(RM)</th>
                             <!-- <th>Caj Lelong (%)</th>
                             <th>Baki Lelong (RM)</th> -->
                             <!-- <th>Tindakan</th> -->
@@ -77,38 +77,16 @@
                                         <strong>{{ number_format($jumberat, 2, '.', ',') }}</strong>
                                 </td> 
                                 <td align = 'right'>
-                                    @php $jumktlhbyr = 0;@endphp 
+                                    @php $jumnilaimarhun = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
-                                        $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
+                                        $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
                                         @endphp
-                                        {{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
+                                        {{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
                                     @endforeach
-                                        <strong>{{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
+                                        <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                <td align = 'right'>
-                                    @php $jum6bulan = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jum6bulan = $jum6bulan + $item['bakiupah'];
-                                        @endphp
-                                        {{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jum6bulan = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jum6bulan = $jum6bulan + $item['keuntungan'];
-                                        @endphp
-                                        {{ number_format($item['keuntungan'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
-                               
-                                </td>
                                 <td align = 'right'>
                                     @php $jumpinjasal = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
@@ -132,18 +110,45 @@
                                
                                 </td> 
                                 
-                               
                                 <td align = 'right'>
-                                    @php $jumnilaimarhun = 0;@endphp 
+                                    @php $jum6bulan = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
-                                        $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
+                                        $jum6bulan = $jum6bulan + $item['bakiupah'];
                                         @endphp
-                                        {{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
+                                        {{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
                                     @endforeach
-                                        <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
+                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
                                
                                 </td> 
+                                <td align = 'right'>
+                                    @php $jumktlhbyr = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
+                                        @endphp
+                                        {{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                                <td align = 'right'>
+                                    @php $jum6bulan = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jum6bulan = $jum6bulan + $item['keuntungan'];
+                                        @endphp
+                                        {{ number_format($item['keuntungan'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
+                               
+                                </td>
+                               
+                               
+                                
+                               
+                               
+                               
                             </tr>
                         @endforeach
                     </tbody>
diff --git a/resources/views/lelong/senarailelongall.blade.php b/resources/views/lelong/senarailelongall.blade.php
index 66c175d8..1c1dbdc3 100644
--- a/resources/views/lelong/senarailelongall.blade.php
+++ b/resources/views/lelong/senarailelongall.blade.php
@@ -3,8 +3,16 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                   
+                    <div class="header-style-title">
+                      
+                        butiran Lelongan
+                    </div>
+                </div>
+                <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,14 +20,14 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="simulasi" style="width:100%">
+                <table class="table text-center table-bordered" id="simulasi" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
                             <th>Kali Lelong</th>
                             {{-- <th>Tarikh Lelong</th> --}}
-                            <th>Fasa</th>
-                            <th align='left'>Cawangan</th>
+                            {{-- <th>Fasa</th>
+                            <th align='left'>Cawangan</th> --}}
                             {{-- <th>Harga Asas (RM)</th> --}}
                             <th class="text-center">Tindakan</th>
                         </tr>
@@ -34,7 +42,7 @@
                                {{$info['info']['tarikh_lelong'] }}
                                    
                             </td> --}}
-                            <td align = 'center'>
+                            {{-- <td align = 'center'>
                                 @foreach($info['detailsinfo'] as $info2)
                                {{$info2['fasa']}}<br>
                                 @endforeach
@@ -42,13 +50,13 @@
                             <td align = 'left'>
                             @foreach($info['detailsinfo'] as $info2)
                            {{$info2['caw_name']}}<br>
-                            @endforeach
+                            @endforeach --}}
                             {{-- </td>
                              <td>{{ $info['info']['harga_emas_asas'] }}</td> --}}
                             <td class="text-center">
                                 {{-- <a  href="{{ route('analisa.kemaskinidata',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
-                                <a  href="{{ route('lelong.showlelongall',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong" style="margin-right:30px"><i class="far fa-edit"></i></a>
-                                <a  href="{{ route('lelong.showlelongallsim',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
+                                {{-- <a  href="{{ route('lelong.showlelongall',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong" style="margin-right:30px"><i class="far fa-edit"></i></a> --}}
+                                <a class="btn m-1 btn-primary" href="{{ route('lelong.showlelongallsim',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
                                 {{-- <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Hapus"><i class="far fa-trash-alt"></i></a> --}}
 
 
diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php
index 5ecce18b..637706c9 100644
--- a/resources/views/lelong/senarailelongtaklaku.blade.php
+++ b/resources/views/lelong/senarailelongtaklaku.blade.php
@@ -4,15 +4,25 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    {{-- <a href="{{ route('lelong.senarailelongall') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a> --}}
+                    <div class="header-style-title">
+                       
+                        butiran Lelongan Tak Laku
+                    </div>
+                </div>
+                <div class="card-body">    
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
         @endif
 
-        <table class="table table-striped  table-xl text-center" id="senarailelongtaklaku" style="width:100%">
+        <table class="table text-right table-bordered" id="senarailelongtaklaku" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                             <th>Bil</th>
@@ -49,7 +59,7 @@
                         <td>{{ $data['laporan']['harga_emas_asas'] }}</td>
                         <td>{{ $data['laporan']['jbg'] }}</td>
                         <td>{{ $data['laporan']['cajlelong'] }}</td>
-                        <td><a 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>
+                        <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>
                     </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 7a26c873..1277a272 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -62,7 +62,7 @@
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
-                <table class="table table-striped  table-xl" id="marhun" style="width:100%">
+                <table class="table text-right table-bordered" id="marhun" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
@@ -70,11 +70,11 @@
                             {{-- <th>Nama Pelanggan</th> --}}
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
-                            <th>Nilai Marhun (RM)</th>
-                            <th>Harga Asas (RM)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
                             <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
                             <th>Baki Lelong (RM)</th>
                             <th>Tindakan</th>
                         </tr>
@@ -92,10 +92,10 @@
                             <td>{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             @php
                             $rugi = 0;
                                 $baki = 0;
@@ -126,13 +126,14 @@
                     <tfoot>
                         <tr>
                             <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
-                            <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
+                            <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'></td>
                         </tr>
                     </tfoot>
 
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 00c1e8f3..8059da67 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -180,11 +180,11 @@
                                     <th>Cawangan</th>
                                     <th>Bil Surat</th>
                                     <th>Berat (gm)</th>
-                                    <th>N. Marhun (RM)</th>
+                                    <th>N. Marhun Asal(RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Harga Asas (RM)</th>
                                     <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
                                     <th>Baki (RM)</th>
                                     <th>Rugi (RM)</th>
                                 </tr>
@@ -200,8 +200,8 @@
                                     <td align = 'right' >{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
-                                    <td align = 'right'> {{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td align = 'right'> {{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                     <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
@@ -215,8 +215,8 @@
                                     <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
+                                    <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
                                     <td align = 'right'>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
                                 </tr>
diff --git a/resources/views/lelong/showlelongallsim.blade.php b/resources/views/lelong/showlelongallsim.blade.php
index 7feca74b..74032233 100644
--- a/resources/views/lelong/showlelongallsim.blade.php
+++ b/resources/views/lelong/showlelongallsim.blade.php
@@ -3,69 +3,140 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-
-            <nav>
-                <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
-                  {{-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> --}}
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('lelong.senarailelongall') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                       
+                        butiran Lelongan
+                    </div>
                 </div>
-              </nav>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+
+          
               <div class="tab-content" id="nav-tabContent">
                 <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
                 <br>
-                    <form id="exportform" action="{{route('lelong.export')}}" method="POST">
+                    <form id="exportform" action="{{route('lelong.exportkali')}}" method="POST">
                         @csrf
                         <input type="hidden" name="type" value="User">
+                        <input type="hidden" name="kali" value="{{ $kali }}">
                         {{-- <input type="hidden" name="simulasiid" value="{{ $simulasi_id }}"> --}}
                         <div class="row">
-                            <div class="col-md-5">
-                                <table class="table table-striped table-xl" id="conclusion" style="width:100%">
-                                    <tr>
-                                        <td>Bilangan Lelong : {{$total_marhun}}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',')  }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        {{-- <td>Tarikh Lelong :  @php
-                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
-                                                $t_lelong =  $myDateTime->format('d-m-Y');
-                                                echo($t_lelong);
-                                            @endphp
-                                           
-                                        </td> --}}
-                                    </tr>
-                                </table>
+                            <div class="col-md-12 col-lg">
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Bilangan Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{$total_marhun}}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Tempoh</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{ $data['jbg']}}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                               
                             </div>
                             <div class="col-md-2"></div>
                             <div class="col-md-5">
-                                <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
-                                    <tr>
-                                        <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Baki Lelong Keseluruhan : RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Tempoh: {{ $data['jbg']}}</td>
-                                    </tr>
-                                </table>
+                           
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Caj Lelong Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_cazlelong, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Harga Asas Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_hargaasas, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Baki Lelong Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakilelong, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Rugi Lelong Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_rugilelong, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                               
                             </div>
                         </div>
 
+                        <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
 
-                        <table class="table table-striped  table-xl" id="simulasi" style="width:100%">
+                        <table class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>No</th>
@@ -73,11 +144,11 @@
                                     <th>Cawangan</th>
                                     <th>Bil SAG</th>
                                     <th>Berat (gm)</th>
-                                    <th>N. Marhun (RM)</th>
+                                    <th>Nilai Marhun Asal(RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Harga Asas (RM)</th>
                                     <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
                                     <th>Baki (RM)</th>
                                     <th>Rugi (RM)</th>
                                 </tr>
@@ -98,8 +169,8 @@
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                     <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
@@ -108,15 +179,15 @@
                             <tfoot>
                                 <tr>
                                     <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td>{{ $total_marhun }}</td>
-                                    <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                 </tr>
                             </tfoot>
 
@@ -320,14 +391,14 @@
         dom: 'Bfrtip',
         buttons: [
 
-            {
-                className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-                titleAttr: 'Download to PDF',
-                text: '<i class="fas fa-download"></i>',
-                action: function ( e, dt, node, config ) {
-                    $("#exportform").submit();
-                }
-            }
+            // {
+            //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //     titleAttr: 'Download to PDF',
+            //     text: '<i class="fas fa-download"></i>',
+            //     action: function ( e, dt, node, config ) {
+            //         $("#exportform").submit();
+            //     }
+            // }
         ]
     });
 
diff --git a/resources/views/pdf/lelreportkali.blade.php b/resources/views/pdf/lelreportkali.blade.php
new file mode 100644
index 00000000..b10f05ba
--- /dev/null
+++ b/resources/views/pdf/lelreportkali.blade.php
@@ -0,0 +1,155 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
+
+<body>
+  <header>
+    <u><b><h5>LAPORAN SIMULASI LELONGAN CAWANGAN KALI KE-{{$kali}}</h5></b></u>
+    </header>
+
+    {{-- <div> Tempoh: {{$data('jbg')}} --}}
+                                          
+                     
+
+                      
+              
+                      <br>
+                      <table width="100%" border="0" id="sim">      
+                        <thead>
+                                    
+                        {{-- <tr>                       
+                          <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
+                        </tr> --}}
+                            <tr >
+                                <th>No</th>
+                                <th>Tarikh Lelong</th>
+                                <th>Cawangan</th>
+                                <th>Bil SAG</th>
+                                <th>Berat (gm)</th>
+                                <th>Nilai Marhun Asal(RM)</th>
+                                <th>Pembiayaan (RM)</th>
+                                <th>Keuntungan (RM)</th>
+                                <th>Caj (RM)</th>
+                                <th>Harga Asas (RM)</th>
+                                <th>Baki (RM)</th>
+                                <th>Rugi (RM)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            
+                            @foreach ($arraycaw as $index=>$caw)
+                            <tr>
+                                <td>{{$index+1}}</td>
+                                <td>@php
+                                  $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] );
+                                  $t_lelong =  $myDateTime->format('d-m-Y');
+                                  echo($t_lelong);
+                              @endphp</td>
+                                <td align = 'left' style="white-space: nowrap;">{{ $caw['cawangan'] }}</td>
+                                <td align = 'center'>{{ $caw['bil_marhun'] }}</td>
+                                <td align = 'right'>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                    <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td align = 'center'><b>{{ $total_marhun }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                            </tr>
+                        </tfoot>
+                        
+                    </table>
+
+                    <br>
+                      
+               
+                      
+                    
+</tbody>
+
diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php
index 25be60f6..5a5865a5 100644
--- a/resources/views/pdf/pdflelongreport.blade.php
+++ b/resources/views/pdf/pdflelongreport.blade.php
@@ -153,11 +153,11 @@
                             {{-- <th>Nama Pelanggan</th> --}}
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
-                            <th>Nilai Marhun (RM)</th>
-                            <th>Harga Asas (RM)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
-                            <th>Caj Lelong (%)</th>
+                            <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
                             {{-- <th>Rugi Lelong (RM)</th> --}}
                             <th>Baki Lelong (RM)</th>
                         </tr>
@@ -175,10 +175,10 @@
                             <td >{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             @php
                             $rugi = 0;
                                 $baki = 0;
@@ -208,13 +208,13 @@
                       <tfoot>
                           <tr>
                               <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
-                              <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
+                              <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
                           </tr>
                       </tfoot>                                   
                        
diff --git a/resources/views/pdf/pdfsimulasireport.blade.php b/resources/views/pdf/pdfsimulasireport.blade.php
index 8d6be839..1e190771 100644
--- a/resources/views/pdf/pdfsimulasireport.blade.php
+++ b/resources/views/pdf/pdfsimulasireport.blade.php
@@ -134,11 +134,11 @@ tr:nth-child(even) {
                             <!-- <th>Nama Pelanggan</th>                            -->
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
-                            <th>Nilai Marhun (RM)</th>
-                            <th>Harga Asas (RM)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
                             <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
                             <th>Rugi/Baki Lelong (RM)</th>
                         </tr>
                         </thead>
@@ -153,10 +153,10 @@ tr:nth-child(even) {
                             <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td> 
                             <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                             <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                            <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td> 
                             <td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                             <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
                             <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td> 
                             @php
                             $rugi = 0;
                             $baki = 0;
@@ -182,11 +182,15 @@ tr:nth-child(even) {
                 <td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
                 <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_pinjaman, 2, '.', ',') }}</strong></td>  
                 <td><strong>{{ number_format($total_bakiupah, 2, '.', ',') }}</strong></td> 
                 <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_bakilelong, 2, '.', ',') }}</strong></td>
+                <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
+                <td><strong>@if($total_baki > 0)
+                                {{ number_format($total_baki, 2, '.', ',') }}
+                            @else
+                                ({{number_format(-($total_baki), 2, '.', ',')}})
+                            @endif</strong></td>
               </tr>                                         
                        
 
diff --git a/resources/views/pdf/simreportkali.blade.php b/resources/views/pdf/simreportkali.blade.php
new file mode 100644
index 00000000..cb55d1fb
--- /dev/null
+++ b/resources/views/pdf/simreportkali.blade.php
@@ -0,0 +1,155 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
+
+<body>
+  <header>
+    <u><b><h5>LAPORAN SIMULASI CAWANGAN KALI KE-{{$kali}}</h5></b></u>
+    </header>
+
+    {{-- <div> Tempoh: {{$data('jbg')}} --}}
+                                          
+                     
+
+                      
+              
+                      <br>
+                      <table width="100%" border="0" id="sim">      
+                        <thead>
+                                    
+                        {{-- <tr>                       
+                          <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
+                        </tr> --}}
+                            <tr >
+                                <th>No</th>
+                                <th>Tarikh Lelong</th>
+                                <th>Cawangan</th>
+                                <th>Bil SAG</th>
+                                <th>Berat (gm)</th>
+                                <th>Nilai Marhun Asal(RM)</th>
+                                <th>Pembiayaan (RM)</th>
+                                <th>Keuntungan (RM)</th>
+                                <th>Caj Lelong (RM)</th>
+                                <th>Harga Asas (RM)</th>
+                                <th>Baki Lelong (RM)</th>
+                                <th>Rugi Lelong (RM)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            
+                            @foreach ($arraycaw as $index=>$caw)
+                            <tr>
+                                <td>{{$index+1}}</td>
+                                <td>@php
+                                  $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_simulasi'] );
+                                  $t_lelong =  $myDateTime->format('d-m-Y');
+                                  echo($t_lelong);
+                              @endphp</td>
+                                <td align = 'left' style="white-space: nowrap;">{{ $caw['cawangan'] }}</td>
+                                <td align = 'center'>{{ $caw['bil_marhun'] }}</td>
+                                <td align = 'right'>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                    <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td align = 'center'><b>{{ $total_marhun }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                            </tr>
+                        </tfoot>
+                        
+                    </table>
+
+                    <br>
+                      
+               
+                      
+                    
+</tbody>
+
diff --git a/resources/views/pdf/simrpt2.blade.php b/resources/views/pdf/simrpt2.blade.php
index 1654a0cb..6aba2d6a 100644
--- a/resources/views/pdf/simrpt2.blade.php
+++ b/resources/views/pdf/simrpt2.blade.php
@@ -97,7 +97,7 @@ tr:nth-child(even) {
                             <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
                             <td>Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
                             <td>Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                            <td>Tempoh: {{ $data['jbg']}}</td> 
+                            {{-- <td>Tempoh: {{ $data['jbg']}}</td>  --}}
                             <td>Tarikh Lelong :@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                                 $datez = $myDateTime->format('d-m-Y');
diff --git a/resources/views/simulasi/listsagbycust.blade.php b/resources/views/simulasi/listsagbycust.blade.php
index b6f10a1d..25dbc104 100644
--- a/resources/views/simulasi/listsagbycust.blade.php
+++ b/resources/views/simulasi/listsagbycust.blade.php
@@ -38,12 +38,14 @@
                             <th>No.Rujukan</th>   
                             <th>Tempoh</th>
                             <th>Berat(gm)</th>
-                            <th>Keuntungan Telah Bayar (RM)</th>
-                            <th>Keuntungan 6 Bulan (RM)</th>
-                            <th>Keuntungan Semasa (RM)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
                             <th>Pembiayaan Asal (RM)</th>
                             <th>Baki Pembiayaan (RM)</th>
-                            <th>Nilai Marhun (RM)</th>
+                            <th>Keuntungan 6 Bulan (RM)</th>
+                            <th>Keuntungan Telah Bayar (RM)</th>
+                            <th>Keuntungan Semasa (RM)</th>
+                           
+                            
                             <!-- <th>Harga Asas (RM)</th> -->
                             <!-- <th>Caj Lelong (%)</th>
                             <th>Baki Lelong (RM)</th> -->
@@ -74,38 +76,16 @@
                                         <strong>{{ number_format($jumberat, 2, '.', ',') }}</strong>
                                 </td> 
                                 <td align = 'right'>
-                                    @php $jumktlhbyr = 0;@endphp 
+                                    @php $jumnilaimarhun = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
-                                        $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
+                                        $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
                                         @endphp
-                                        {{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
+                                        {{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
                                     @endforeach
-                                        <strong>{{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
+                                        <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                <td align = 'right'>
-                                    @php $jum6bulan = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jum6bulan = $jum6bulan + $item['bakiupah'];
-                                        @endphp
-                                        {{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jum6bulan = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jum6bulan = $jum6bulan + $item['keuntungan'];
-                                        @endphp
-                                        {{ number_format($item['keuntungan'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
-                               
-                                </td>
                                 <td align = 'right'>
                                     @php $jumpinjasal = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
@@ -128,30 +108,45 @@
                                         <strong>{{ number_format($jumpinjaman, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                
-                               
                                 <td align = 'right'>
-                                    @php $jumnilaimarhun = 0;@endphp 
+                                    @php $jum6bulan = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
-                                        $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
+                                        $jum6bulan = $jum6bulan + $item['bakiupah'];
                                         @endphp
-                                        {{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
+                                        {{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
                                     @endforeach
-                                        <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
+                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                <!-- <td align = 'right'>
-                                    @php $jumhargaasas = 0;@endphp 
+                                <td align = 'right'>
+                                    @php $jumktlhbyr = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
-                                        $jumhargaasas = $jumhargaasas + $item['hargaasas'];
+                                        $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
                                         @endphp
-                                        {{ number_format($item['hargaasas'], 2, '.', ',') }}<br>
+                                        {{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
                                     @endforeach
-                                        <strong>{{ number_format($jumhargaasas, 2, '.', ',') }}</strong>
+                                        <strong>{{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                               
+                                <td align = 'right'>
+                                    @php $jum6bulan = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jum6bulan = $jum6bulan + $item['keuntungan'];
+                                        @endphp
+                                        {{ number_format($item['keuntungan'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jum6bulan, 2, '.', ',') }}</strong>
+                               
+                                </td>
+                               
+                                
+                               
+                                
                                
-                                </td>  -->
                                 
                                 
                                 
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index e2cce136..4593eb10 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -70,7 +70,7 @@
                                     <th>No Rujukan</th>
                                     <th>Tempoh</th>
                                     <th>Berat (gm)</th>
-                                    <th>Nilai Marhun (RM)</th>
+                                    <th>Nilai Marhun Asal(RM)</th>
                                     {{--<th>Harga Asas (RM)</th>--}}
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
@@ -133,7 +133,11 @@
 				    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
 				    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
                                     {{--<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>--}}
-                                    <td>{{ number_format($bakilelong, 2, '.', ',') }}</td>
+                                    <td>@if($total_baki > 0)
+                                        {{ number_format($total_baki, 2, '.', ',') }}
+                                    @else
+                                         ({{number_format(-($total_baki), 2, '.', ',')}})
+                                    @endif</td>
                                     <td></td>
                                 </tr>
                             </tfoot>
diff --git a/resources/views/simulasi/senaraisimulasiall.blade.php b/resources/views/simulasi/senaraisimulasiall.blade.php
index 3a775b3b..9ac1efe5 100644
--- a/resources/views/simulasi/senaraisimulasiall.blade.php
+++ b/resources/views/simulasi/senaraisimulasiall.blade.php
@@ -3,8 +3,14 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                       Simulasi Lelong
+                    </div>
+                </div>
+                <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,7 +18,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="simulasi" style="width:100%">
+                <table  class="table text-center table-bordered" id="simulasi" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
@@ -47,7 +53,7 @@
                              <td>{{ $info['info']['harga_emas_asas'] }}</td> --}}
                             <td class="text-center">
                                 {{-- <a  href="{{ route('analisa.kemaskinidata',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
-                                <a  href="{{ route('analisa.showsimulasiall',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
+                                <a class="btn m-1 btn-primary"  href="{{ route('analisa.showsimulasiall',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
                                 {{-- <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Hapus"><i class="far fa-trash-alt"></i></a> --}}
 
 
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 95d82c21..a18aace0 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -184,7 +184,7 @@
                                             <th>Keuntungan (RM)</th>
                                             {{--<th>Harga Asas (RM)</th>--}}
                                             <th>Caj (RM)</th>
-					    <th>Harga Asas (RM)</th>
+					                        <th>Harga Asas (RM)</th>
                                             <th>Baki (RM)</th>
                                             <th>Rugi (RM)</th>
                                         </tr>
diff --git a/resources/views/simulasi/showsimulasiall.blade.php b/resources/views/simulasi/showsimulasiall.blade.php
index bdf62c5c..5c1d93fd 100644
--- a/resources/views/simulasi/showsimulasiall.blade.php
+++ b/resources/views/simulasi/showsimulasiall.blade.php
@@ -3,69 +3,139 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-
-            <nav>
-                <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Simulasi</a>
-                  {{-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> --}}
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('analisa.senaraisimulasiall') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                       
+                        butiran simulasi
+                    </div>
                 </div>
-              </nav>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+      
               <div class="tab-content" id="nav-tabContent">
                 <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
                 <br>
-                    <form id="exportform" action="{{route('analisa.export')}}" method="POST">
+                    <form id="exportform" action="{{route('analisa.exportkali')}}" method="POST">
                         @csrf
                         <input type="hidden" name="type" value="User">
+                        {{-- <input type="hidden" name="lelongid" value="{{ $lelong_id }}"> --}}
+                        <input type="hidden" name="kali" value="{{ $kali }}">
                         {{-- <input type="hidden" name="simulasiid" value="{{ $simulasi_id }}"> --}}
                         <div class="row">
-                            <div class="col-md-5">
-                                <table class="table table-striped table-xl" id="conclusion" style="width:100%">
-                                    <tr>
-                                        <td>Bilangan Lelong : {{$total_marhun}}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',')  }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        {{-- <td>Tarikh Lelong :  @php
-                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
-                                                $t_lelong =  $myDateTime->format('d-m-Y');
-                                                echo($t_lelong);
-                                            @endphp
-                                           
-                                        </td> --}}
-                                    </tr>
-                                </table>
+                            <div class="col-md-12 col-lg">
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Bilangan Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{$total_marhun}}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Tempoh</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{ $data['jbg']}}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                               
                             </div>
                             <div class="col-md-2"></div>
                             <div class="col-md-5">
-                                <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
-                                    <tr>
-                                        <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Baki Lelong Keseluruhan : RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Tempoh: {{ $data['jbg']}}</td>
-                                    </tr>
-                                </table>
+                           
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Caj Lelong Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_cazlelong, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Harga Asas Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_hargaasas, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Baki Lelong Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakilelong, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Rugi Lelong Keseluruhan</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_rugilelong, 2, '.', ',') }}">
+                                        </div>
+                                    </div>
+                                </div>
+                               
                             </div>
                         </div>
 
-
-                        <table class="table table-striped  table-xl" id="simulasi" style="width:100%">
+                        <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
+                        <table class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>No</th>
@@ -73,11 +143,11 @@
                                     <th>Cawangan</th>
                                     <th>Bil SAG</th>
                                     <th>Berat (gm)</th>
-                                    <th>N. Marhun (RM)</th>
+                                    <th>Nilai Marhun Asal(RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Harga Asas (RM)</th>
                                     <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
                                     <th>Baki (RM)</th>
                                     <th>Rugi (RM)</th>
                                 </tr>
@@ -98,8 +168,8 @@
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                     <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
@@ -108,15 +178,15 @@
                             <tfoot>
                                 <tr>
                                     <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td>{{ $total_marhun }}</td>
-                                    <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                 </tr>
                             </tfoot>
 
@@ -320,14 +390,14 @@
         dom: 'Bfrtip',
         buttons: [
 
-            {
-                className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-                titleAttr: 'Download to PDF',
-                text: '<i class="fas fa-download"></i>',
-                action: function ( e, dt, node, config ) {
-                    $("#exportform").submit();
-                }
-            }
+            // {
+            //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //     titleAttr: 'Download to PDF',
+            //     text: '<i class="fas fa-download"></i>',
+            //     action: function ( e, dt, node, config ) {
+            //         $("#exportform").submit();
+            //     }
+            // }
         ]
     });
 
diff --git a/routes/web.php b/routes/web.php
index bb3d6718..034821d5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -100,6 +100,7 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct
     
     Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); 
     Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']);
+    Route::post('/exportkali',['as'=>'analisa.exportkali','uses'=>'SimulasiController@exportkali']);
 
     Route::post('/senaraitempsimulasi',['as'=>'analisa.senaraitempsimulasi','uses'=>'SimulasiController@senaraitempsimulasi']); 
     Route::get('/tempbycawsimulasi/{details}/{t_lelong}/{fasa}',['as'=>'analisa.tempbycawsimulasi','uses'=>'SimulasiController@tempbycawsimulasi']); 
@@ -174,6 +175,7 @@ Route::group(['prefix'=>'lelong'], function () {
    Route::get('/showlelongall/{kali}',['as'=>'lelong.showlelongall','uses'=>'LelongController@showlelongall']);
    Route::get('/showlelongallsim/{kali}',['as'=>'lelong.showlelongallsim','uses'=>'LelongController@showlelongallsim']);
    Route::post('/export',['as'=>'lelong.export','uses'=>'LelongController@export']);
+   Route::post('/exportkali',['as'=>'lelong.exportkali','uses'=>'LelongController@exportkali']);
 
 });
     Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); 

From e2bf6f42709bf1ab4b94051514ec24501b480462 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Fri, 25 Nov 2022 17:39:03 +0800
Subject: [PATCH 07/23] update new pada lelong

---
 app/Http/Controllers/LelongController.php      | 15 +++++++++------
 app/Http/Controllers/ReportController.php      |  7 ++++---
 resources/views/lelong/senaraimarhun.blade.php |  6 +++++-
 resources/views/pdf/pdflelongreport.blade.php  |  6 +++++-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 6b69a5c3..648b112a 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -250,8 +250,10 @@ class LelongController extends Controller
                 //$cajlelong += $lel_bid->cajlelong;
 
                 $sumcajlelong =  $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
-                $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong, 1, 1);
+                $cajlelongnew = round($sumcajlelong, 1, 1);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
+                $cajlelong = $cajlelong + $cajlelongnew;
+                $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $cajlelongnew;
                 if (strpos($totalbaki, '-') !== false) {
                     $rugi  = -$totalbaki;
                     $rugilelong += $rugi;
@@ -1304,8 +1306,9 @@ class LelongController extends Controller
         $arraymarhun = [];
         foreach ($marhuns as $index1=> $cal) {
             $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
-            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
-            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $marhuns[$index1]['cajlelong'] = $cajlelongnew;
             $marhuns[$index1]['baki'] =  $totalbaki;
             $marhuns[$index1]['keuntungan'] = $keuntungan;
 
@@ -1314,7 +1317,7 @@ class LelongController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
+            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
 
             array_push($arraymarhun,[
                 'norujukan' => $cal['norujukan'],
@@ -1324,7 +1327,7 @@ class LelongController extends Controller
                 'hargaasas' => $cal['hargaasas'],
                 'pinjaman' => $cal['pinjaman'],
                 'bakiupah' => $cal['bakiupah'],
-                'cajlelong' => $cal['cajlelong'],
+                'cajlelong' => $cajlelongnew,
                 'baki' => $cal['baki'],
             ]);
         }
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index bb46a616..ba6fe4a2 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -797,8 +797,9 @@ class ReportController extends Controller
             // dd($customer);
             $simulasilel = Lelong::where('id',$lelongid)->get();
             $sumcajlelong =  $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
-            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
-            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $marhuns[$index1]['cajlelong'] =  $cajlelongnew;
             $marhuns[$index1]['baki'] =  $totalbaki;
 
 
@@ -828,7 +829,7 @@ class ReportController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
+            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
 
         }
 
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 1277a272..aaad5b81 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -132,7 +132,11 @@
                             <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
-                            <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
                             <td align = 'right'></td>
                         </tr>
                     </tfoot>
diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php
index 5a5865a5..8735b522 100644
--- a/resources/views/pdf/pdflelongreport.blade.php
+++ b/resources/views/pdf/pdflelongreport.blade.php
@@ -214,7 +214,11 @@
                               <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
                               <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
                               <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
-                              <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
                           </tr>
                       </tfoot>                                   
                        

From f92fdb477feae64e8c43b6cdb84a229070af1e23 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Fri, 25 Nov 2022 18:09:15 +0800
Subject: [PATCH 08/23] update tarikh pada lelong all

---
 app/Http/Controllers/LelongController.php     | 46 +++++++++----------
 .../views/lelong/showlelongallsim.blade.php   |  2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 648b112a..670af09c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3688,7 +3688,6 @@ class LelongController extends Controller
         $kali = $kali;
         $lelong = Lelong::where('kali','=',$kali)->first();
        
-        // dd($t_simulasi);
         $cawanganlel = CawanganLelong::where('kali','=',$kali)->get();
         // dd($cawangansim);
 
@@ -3757,26 +3756,28 @@ class LelongController extends Controller
                 // dd($bid['id']);
                 $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
                 $berat = $berat + $bid['berat'];
+
                 // $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
                 $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
                 $pinjaman =$pinjaman + $bid['pinjaman'];
                 $bakiupah = $bakiupah + $bid['bakiupah'];
                 $hargaasas = $hargaasas + $bid['hargaasas'];
-                $cajlelong = $cajlelong + $bid['cajlelong'];
+                // $cajlelong = $cajlelong + $bid['cajlelong'];
 
-                // $lelongsim = Lelong::where('id',$id)->get();
-                // $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
-                // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                // $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                $lelongsim = Lelong::where('id',$id)->get();
+                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                $cajlelongnew = round($sumcajlelong,1,1);
+                $cajlelong = $cajlelong + $cajlelongnew;
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
                 
-                // if($totalbaki > 0)
-                // {
-                //     $bakilelong = $bakilelong + $totalbaki;  
-                // }
-                // else
-                // {
-                //     $rugilelong = $rugilelong - $totalbaki;
-                // }
+                if($totalbaki > 0)
+                {
+                    $bakilelong = $bakilelong + $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong = $rugilelong - $totalbaki;
+                }
 
                 
 
@@ -3788,7 +3789,7 @@ class LelongController extends Controller
                 'id_cawangan'=> $cawangan['id'],
                 'cawangan'=>$cawangan['caw_name'],
                 't_lelong'=>$lelong['tarikh_lelong'],
-                't_simulasi'=>$t_lelong['tarikh_lelong'],
+                't_lelong'=>$t_lelong['tarikh_lelong'],
                 'bil_marhun'=>sizeof($databid),
                 'berat'=>$berat,
                 'n_marhun'=>$nilai_marhun,
@@ -5246,10 +5247,8 @@ class LelongController extends Controller
     {
 
         $kali = $request->kali;
-        // dd($lelong_id);
-
-       
         $lelong = Lelong::where('kali','=',$kali)->first();
+
         $lelonglel = CawanganLelong::where('kali','=',$kali)->get();
         // dd($simulasilel);
         // $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
@@ -5297,7 +5296,7 @@ class LelongController extends Controller
             $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
             ->where('cawangan_lelong.lelong_id','=', $lellel->lelong_id)
             ->where('cawangan_lelong.kali','=',$kali)->first();
-            // dd($t_simulasi);
+            // dump($t_lelong);
             // dd($databid->toArray());
             $packet = 0;
             $berat = 0;
@@ -5322,8 +5321,9 @@ class LelongController extends Controller
 
                 $lelongsim = Lelong::where('id',$id)->get();
                 $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                $cajlelongnew = round($sumcajlelong,1,1);
+                $cajlelong = $cajlelong + $cajlelongnew;
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
                 
                 if($totalbaki > 0)
                 {
@@ -5342,7 +5342,7 @@ class LelongController extends Controller
             array_push($arraycaw,[
                 'id_cawangan'=> $cawangan['id'],
                 'cawangan'=>$cawangan['caw_name'],
-                't_lelong'=>$lelong['tarikh_lelong'],
+                't_lelong'=>$t_lelong['tarikh_lelong'],
                 'bil_marhun'=>sizeof($databid),
                 // 'jbg'=>$bid['jbg'],
                 'berat'=>$berat,
@@ -5366,7 +5366,7 @@ class LelongController extends Controller
             $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
             $total_bakiupah = $total_bakiupah + $bakiupah;
             
-            
+            // dd($t_lelong);
             $data = Lelong::where('kali','=',$kali)
             ->first();
         }
diff --git a/resources/views/lelong/showlelongallsim.blade.php b/resources/views/lelong/showlelongallsim.blade.php
index 74032233..7a4da1cc 100644
--- a/resources/views/lelong/showlelongallsim.blade.php
+++ b/resources/views/lelong/showlelongallsim.blade.php
@@ -159,7 +159,7 @@
                                 <tr>
                                     <td>{{$index+1}}</td>
                                     <td>@php
-                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_simulasi'] );
+                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] );
                                         $t_lelong =  $myDateTime->format('d-m-Y');
                                         echo($t_lelong);
                                     @endphp</td>

From 71e41f93574d3d4e78b8cfca2beee8acb3ca8b29 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Fri, 25 Nov 2022 19:41:24 +0800
Subject: [PATCH 09/23] update page pc

---
 app/Http/Controllers/LelongController.php     |  84 ++++------
 .../views/jananotis/gadaibycaw.blade.php      |  63 ++++++--
 .../lelong/pindahsenarailelong.blade.php      |  25 ++-
 .../views/lelong/senaraimarhunpc.blade.php    | 153 +++++++++++-------
 resources/views/lelong/showpindah.blade.php   |  25 +--
 .../views/lelong/showtukartarikh.blade.php    |  25 +--
 .../views/lelong/tukartarikhlelong.blade.php  |  19 ++-
 7 files changed, 239 insertions(+), 155 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 670af09c..8a90b555 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -4768,68 +4768,46 @@ class LelongController extends Controller
         $total_bakiupah = 0;
         $total_nilaimarhun = 0;
         $keuntungan = 0;
+        $bakilelong = 0;
+        $total_cazlelong = 0;
 
-        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
-        ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
-        ->where('status_jual','=',0)
-        ->select(
-            'lelongbid.t_lelong',
-            'lelongbid.kodcaw',
-            'cawangan.caw_name',
-            'lelongbid.norujukan',
-            'lelongbid.pinjaman',
-            'lelongbid.berat',
-            'lelongbid.nilaimarhun',
-            'lelongbid.hargaasas',
-            'lelongbid.hargajual',
-            'lelongbid.t_jual',
-            'lelongbid.upahsimpan',
-            'lelongbid.cajlelong',
-            'lelongbid.baki',
-            'lelongbid.bakiupah',
-            'lelongbid.status_jual',
-            'lelongbid.jbg'
-        )
-        ->get()->toArray();
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
+        $marhuns = LelongBid::where('caw_id', '=', $cawid)
+        ->where('lelong_id', '=', $lelongid)
+        ->where('caw_id','=',$cawid)
+        ->get();
         // dd($marhuns);
         $arraymarhun = [];
         foreach ($marhuns as $index1=> $cal) {
-            // dd($cal);
-            $gadai = Gadai::on($cal['kodcaw'])
-            ->where('norujukan','=',$cal['norujukan'])
-            ->first();
-            // dd($gadai);
-            $customer =  Customer::where('kpbaru','=',$gadai['nokp'])
-            ->orWhere('kplama','=',$gadai['nokp'])
-            ->first();
-            // dd($customer);
-
-            // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
+             $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $marhuns[$index1]['cajlelong'] = $cajlelongnew;
+            $marhuns[$index1]['baki'] =  $totalbaki;
             $marhuns[$index1]['keuntungan'] = $keuntungan;
-            $marhuns[$index1]['nama'] = $customer;
 
-            array_push($arraymarhun,[
-                'norujukan' => $cal['norujukan'],
-                'tempoh' => $gadai['tempoh'],
-                'nama' => $customer['nama'],
-                'berat' => $cal['berat'],
-                'nilaimarhun' => $cal['nilaimarhun'],
-                'hargaasas' => $cal['hargaasas'],
-                'hargajual' => $cal['hargajual'],
-                't_jual' => $cal['t_jual'],
-                'pinjaman' => $cal['pinjaman'],
-                'pinjasal' => $gadai['pinjaman'],
-                'bakiupah' => $cal['bakiupah'],
-                'cajlelong' => $cal['cajlelong'],
-                'baki' => $cal['baki'],
-                'upah6bulan' => $gadai['bakiupah']
-            ]);
-            // $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $cal['berat'];
             $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cajlelongnew,
+                'baki' => $cal['baki'],
+            ]);
+         
         }
 
         $arrayinfo = [];
@@ -4855,7 +4833,9 @@ class LelongController extends Controller
         'total_upah',
         'total_hargaasas',
         'total_bakiupah',
-        'total_nilaimarhun'));
+        'total_nilaimarhun',
+        'lelonglel',
+        'total_cazlelong'));
     }
 
     public function showlelongpc(Request $request, $id)
diff --git a/resources/views/jananotis/gadaibycaw.blade.php b/resources/views/jananotis/gadaibycaw.blade.php
index cddee91a..7fabfb50 100644
--- a/resources/views/jananotis/gadaibycaw.blade.php
+++ b/resources/views/jananotis/gadaibycaw.blade.php
@@ -3,8 +3,20 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-12 mx-auto card">
-            <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Cawangan {{ $user->kodcaw }}</h3>
+        <div class="row">
+            <div class="col">
+                <div class="card">
+                    <div class="card-header header-style">
+                        <a href="{{ route('lelong.pindahsenarailelong') }}" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                           
+                            Butiran Gadaian Cawangan {{ $user->kodcaw }}
+                        </div>
+                    </div>
+                    <div class="card-body">
+            {{-- <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Cawangan {{ $user->kodcaw }}</h3> --}}
             
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
@@ -13,12 +25,45 @@
             @endif
 
                 <div class="container">
-                    <div class="row mb-2">
-                        <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
-                            <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p>
-                            <p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
-                            <p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
-                            <p> <b>Bilangan Surat : </b>{{ $bil_lelongcaw[0]['bil_lelong'] }}</p>
+                    <div class="row">
+                        {{-- <div class="col-md-6 col-lg"> --}}
+                        <div class="col-md-6 mx-auto card p-2">
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label"><b>Tarikh Lelong : </b></label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $t_lelong }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label"><b>Tarikh Gadai Sehingga : </b></label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $t_gadais->t_gadai }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label"> <b>Anggaran Tarikh Daftar Lelong : </b></label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $t_anggaran }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label"> <b>Bilangan Surat : </b></label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $bil_lelongcaw[0]['bil_lelong'] }}">
+                                    </div>
+                                </div>
+                            </div>
+                            {{-- <p> <b>Tarikh Lelong : </b> {{ $t_lelong }}</p> --}}
+                            {{-- <p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p> --}}
+                            {{-- <p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
+                            <p> <b>Bilangan Surat : </b>{{ $bil_lelongcaw[0]['bil_lelong'] }}</p> --}}
                         </div>
                     </div>
                 </div>
@@ -28,7 +73,7 @@
                     <a href=" {{ route('jananotis.gadaibycawexcel',[$t_lelong]) }}" class="btn btn-success">EXCEL</a>
 
                     </div>
-                <table class="table table-striped  table-xl text-center" id="butirangadai" style="width:100%; margin-top:1%;">
+                <table class="table text-right table-bordered"  id="butirangadai" style="width:100%; margin-top:1%;">
                     <thead class="bg-primary text-white">
                             <tr>
                                 <th>Bil</th>
diff --git a/resources/views/lelong/pindahsenarailelong.blade.php b/resources/views/lelong/pindahsenarailelong.blade.php
index bb093553..72efc664 100644
--- a/resources/views/lelong/pindahsenarailelong.blade.php
+++ b/resources/views/lelong/pindahsenarailelong.blade.php
@@ -3,16 +3,25 @@
 @section('content')
 
 <div class="container-fluid">
-    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    {{-- <a href="{{ route('lelong.senarailelong') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a> --}}
+                    <div class="header-style-title">
+                       
+                        butiran lelong (pindah lelong)
+                    </div>
+                </div>
+                <div class="card-body">
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
         @endif
-        <div> Pindah Lelong</div>
-        <table class="table table-striped  table-xl text-center" id="senarailelongtaklaku" style="width:100%">
+        <table class="table text-right table-bordered"  id="senarailelongtaklaku" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                             <th>Bil</th>
@@ -60,9 +69,9 @@
                         <td>{{$data['laporan']['jbg']}}</td>
                         <td>{{$data['laporan']['cajlelong']}}</td>       
                         
-                        <td class="text-center">
+                        <td  class="text-center">
                             @hasrole('jurulelong')
-                            <a  href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                            <a  class="btn btn-primary" href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                 <!-- @if($data['laporan']['sts_lelong'] == 0) -->
                                     <!-- <a  href="{{ route('lelong.refresh',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
                                     <!-- <a class="startlelong" href="{{ route('lelong.start',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a> -->
@@ -79,7 +88,7 @@
                             @hasrole('operasi')
                                 
                                 @if($data['laporan']['sts_lelong'] == 0)
-                                    <a  href="{{ route('lelong.temppindahsenarailelong',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Cawangan" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a class="btn btn-primary" href="{{ route('lelong.temppindahsenarailelong',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Cawangan" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                     @elseif($data['laporan']['sts_lelong'] == 1)
                                     <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
                                     @elseif($data['laporan']['sts_lelong'] == 2)
diff --git a/resources/views/lelong/senaraimarhunpc.blade.php b/resources/views/lelong/senaraimarhunpc.blade.php
index c909ec38..ab21d12c 100644
--- a/resources/views/lelong/senaraimarhunpc.blade.php
+++ b/resources/views/lelong/senaraimarhunpc.blade.php
@@ -4,34 +4,57 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-
-            <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button type="button" class="btn btn-light"><a href="javascript:window.history.go(-1);">
-                        <h3><i class="fas fa-arrow-alt-circle-left"></i></h3>
-                    </a></button>
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{ route('jananotis.showlelongpc',$lelongid) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Lelongan
+                </div>
             </div>
-
-            <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
-                <thead class="bg-light ">
+            <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                
+                <div class="col-3">
                     @foreach ($arrayinfo as $laporan)
-                    <tr>
-                        <td><b>Batch Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
-                        <td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
-                        <td><b>Tarikh Lelong : @php
-                                $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
-                                $datez = $myDateTime->format('d-m-Y');
-                                echo($datez);
-                                @endphp</b></td>
-                        @foreach($laporan['details'] as $details)
-                        <td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>
-                        <td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
-                        @endforeach
-                    </tr>
+                    @php
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+                $datez = $myDateTime->format('d-m-Y');
+                // echo($datez);
+                @endphp
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                            </div>
+                        </div>
+                    </div>
                     @endforeach
+                </div>
 
-                </thead>
-            </table>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{sizeof($arraymarhun)}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="mb-3">
+                    <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                    <a href="{{ route('jananotis.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                </div>
+
+      
 
 
 
@@ -41,60 +64,72 @@
                 <p>{{ $message }}</p>
             </div>
             @endif
-            <div class="text-left pt-4">
+            {{-- <div class="text-left pt-4">
                 <a href=" {{ route('jananotis.lelongreportpc',[$lelongid,$cawid]) }}" class="btn btn-success">PDF</a>
                 <a href="{{ route('jananotis.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
                 <a href="{{ route('jananotis.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
-                {{-- <a href="{{ route('lelonghargajual.senaraimarhunkhasbelumjual',[$lelongid,$cawid])  }}" class="btn btn-success">Belum Jual</a>
-                <a href="{{ route('lelonghargajual.senaraimarhunkhastelahjual',[$lelongid,$cawid])  }}" class="btn btn-success">Telah Jual</a> --}}
+                <a href="{{ route('lelonghargajual.senaraimarhunkhasbelumjual',[$lelongid,$cawid])  }}" class="btn btn-success">Belum Jual</a>
+                <a href="{{ route('lelonghargajual.senaraimarhunkhastelahjual',[$lelongid,$cawid])  }}" class="btn btn-success">Telah Jual</a> 
 
-            </div>
+            </div> --}}
             <form id="deletesag" action="{{route('lelonghargajual.deletemarhun')}}" method="POST">
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
-                <table class="table table-striped  table-xl" id="marhun" style="width:100%">
+                <table class="table text-right table-bordered" id="marhun" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
                             <th>No Rujukan</th>
-                            <th>Nama Pelanggan</th>
+                            {{-- <th>Nama Pelanggan</th> --}}
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
-                            <th>Nilai Marhun (RM)</th>
-                            <th>Harga Asas (RM)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
-                            {{-- <th>Caj Lelong (%)</th>
-                            <th>Rugi Lelong (RM)</th>
-                            <th>Baki Lelong (RM)</th> --}}
+                            <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Baki Lelong (RM)</th>
                             {{-- <th>Tindakan</th> --}}
                         </tr>
                     </thead>
                     <tbody>
+                        @php     
+                        $rugilelong = 0;
+                        $bakilelong = 0; 
+                    @endphp
                         @foreach ($arraymarhun as $index=> $marhun)
                         <tr>
                             <td>{{$loop->iteration}}</td>
-                            <td>{{ $marhun['norujukan']}}</td>
-                            <td>{{ $marhun['nama']}}</td>
+                            <td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
+                            {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
                             <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
-                            {{-- <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
-                            <?php
+                            <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                            @php
                             $rugi = 0;
-                            $baki = 0;
-                            if (strpos($marhun['baki'], '-') !== false) {
-                                $rugi  = $marhun['baki'];
-                            } else {
-                                $baki = $marhun['baki'];
-                            }
-                            ?>
-                            <td>{{number_format($rugi, 2, '.', ',')}}</td>
-                            <td>{{number_format($baki, 2, '.', ',')}}</td> --}}
+                                $baki = 0;
+                                 if(strpos($marhun['baki'], '-') !== false)
+                                 {
+                                    $baki  = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                                 else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                            @endphp
+                            <td align = 'right'>@if($marhun['baki'] > 0)
+                                {{number_format($marhun['baki'], 2, '.', ',')}}
+                                @elseif($marhun['baki'] < 0 )
+                                ({{number_format(-($marhun['baki']), 2, '.', ',')}})
+                                @endif
+                            </td>
+                           
 
                             {{-- <td class="text-center">
                                 <input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
@@ -105,13 +140,19 @@
                     </tbody>
                     <tfoot>
                         <tr>
-                            <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
-                            <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                            <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                           
+                            <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                            <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
+                            {{-- <td align = 'right'></td> --}}
                         </tr>
                     </tfoot>
 
diff --git a/resources/views/lelong/showpindah.blade.php b/resources/views/lelong/showpindah.blade.php
index 3c36fd28..97c7b047 100644
--- a/resources/views/lelong/showpindah.blade.php
+++ b/resources/views/lelong/showpindah.blade.php
@@ -2,18 +2,19 @@
 
 @section('content')
 <div class="container-fluid">
-    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <nav>
-                <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                    <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Pindah Lelong</a>
-                  <!-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> -->
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('lelong.pindahsenarailelong') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                       
+                        butiran lelong (Pindah Lelong)
+                    </div>
                 </div>
-              </nav>
-              <div class="tab-content" id="nav-tabContent">
-                <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
-                <br>
+                <div class="card-body">
                 @if ($message = Session::get('success'))
                     <div class="alert alert-success">
                         <p>{{ $message }}</p>
@@ -25,7 +26,7 @@
                         <input type="hidden" name="type" value="User">
                         <input type="hidden" class="form-control" id="lelongidasal" name="lelongidasal" value="{{$lelong_id}}">
 
-                        <table class="table table-striped  table-xl" id="simulasi" style="width:100%">
+                        <table class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>Pilih</th>
diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php
index a109a177..f26ba272 100644
--- a/resources/views/lelong/showtukartarikh.blade.php
+++ b/resources/views/lelong/showtukartarikh.blade.php
@@ -2,18 +2,19 @@
 
 @section('content')
 <div class="container-fluid">
-    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <nav>
-                <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                    <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Tukar Tarikh Lelong</a>
-                  <!-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> -->
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('lelong.tukartarikhlelong') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                       
+                        butiran lelong (Tukar tarikh)
+                    </div>
                 </div>
-              </nav>
-              <div class="tab-content" id="nav-tabContent">
-                <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
-                <br>
+                <div class="card-body">
                 @if ($message = Session::get('success'))
                     <div class="alert alert-success">
                         <p>{{ $message }}</p>
@@ -42,7 +43,7 @@
                         {{$lelong_id}}
                     </div>
                     </div>
-                        <table class="table table-striped  table-xl" id="simulasi" style="width:100%">
+                        <table  class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>Pilih</th>
diff --git a/resources/views/lelong/tukartarikhlelong.blade.php b/resources/views/lelong/tukartarikhlelong.blade.php
index 46bffa43..93da1bac 100644
--- a/resources/views/lelong/tukartarikhlelong.blade.php
+++ b/resources/views/lelong/tukartarikhlelong.blade.php
@@ -4,15 +4,22 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                 
+                    <div class="header-style-title">
+                       
+                        butiran lelong (Tukar Tarikh)
+                    </div>
+                </div>
+                <div class="card-body">    
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
         @endif
-        <div> Tukar Tarikh Lelong</div>
-        <table class="table table-striped  table-xl text-center" id="senarailelongtaklaku" style="width:100%">
+        <table class="table text-right table-bordered"  id="senarailelongtaklaku" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                             <th>Bil</th>
@@ -62,7 +69,7 @@
                         
                         <td class="text-center">
                             @hasrole('jurulelong')
-                            <a  href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                            <a  class="btn btn-primary" href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                 <!-- @if($data['laporan']['sts_lelong'] == 0) -->
                                     <!-- <a  href="{{ route('lelong.refresh',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
                                     <!-- <a class="startlelong" href="{{ route('lelong.start',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a> -->
@@ -79,7 +86,7 @@
                             @hasrole('operasi')
                                 
                                 @if($data['laporan']['sts_lelong'] == 0)
-                                    <a  href="{{ route('lelong.temptukartarikhlelong',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Cawangan" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a  class="btn btn-primary" href="{{ route('lelong.temptukartarikhlelong',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Cawangan" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                     @elseif($data['laporan']['sts_lelong'] == 1)
                                     <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
                                     @elseif($data['laporan']['sts_lelong'] == 2)

From 8fcb57d7958c723d131f9092f908b7af77cbed71 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Fri, 25 Nov 2022 20:20:25 +0800
Subject: [PATCH 10/23] fix tangguh lelong

---
 .../Controllers/TangguhLelongController.php   | 13 +++++++-
 resources/views/pdf/lelreport.blade.php       | 30 +++++++++++--------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 1201e60c..31f0e50d 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -921,9 +921,19 @@ class TangguhLelongController extends Controller
         ->where('lelong.sts_lelong',0)
         ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
         ->distinct()
+        ->orderBy('cawangan_lelong.lelong_id')
         ->get()
         ->toArray();
 
+        $lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('lelong.sts_lelong',0)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong')
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->get()
+        ->toArray();
+        // dd($lelong);
+
         foreach($lelong as $info)
         {
 
@@ -933,7 +943,7 @@ class TangguhLelongController extends Controller
             ->toArray();
 
             $sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
-            ->where('kodcaw', $info['caw_code'])
+            // ->where('kodcaw', $info['caw_code'])
             ->where('status',4)
             ->select('norujukan')
             ->get()
@@ -954,6 +964,7 @@ class TangguhLelongController extends Controller
         $currentdate = $currentdate->toDateTimeString();
 
         $tangguh = TangguhLelong::where('status',4)
+        ->where('kodcaw','=',$caw_code)
         ->get();
 
         // dd($pengesahan);
diff --git a/resources/views/pdf/lelreport.blade.php b/resources/views/pdf/lelreport.blade.php
index cb51fa63..598ecdfd 100644
--- a/resources/views/pdf/lelreport.blade.php
+++ b/resources/views/pdf/lelreport.blade.php
@@ -7,6 +7,15 @@
     border-collapse: collapse;
       width: 100%;
   }
+
+  #sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
+
+  }
   
   #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
       border: 0px solid;
@@ -77,8 +86,9 @@
   <header>
     <u><b><h5>LAPORAN SIMULASI CAWANGAN</h5></b></u>
     </header>
+    
                                           
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                      {{-- <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
                         <thead>
                           <tr>
                             <td>Bilangan Lelong:  {{$total_marhun}}</td>
@@ -86,22 +96,22 @@
                             <td>Pembiayaan Keseluruhan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td>
                             <td>Keuntungan Keseluruhan:RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                                                  
                         </thead>
-                      </table>
+                      </table> --}}
 
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0"  height="25" align="left" id="sim">
+                      <table id="sim2">
                             <thead>
                             <tr>
-                              <td>Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',')  }}</td>
+                              {{-- <td>Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',')  }}</td>
                               <td>Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
                             <td>Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                            <td>Tempoh: {{ $data['jbg']}}</td> 
-                            <td>Tarikh Lelong :@php 
+                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td> --}}
+                            <div>Tarikh Lelong :@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                                 $datez = $myDateTime->format('d-m-Y');
                                 echo($datez);                            
                             @endphp
-                          </td> 
+                          </div> 
+                            <div>Tempoh: {{ $data['jbg']}}</div> 
                             </tr>
                         </thead>
                       </table>             
@@ -110,10 +120,6 @@
                       <br>
                       <table width="100%" border="0" id="sim">      
                         <thead>
-                                    
-                        {{-- <tr>                       
-                          <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
-                        </tr> --}}
                             <tr >
                                 <th>No</th>
                                 <th>Cawangan</th>

From 3437608035c9ce3df9e1d179aedbc76d1f6970ba Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Fri, 25 Nov 2022 21:17:00 +0800
Subject: [PATCH 11/23] fix baki, rugi lelong

---
 app/Http/Controllers/ReportController.php  | 15 ++++++++++-----
 resources/views/pdf/pdflaplelong.blade.php |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index ba6fe4a2..9d5d4cdc 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -129,7 +129,6 @@ class ReportController extends Controller
         ->get()
         ->toArray();
 
-
         foreach($brgdetails as $brg)
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -393,15 +392,21 @@ class ReportController extends Controller
             $sumcajlelong =  $laplelong['hargaasas'] * ($lelong[0]['cajlelong']/100);
             $totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong,1,1);
 
-            if($totalbaki > 0)
+            if($laplelong['baki'] > 0)
             {
-                $bakilelong = $bakilelong + $totalbaki;  
+                $bakilelong = $bakilelong + $laplelong['baki'];  
             }
             else
             {
-                $rugilelong = $rugilelong - $totalbaki;
+                $rugilelong = $rugilelong + $laplelong['baki'];
             }
 
+            // if($laplelong['baki'] < 0)
+            // {
+            //     $rugilelong = $rugilelong + $laplelong['baki'];
+            // }
+
+
 
                                  
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
@@ -431,7 +436,7 @@ class ReportController extends Controller
 
         $pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
         'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw','margin','arraydetails',
-        'total_rugilelong','total_bakilelong'))
+        'total_rugilelong','total_bakilelong','bakilelong','rugilelong'))
 
         ->setPaper('a4', 'landscape');
         return $pdf->download('Laporan Lelong Keseluruhan.pdf');
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 86ae623c..14f7e4b8 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -200,8 +200,8 @@ tr:nth-child(even) {
           
            
             <tr>              
-              <td>Jumlah Baki A: {{$total_bakilelong}}</td>         
-              <td>Jumlah Baki B: {{$total_rugilelong}}</td>          
+              <td>Jumlah Baki A: {{$bakilelong}}</td>         
+              <td>Jumlah Baki B: {{$rugilelong}}</td>          
               <td><b>Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}<b></td>
             </tr>
   

From 7516c636759bdb05666db2f866e1c9ffd6d39944 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sat, 26 Nov 2022 11:53:07 +0800
Subject: [PATCH 12/23] update design table dan customize semakan marhun

---
 app/Http/Controllers/LelongController.php     |  6 ++-
 app/Http/Controllers/MarhunController.php     | 51 +++++++++++++------
 app/Http/Controllers/SimulasiController.php   | 15 ++++--
 .../Controllers/TangguhLelongController.php   |  4 --
 resources/views/marhun/marhun.blade.php       |  2 +-
 resources/views/marhun/scanbarcode.blade.php  |  2 +-
 .../views/marhun/senaraimarhun.blade.php      | 27 ++++++----
 .../views/marhun/terimaserahmarhun.blade.php  | 29 ++++++++---
 .../pdf/cetakterimaserahmarhun.blade.php      |  2 +-
 .../listperubahanmutumarhun.blade.php         |  9 +++-
 .../views/tangguhlelong/carian.blade.php      | 44 +++++++++++-----
 .../views/tangguhlelong/searchbyic.blade.php  | 13 ++++-
 .../tangguhlelong/searchtodownload.blade.php  | 21 +++++---
 .../senarailelongtangguh.blade.php            | 14 +++--
 .../senaraimohontangguh.blade.php             | 18 +++++--
 .../tangguhlelong/senleltangguh.blade.php     | 13 +++--
 routes/web.php                                |  1 +
 17 files changed, 191 insertions(+), 80 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 8a90b555..9b6a93e9 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -856,7 +856,11 @@ class LelongController extends Controller
             $total_untung_asal = TransaksiKeuntungan::where('norujukan','=',$bid['norujukan'])->sum('bayaran_keuntungan');
             $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
             $detail_sag = Gadai::on($bid->kodcaw)->where('norujukan',$bid->norujukan)->first();
-            $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
+            if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){
+               $keuntungan = 0.00;
+            }else{
+                $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
+            }
 
             $sumhargaasas = 0;
             $sumnmarhuns = 0;
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 17946569..025b4abe 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -59,10 +59,9 @@ class MarhunController extends Controller
 
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
 
-        $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
-            ->where('caw_id', '=', $caw->id)
-            ->get();
-        // dd($lelongbid->toArray());
+       
+        
+        // dd($lelongbid);
 
         $sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak
             ->where('caw_id', $caw->id)
@@ -127,15 +126,20 @@ class MarhunController extends Controller
             ->distinct()
             ->get();
 
+        $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
+            ->where('caw_id', '=', $caw->id)
+            ->get();
         foreach ($lelongbid as $index1 => $bid) {
-            $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
-                ->where('lelong_id', $lelong_id)
-                ->get();
+           
 
             $statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id'])
                 ->where('lelong_id', $lelong_id)
                 ->where('status_ubah', 6)
                 ->first();
+            
+            // $status = Pengesahan::where('lelongbid_id', $bid['id'])
+            //     ->where('lelong_id', $lelong_id)
+            //     ->first();
 
             $statusSemakMarhun = ScanSemak::where('lelongbid_id', $bid['id'])
                 ->whereNotNull('scan_keluar')
@@ -147,32 +151,47 @@ class MarhunController extends Controller
             }
 
             $lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc;
+            // $lelongbid[$index1]['status'] = $status;
 
-            if ($sudahdisahkan) {
+            $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
+            ->where('lelong_id', $lelong_id)
+            ->get();
+            // dump($sudahdisahkan);
+            // if ($sudahdisahkan) {
                 foreach ($sudahdisahkan as $sahkan) {
                     // dd($sahkan);
-                    $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
+                    $status = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
                     ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id'])
                     ->where('pengesahan.status', '0')
                     ->select('pengesahan.disahkan_oleh',
-                             'pengesahan.disahkan_pada'
+                             'pengesahan.disahkan_pada',
+                             'pengesahan.status'
                     )
                     ->first();
     
-                    $lelongbid[$index1]['pengesahan'] = $lelongbidmarhun;
+                    $lelongbid[$index1]['status'] = $status;
+                    // $lelongbid[$index1]['pengesahanbysag'] = $sudahdisahkan;
                     // dd($lelongbid[$index1]['pengesahan']);
                 }
-            } else {
-                //
-            }
+            // } else {
+                
+            // }
+            
 
             $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])
                 ->get()
                 ->toArray();
             $lelongbid[$index1]['marhun'] = $marhun;
-        }
 
-        return view('marhun.senaraimarhun', compact('lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel'));
+           
+                            // dd($status);
+
+
+            // $index->status = $status;
+        }
+        // dd($sudahdisahkan);
+
+        return view('marhun.senaraimarhun', compact('sudahdisahkan','lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel'));
     }
 
     public function kemaskini(Request $request)
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 5dda42a3..99dfa779 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -1133,7 +1133,12 @@ class SimulasiController extends Controller
             $total_untung_asal = TransaksiKeuntungan::where('norujukan','=',$bid['norujukan'])->sum('bayaran_keuntungan');
             $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
             $detail_sag = Gadai::on($bid->kodcaw)->where('norujukan',$bid->norujukan)->first();
-            $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
+            // $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
+            if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){
+                $keuntungan = 0.00;
+             }else{
+                $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan;
+             }
 
             $sumhargaasas = 0;
             $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
@@ -1167,13 +1172,13 @@ class SimulasiController extends Controller
             $simulasi = Simulasi::where('id',$request->idsimulasi)->get();
             $sumcajlelong = $sumhargaasas * ($simulasi[0]['cajlelong']/100);
             $sumcajlel = round($sumcajlelong,1,1);
-            $keuntungannew = bcdiv($keuntungan,1,1);
+            // $keuntungannew = bcdiv($keuntungan,1,1);
 
-            $totalbaki = $sumhargaasas - $detail_sag->bakipjm - $keuntungannew - $sumcajlel;
+            $totalbaki = $sumhargaasas - $detail_sag->bakipjm - $keuntungan - $sumcajlel;
             // dump($sumhargaasas);
             $kirakeuntungan = SimulasiBid::where('norujukan',$bid['norujukan'])
             ->update([
-                'bakiupah'=> $keuntungannew,
+                'bakiupah'=> $keuntungan,
                 'hargaasas'=> $sumhargaasas,
                 'cajlelong'=> $sumcajlel,
                 'baki'=> $totalbaki,
@@ -1186,7 +1191,7 @@ class SimulasiController extends Controller
              $loguser->username = $user->username;
              $loguser->nama_user = $user->name;
              $loguser->norujukan = $bid['norujukan'];
-             $loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.$keuntungannew;
+             $loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.$keuntungan;
              $loguser->save();
 
         }
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 31f0e50d..fba19143 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -43,10 +43,6 @@ class TangguhLelongController extends Controller
         foreach($lelong as $info)
         {
 
-            // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            // ->where('lelong_id',$info['lelong_id'])
-            
-
             $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual','caw_code')
             ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code')
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php
index 4b00aa60..0cf53ac1 100644
--- a/resources/views/marhun/marhun.blade.php
+++ b/resources/views/marhun/marhun.blade.php
@@ -231,7 +231,7 @@
                         @elseif($status['status'] == 1)
                             <button style="width:7%;" class="btn btn-info" >Telah Sah</button>
                         @else
-                            <button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak1/button>
+                            <button style="width:7%;" class="btn btn-success" onclick="confirm()">Semak/button>
                         @endif
                        
                    @else
diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php
index ac1a5a82..26a6f3af 100644
--- a/resources/views/marhun/scanbarcode.blade.php
+++ b/resources/views/marhun/scanbarcode.blade.php
@@ -23,7 +23,7 @@
                         {{ $message }}
                     </div>
                     @endif
-                    <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
+                    {{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a> --}}
                     <a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
 
                     <p>Tarikh Lelong:
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index 623f7af8..1659dc01 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -35,7 +35,7 @@
                                 <p><b><u> Pengesahan Oleh PC :</u></b></p>
                                 {{-- <p><b>Sudah Disemak : {{ sizeof($sdhdisemaktangguhlel) }}</b></p> --}}
                                 <p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
-                                <p><b>Sudah Disahkan : {{ sizeof($sdhdisahkan) }}</b></p>
+                                <p><b>Sudah Disahkan :  <a class="btn m-1 btn-success"  href="{{ route('marhun.listperubahanmutumarhun', ['id'=>$lelong_id]) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" >{{ sizeof($sdhdisahkan) }}</a></b></p>
                             </div>
                         </div>
                     </div>
@@ -60,22 +60,27 @@
                                     <td>{{ $bid->t_lelong }}</td>
                                     <td>
                                         @if($bid->status_semak == 0)
+                                        {{-- {{dd($bid['status']['status'])}} --}}
                                             {{-- <button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button> --}}
-                                            {{-- @if(isset($bid['pengesahan']['disahkan_oleh'])) --}}
-                                            @if(!empty($bid['pengesahan'] !== null))
-                                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
+                                            @if(isset($bid['status']['status']))
+                                                @if(($bid['status']['status'] == 0))
+                                                    <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
+                                                @elseif($bid['status']['status'] == 1)
+                                                    <button class="btn btn-success btn-sm hovernone-warning" disabled>TELAH DISAHKAN</button>
+                                                @endif
                                             @else
-                                                <button class="btn btn-danger btn-sm hovernone-danger" disabled>BELUM DISEMAK</button>
+                                                <button class="btn btn-danger btn-sm hovernone-warning" disabled>BELUM SEMAK</button>
                                             @endif
-                                        @elseif(($bid['pengesahan'] !== null) && ($bid->status_semak == 1))
-                                            @if($bid['pengesahan']['disahkan_oleh'] !== null)
-                                                <button class="btn btn-success btn-sm hovernone-success" disabled>SUDAH DISAHKAN</button>
+                                        @elseif(($bid->status_semak == 1))
+                                            @if(isset($bid['status']['status']))
+                                                @if(($bid['status']['status'] == 1))
+                                                    <button class="btn btn-success btn-sm hovernone-warning" disabled>TELAH DISAHKAN</button>
+                                                @endif
                                             @else
-                                                <button class="btn btn-warning btn-sm hovernone-warning" disabled>DALAM PROSES</button>
+                                                <button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
                                             @endif
-                                        @elseif(($bid->status_semak == 1) && ($bid['pengesahan'] === null))
-                                            <button class="btn btn-outline-success btn-sm" disabled>SUDAH DISEMAK</button>
                                         @endif
+                                        {{-- @endif --}}
                                     </td>
                                     {{-- <td>
                                         @if($bid['statustangguhlel'] != null)
diff --git a/resources/views/marhun/terimaserahmarhun.blade.php b/resources/views/marhun/terimaserahmarhun.blade.php
index 14b35a23..0dceeeef 100644
--- a/resources/views/marhun/terimaserahmarhun.blade.php
+++ b/resources/views/marhun/terimaserahmarhun.blade.php
@@ -50,7 +50,8 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        @foreach($senaraiScanKeluar as $index)
+                                        {{-- @foreach($senaraiScanKeluar as $index) --}}
+                                        @forelse($senaraiScanKeluar as $index)
                                         <input type="hidden" name="scanKeluar_id[]" value="{{$index->id}}">
                                         <tr>
                                             <td>{{$loop->iteration}}</td>
@@ -58,7 +59,13 @@
                                             <td>{{$index->scan_keluar}}</td>
                                             <td><span class="badge badge-pill badge-danger">Belum Terima</span></td>
                                         </tr>
-                                        @endforeach
+                                        @empty
+                                        <tr>
+                                            <td colspan="4">No Data</td>
+                                        </tr>
+                    
+                                         @endforelse
+                                        {{-- @endforeach --}}
                                     </tbody>
                                 </table>
                                 <div class="d-flex mt-2 justify-content-end">
@@ -82,7 +89,7 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        @foreach($sedangDinilai as $index)
+                                        @forelse($sedangDinilai as $index)
                                         <input type="hidden" name="sedangDinilai_id[]" value="{{$index->id}}">
                                         <tr>
                                             <td>{{$loop->iteration}}</td>
@@ -99,7 +106,11 @@
                                              <td><a href="{{route('marhun.show',[$index->lelongbid_id, $index->lelong_id])}}"><span class="badge badge-pill badge-warning">Sedang Dinilai</span></a></td>
                                             @endif
                                         </tr>
-                                        @endforeach
+                                        @empty
+                                        <tr>
+                                            <td colspan="4">No Data</td>
+                                        </tr>
+                                        @endforelse
                                     </tbody>
                                 </table>
                                 <div class="d-flex mt-2 justify-content-end">
@@ -122,7 +133,8 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach($sudahSerah as $index)
+                                    {{-- @foreach($sudahSerah as $index) --}}
+                                    @forelse($sudahSerah as $index)
                                     <tr>
                                         <td>{{$loop->iteration}}</td>
                                         <td>{{$index->norujukan}}</td>
@@ -131,7 +143,12 @@
                                         <td>{{$index->serah_marhun}}</td>
                                         <td><span class="badge badge-pill badge-success">Sudah Serah</span></td>
                                     </tr>
-                                    @endforeach
+                                    @empty
+                                        <tr>
+                                            <td colspan="6">No Data</td>
+                                        </tr>
+                                    @endforelse
+                                    {{-- @endforeach --}}
                                 </tbody>
                             </table>
                         </div>
diff --git a/resources/views/pdf/cetakterimaserahmarhun.blade.php b/resources/views/pdf/cetakterimaserahmarhun.blade.php
index 33b590f9..53112131 100644
--- a/resources/views/pdf/cetakterimaserahmarhun.blade.php
+++ b/resources/views/pdf/cetakterimaserahmarhun.blade.php
@@ -75,7 +75,7 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN MARHUN KELUAR PETI BESI</b></u></td>
+                          <td colspan="2"><u><b>LAPORAN SERAHAN MARHUN KEPADA KHAZANAH</b></u></td>
                         </tr>
                         <tr>
                           <td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
diff --git a/resources/views/pengesahan/listperubahanmutumarhun.blade.php b/resources/views/pengesahan/listperubahanmutumarhun.blade.php
index cde3c494..eb2ae778 100644
--- a/resources/views/pengesahan/listperubahanmutumarhun.blade.php
+++ b/resources/views/pengesahan/listperubahanmutumarhun.blade.php
@@ -6,9 +6,16 @@
         <div class="col mx-auto p-4">
             <div class="card">
                 <div class="card-header header-style">
+                    @hasrole('pengurus-cawangan')
                     <a href="{{ route('pengesahan.senarailelongubahmutu') }}" class="header-style-icon">
                         <i class="fas fa-arrow-left"></i>
                     </a>
+                    @endhasrole
+                    @hasrole('penilai')
+                    <a href="{{ route('marhun.senaraimarhun', ['lelong_id'=>$id]) }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    @endhasrole
                     <div class="header-style-title">
                        Senarai SAG: Pengesahan Oleh PC
                     </div>
@@ -107,7 +114,7 @@
                         </tr>
                         @empty
                         <tr>
-                            <td colspan="7">No Data</td>
+                            <td colspan="10">No Data</td>
                         </tr>
     
                 @endforelse
diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php
index 9e17c00c..8e9ec08f 100644
--- a/resources/views/tangguhlelong/carian.blade.php
+++ b/resources/views/tangguhlelong/carian.blade.php
@@ -2,10 +2,19 @@
 
 @section('content')        
 <div class="container">
-<h3 class="pt-3">Permohonan Tangguh Lelong</h3> 
-    <div class="row justify-content-md-center">
-        <div class="col-md-6 mx-auto card">
-          
+{{-- <h3 class="pt-3">Permohonan Tangguh Lelong</h3>  --}}
+<div class="row ">
+  <div class="col-md-8 mx-auto card p-4">
+      <div class="card">
+      <div class="card-header header-style">
+          <a href="{{ route('tangguhlelong.senleluntuktangguh') }}" class="header-style-icon">
+              <i class="fas fa-arrow-left"></i>
+          </a>
+          <div class="header-style-title">
+            Permohonan Tangguh Lelong (Masukkan No Kad Pengenalan)
+          </div>
+      </div>
+      <div class="card-body">
           @if ($message = Session::get('success'))
               <div class="alert alert-success" style="margin-top:1%;">
                   <p>{{ $message }}</p>
@@ -23,21 +32,28 @@
                   <p>{{ $message }}</p>
               </div>
           @endif
-            <h3 class="pt-3" style="margin-left:2%;">Sila Masukkan No Kad Pengenalan</h3>
-            
+
+          {{-- <div class="d-flex content-center""> --}}
+            {{-- <h3>Masukkan No Kad Pengenalan</h3> --}}
             <form action="{{route('tangguhlelong.searchbyic')}}" method="POST" id="formcariannokp">
               @csrf
               <input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
-                <div class="form-group row" style="margin-top:2%; margin-left:1%;">
-                  <label for="nokp" class=" col-form-label mr-3" style="margin-left:2%;">No Kad Pengenalan</label>
-                  <div>
-                    <input type="text" class="form-control" id="nokp" name="nokp" placeholder="xxxxxxxxxxxx">
+               
+                <div class="col-6">
+                  <div class="form-group row">
+                      <label class="col-6 col-form-label text-left">No Kad Pengenalan</label>
+                      <div class="col-6">
+                        <div>
+                          <input type="text" class="form-control" id="nokp" name="nokp" placeholder="xxxxxxxxxxxx">
+                        </div><br>
+                        <button type="button" class="btn btn-primary" onclick="find()" >Carian</button>  
+                      </div>
                   </div>
-                </div>
+              </div>
                 
-                <div class="d-flex justify-content-center" style="margin:2% 0%; ">
-                    <a  href="{{ route('tangguhlelong.senleluntuktangguh') }}" class="btn btn-primary mr-2">Kembali</a>
-                    <button type="button" class="btn btn-primary" onclick="find()" >Carian</button>                  
+                
+                    {{-- <a  href="{{ route('tangguhlelong.senleluntuktangguh') }}" class="btn btn-primary mr-2">Kembali</a> --}}
+                                    
                 </div>
             </form>
         </div>
diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php
index e6a529b0..59d21b0a 100644
--- a/resources/views/tangguhlelong/searchbyic.blade.php
+++ b/resources/views/tangguhlelong/searchbyic.blade.php
@@ -3,8 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-        
+        <div class="col-md-8 mx-auto card p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="window.history.go(-1);" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                  Permohonan Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
diff --git a/resources/views/tangguhlelong/searchtodownload.blade.php b/resources/views/tangguhlelong/searchtodownload.blade.php
index ac9da7a7..14ff8cff 100644
--- a/resources/views/tangguhlelong/searchtodownload.blade.php
+++ b/resources/views/tangguhlelong/searchtodownload.blade.php
@@ -3,8 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-        <h3 class="pt-3">Permohonan Tangguh Lelong</h3>
+        <div class="col-md-12 mx-auto card p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{route('tangguhlelong.carian', ['lelong_id'=>$lelong_id])}}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                  Permohonan Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -15,7 +24,7 @@
                 </div>
             @endif
             <div class="d-flex">
-            <button  type="button" class="btn btn-light" onclick="window.history.go(-1);" ><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+            {{-- <button  type="button" class="btn btn-light" onclick="window.history.go(-1);" ><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button> --}}
             <div class="container">
                 <div class="row mb-2">
                     <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
@@ -45,7 +54,7 @@
                 @csrf
                 <input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
                 <input type="hidden" name="nokp" value="{{ ($customer_detail) ? $customer_detail['kpbaru'] : $customer_detail['kplama'] }}">
-                <table class="table table-striped  table-xl text-center" id="tangguhlel" style="width:100%">
+                <table class="table text-right table-bordered" id="tangguhlel" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" class="check_all"></th>
@@ -78,10 +87,10 @@
                 </table>
                 <br>
                 
-                <div class="modal-footer" style="margin-top:2%;">
+                {{-- <div class="modal-footer" style="margin-top:2%;">
                     <a  href="{{ route('tangguhlelong.carian', ['lelong_id'=>$lelong_id]) }}" class="btn btn-primary">Kembali</a>
                     <!-- <button type="submit" class="btn btn-danger">Muat Turun Borang Tangguh</button> -->
-                </div>
+                </div> --}}
             </form>
         </div>
     </div>
diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
index 1b183145..d77d6965 100644
--- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php
+++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
@@ -3,8 +3,16 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-        <h3 class="pt-3">Permohonan Tangguh Lelong</h3>    
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+               
+                <div class="header-style-title">
+                    Permohonan Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
+        {{-- <h3 class="pt-3">Permohonan Tangguh Lelong</h3>     --}}
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,7 +20,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                <table class="table text-center table-bordered" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
diff --git a/resources/views/tangguhlelong/senaraimohontangguh.blade.php b/resources/views/tangguhlelong/senaraimohontangguh.blade.php
index 942e269b..6ca23799 100644
--- a/resources/views/tangguhlelong/senaraimohontangguh.blade.php
+++ b/resources/views/tangguhlelong/senaraimohontangguh.blade.php
@@ -3,8 +3,16 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-        <h3 class="pt-3">Senarai Permohonan Tangguh Lelong</h3>
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+           
+                <div class="header-style-title">
+                    Senarai Permohonan Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
+        {{-- <h3 class="pt-3">Senarai Permohonan Tangguh Lelong</h3> --}}
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,7 +20,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                <table class="table text-center table-bordered" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
@@ -75,12 +83,12 @@
                             <td>
                                 
                             @if($mohon['status'] == 0)
-                            <a href=" {{ route('tangguhlelong.ulangdownloadmohon', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.ulangdownloadmohon', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
                                 <button type="button" class="btn btn-outline-secondary" id="btn-upload" data-toggle="modal" data-lelongbidid="{{ $mohon['lelongbid_id'] }}" data-norujukan="{{ $mohon['norujukan'] }}" data-userid="{{ $user['user_id'] }}" data-lelongid="{{ $mohon['lelong_id'] }}" data-target="#upload">
                                     Muat Naik Borang <i class="fas fa-file-alt"></i>
                                 </button>
                             @elseif($mohon['status'] == 1 || $mohon['status'] >= 4)
-                                <a href=" {{ route('tangguhlelong.cwgndownloadboranglulus', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
+                                <a class="btn m-1 btn-info" href=" {{ route('tangguhlelong.cwgndownloadboranglulus', ['lelongbid_id'=>$mohon['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
                             @endif
                             </td>
                             
diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php
index 11c2c9b4..a481fc35 100644
--- a/resources/views/tangguhlelong/senleltangguh.blade.php
+++ b/resources/views/tangguhlelong/senleltangguh.blade.php
@@ -3,8 +3,15 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <h3 class="pt-3">Senarai Permohonan Tangguh Lelong</h3>
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+              
+                <div class="header-style-title">
+                    Senarai Permohonan Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,7 +19,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                <table class="table text-center table-bordered"  id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>                            
diff --git a/routes/web.php b/routes/web.php
index 034821d5..6fd670a4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -264,6 +264,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
     Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); 
     Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); 
     Route::post('/submitdelete',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); 
+    Route::get('/listperubahanmutumarhun/{id}',['as'=>'marhun.listperubahanmutumarhun','uses'=>'MarhunController@listsahubahmutu']);
     
     Route::get('/senlelmarhun',['as'=>'marhun.senlelmarhun','uses'=>'MarhunController@senlelmarhun']); 
     Route::get('/sentangguhlelongsah/{lelong_id}',['as'=>'marhun.sentangguhlelongsah','uses'=>'MarhunController@sentangguhlelongsah']); 

From 2131f01fc91ac7573a12bc4fc0e8b9c7640589f1 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sat, 26 Nov 2022 16:28:30 +0800
Subject: [PATCH 13/23] add showlelongpcdone

---
 app/Http/Controllers/LelongController.php     | 606 +++++++++++++++++-
 .../views/lelong/senarailelong.blade.php      |   2 +-
 .../views/lelong/senarailelongpc.blade.php    |  20 +-
 .../views/lelong/senaraimarhundone.blade.php  | 188 ++++++
 .../lelong/senaraimarhunpcdone.blade.php      | 204 ++++++
 .../views/lelong/showlelongdone.blade.php     |  13 +-
 .../views/lelong/showlelongpcdone.blade.php   | 473 ++++++++++++++
 .../marhun/senarailelongscanjual.blade.php    |  20 +-
 .../views/pdf/cetakmasukscanbarcode.blade.php |   2 +-
 resources/views/pdf/lelreportdone.blade.php   |  48 +-
 resources/views/pdf/lelreportpcdone.blade.php | 193 ++++++
 routes/web.php                                |   5 +
 12 files changed, 1724 insertions(+), 50 deletions(-)
 create mode 100644 resources/views/lelong/senaraimarhundone.blade.php
 create mode 100644 resources/views/lelong/senaraimarhunpcdone.blade.php
 create mode 100644 resources/views/lelong/showlelongpcdone.blade.php
 create mode 100644 resources/views/pdf/lelreportpcdone.blade.php

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 9b6a93e9..6965b653 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3330,6 +3330,7 @@ class LelongController extends Controller
         $total_pinjaman = 0;
         $total_upah = 0;
         $total_hargaasas = 0;
+        $total_hargajual = 0;
         $total_cazlelong = 0;
         $total_rugilelong = 0;
         $total_bakilelong = 0;
@@ -3353,7 +3354,7 @@ class LelongController extends Controller
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
             $databid = LelongBid::select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
-            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah')
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.hargajual','lelongbid.cajlelong','lelongbid.bakiupah')
             ->where('caw_id','=',$cawlel->caw_id)->where('status_jual','=',1)->where('lelong_id','=',$lelong_id)->get();
             
             // dd($databid->toArray());
@@ -3363,6 +3364,7 @@ class LelongController extends Controller
             $nilai_marhun = 0;
             $bakiupah = 0;
             $hargaasas = 0;
+            $hargajual = 0;
             $cajlelong = 0;
             $rugilelong = 0;
             $bakilelong = 0;
@@ -3376,11 +3378,13 @@ class LelongController extends Controller
                 $bakiupah = $bakiupah + $bid['bakiupah'];
                 $hargaasas = $hargaasas + $bid['hargaasas'];
                 $cajlelong = $cajlelong + $bid['cajlelong'];
+                $hargajual = $hargajual + $bid['hargajual'];
+                $totalbaki = $bid['baki'];
 
-                $lelongsim = Lelong::where('id', $lelong_id )->get();
-                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                // $lelongsim = Lelong::where('id', $lelong_id )->get();
+                // $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                // $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
                 
                 if($totalbaki > 0)
                 {
@@ -3450,6 +3454,7 @@ class LelongController extends Controller
                 'upahsimpan'=>$bakiupah,
                 'bakiupah'=>$bakiupah,
                 'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
                 'cajlelong'=>$cajlelong,
                 'rugilelong'=>$rugilelong,
                 'bakilelong'=>$bakilelong,
@@ -3459,6 +3464,7 @@ class LelongController extends Controller
             $total_berat = $total_berat + $berat;
             $total_pinjaman = $total_pinjaman + $pinjaman;
             $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_hargajual = $total_hargajual  + $hargajual;
             $total_cazlelong = $total_cazlelong + $cajlelong;
             $total_rugilelong = $total_rugilelong + $rugilelong;
             $total_bakilelong = $total_bakilelong + $bakilelong;
@@ -3481,6 +3487,7 @@ class LelongController extends Controller
                                                     'total_pinjaman',
                                                     'total_upah',
                                                     'total_hargaasas',
+                                                    'total_hargajual',
                                                     'total_cazlelong',
                                                     'total_rugilelong',
                                                     'total_bakilelong',
@@ -3501,8 +3508,8 @@ class LelongController extends Controller
                                                     'data',
                                                     'total_bakiupah',
                                                     'total_nilaimarhun'
-                                                    ))->setPaper('a4', 'potrait');
-                        return $pdf->download('Lelong Keseluruhan.pdf');
+                                                    ))->setPaper('a4', 'landscape');
+                        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
     }
     public function senarailelongall()
@@ -5065,6 +5072,7 @@ class LelongController extends Controller
         $total_cazlelong = 0;
         $total_rugilelong = 0;
         $total_bakilelong = 0;
+        $total_hargajual = 0;
 
         $total24Kgb = 0;
         $total24K = 0;
@@ -5092,6 +5100,7 @@ class LelongController extends Controller
             $pinjaman = 0;
             $bakiupah = 0;
             $hargaasas = 0;
+            $hargajual = 0;
             $cajlelong = 0;
             $rugilelong = 0;
             $bakilelong = 0;
@@ -5107,12 +5116,13 @@ class LelongController extends Controller
                 $bakiupah += $lel_bid->bakiupah;
                 $berat += $lel_bid->berat;
                 $hargaasas += $lel_bid->hargaasas;
+                $hargajual += $lel_bid->hargajual;
                 $cajlelong += $lel_bid->cajlelong;
 
                 // $lelongcaj = Lelong::where('id',$id)->get();
                 // $sumcajlelong =  $lel_bid['hargaasas'] * ($lelongcaj[0]['cajlelong']/100);
                 // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $lel_bid['cajlelong'];
+                $totalbaki = $lel_bid['baki'];
                 
                 if($totalbaki > 0)
                 {
@@ -5162,6 +5172,7 @@ class LelongController extends Controller
                 'upahsimpan'=>$bakiupah,
                 'bakiupah'=>$bakiupah,
                 'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
                 'cajlelong'=>$cajlelong,
                 'rugilelong'=>$rugilelong,
                 'bakilelong'=>$bakilelong,
@@ -5186,6 +5197,7 @@ class LelongController extends Controller
             $total_cazlelong += $cajlelong;
             $total_berat += $berat;
             $total_hargaasas += $hargaasas;
+            $total_hargajual += $hargajual;
             
             
             $data = Lelong::where('lelong.id','=',$lelong_id)
@@ -5208,6 +5220,7 @@ class LelongController extends Controller
                                                 'total_cazlelong',
                                                 'total_rugilelong',
                                                 'total_bakilelong',
+                                                'total_hargajual',
                                                 'total24Kgb',
                                                 'total24K',
                                                 'total23k',
@@ -5375,6 +5388,583 @@ class LelongController extends Controller
 
     }
 
+    public function senaraimarhundone($lelongid, $cawid){
+        $total_berat = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $keuntungan = 0;
+        $bakilelong = 0;
+        $total_cazlelong = 0;
+        $total_hargajual = 0;
+        // dd($cawid);
+
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
+        $marhuns = LelongBid::where('caw_id', '=', $cawid)
+        ->where('lelong_id', '=', $lelongid)
+        ->where('status_jual', '=', 1)
+        ->get();
+        // dd($marhuns);
+        $arraymarhun = [];
+        foreach ($marhuns as $index1=> $cal) {
+            // $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
+            // $cajlelongnew = round($sumcajlelong,1,1);
+            // $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            // $marhuns[$index1]['cajlelong'] = $cajlelongnew;
+            // $marhuns[$index1]['baki'] =  $totalbaki;
+            // $marhuns[$index1]['keuntungan'] = $keuntungan;
+
+            
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'hargajual' => $cal['hargajual'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+            ]);
+            $total_berat = $total_berat + $cal['berat'];
+            $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
+            $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
+            $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
+            $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong = $total_cazlelong +  $cal['bakiupah'];
+            $total_hargajual = $total_hargajual  +  $cal['hargajual'];
+        }
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+        return view('lelong.senaraimarhundone',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        'total_pinjaman',
+        'total_upah',
+        'total_hargaasas',
+        'total_bakiupah',
+        'total_nilaimarhun',
+        'lelonglel',
+        'cawanganDetail',
+        'total_cazlelong',
+        'total_hargajual'));
+    }
+
+    public function showlelongpcdone(Request $request, $id)
+    {
+        $lelong_id = $id;
+        $user =  Auth::user();
+        $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
+        $cawid = $caw->id;
+        $kodcaw = $user->kodcaw;
+        $lelong = Lelong::where('id','=',$id)->first();
+        $cawanganlel = CawanganLelong::with(['cawangan', 'lelongBid' => function ($query1) use($kodcaw) {
+            $query1->where('status_jual', '=', 1)
+            ->where('kodcaw','=',$kodcaw);
+            
+        }])
+        ->where('lelong_id', '=', $id)
+        ->where('caw_id', '=', $cawid)
+        ->get();
+        // dd($cawanganlel);
+        $lelkarat = LelKarat::where('lelong_id','=',$id)->get();
+        $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+      
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+        $total_hargajual = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+
+        $keuntungan = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 0;
+
+        $totalkeuntungan2 = 0;
+        $total_marhun = 0;
+
+           foreach ($cawanganlel as $cawlel) {
+            $berat = 0;
+            $nilai_marhun = 0;
+            $pinjaman = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $hargajual = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+           
+            
+
+            $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->where('status_jual','=',1)->get();
+            // dd($databid);
+            foreach ($databid as $lel_bid) {
+               
+                $nilai_marhun += $lel_bid->nilaimarhun;
+                $pinjaman += $lel_bid->pinjaman;
+                $bakiupah += $lel_bid->bakiupah;
+                $berat += $lel_bid->berat;
+                $hargaasas += $lel_bid->hargaasas;
+                $hargajual += $lel_bid->hargajual;
+                $cajlelong += $lel_bid->cajlelong;
+
+                // $lelongcaj = Lelong::where('id',$id)->get();
+                // $sumcajlelong =  $lel_bid['hargaasas'] * ($lelongcaj[0]['cajlelong']/100);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $lel_bid['baki'];
+                
+                if($totalbaki > 0)
+                {
+                    $bakilelong += $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong -= $totalbaki;
+                }
+                // dd($totalbaki);
+                
+
+                foreach ($lel_bid->lelongBidMarhun as $lel_bid_marhun) {
+                    if ($lel_bid_marhun->karat == "24.0Kgb") {
+                        $total24Kgb += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "24.0K") {
+                        $total24K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "23.0K") {
+                        $total23k += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "22.0K") {
+                        $total22K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "21.0K") {
+                        $total21K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "20.0Kp") {
+                        $total20K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "18.0Kp") {
+                        $total18Kp += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "18.0K") {
+                        $total18K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "14.0Kp") {
+                        $total14Kp += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "14.0K") {
+                        $total14K += $lel_bid_marhun->berat;
+                    }
+                }
+            }
+            // dd($cawlel->cawangan);
+            // $total_marhun += sizeof($cawlel->lelongBid);
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawlel['caw_id'],
+                'cawangan' => $cawlel->cawangan->caw_name,
+                't_lelong'=>$lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($cawlel->lelongBid),
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>$bakiupah,
+                'bakiupah'=>$bakiupah,
+                'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+
+            $total_marhun += sizeof($cawlel->lelongBid);
+
+            // $total_marhun = $total_marhun + sizeof($databid);
+            // $total_berat = $total_berat + $berat;
+            // $total_pinjaman = $total_pinjaman + $pinjaman;
+            // $total_hargaasas = $total_hargaasas  + $hargaasas;
+            // $total_cazlelong = $total_cazlelong + $cajlelong;
+            // $total_rugilelong = $total_rugilelong + $rugilelong;
+            // $total_bakilelong = $total_bakilelong + $bakilelong;
+            // $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            // $total_bakiupah = $total_bakiupah + $bakiupah;
+            $total_nilaimarhun += $nilai_marhun;
+            $total_pinjaman += $pinjaman;
+            $total_bakiupah += $bakiupah;
+            $total_rugilelong += $rugilelong;
+            $total_bakilelong += $bakilelong;
+            $total_cazlelong += $cajlelong;
+            $total_berat += $berat;
+            $total_hargaasas += $hargaasas;
+            $total_hargajual += $hargajual;
+            
+            
+            $data = Lelong::where('lelong.id','=',$lelong_id)
+            ->get();
+
+            $tarikhkemaskini = LelKarat::where('lelong_id','=',$id)
+            ->where('karat','=',"22.0K")->first();
+            // dd($tarikhkemaskini);
+        }
+        
+
+        return view('lelong.showlelongpcdone',compact(
+                                                'arraycaw',
+                                                'total_marhun',
+                                                'total_berat',
+                                                'total_nmarhun',
+                                                'total_pinjaman',
+                                                'total_upah',
+                                                'total_hargaasas',
+                                                'total_cazlelong',
+                                                'total_rugilelong',
+                                                'total_bakilelong',
+                                                'total_hargajual',
+                                                'total24Kgb',
+                                                'total24K',
+                                                'total23k',
+                                                'total22K',
+                                                'total21K',
+                                                'total20K',
+                                                'total18Kp',
+                                                'total18K',
+                                                'total14Kp',
+                                                'total14K',
+                                                'total9K',
+                                                'lelkarat',
+                                                'lelong_id',
+                                                'jeniskarat',
+                                                'data',
+                                                'total_bakiupah',
+                                                'total_nilaimarhun','tarikhkemaskini'));
+    }
+    public function senaraimarhunpcdone($lelongid, $cawid){
+        $total_berat = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_hargajual = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $keuntungan = 0;
+        $bakilelong = 0;
+        $total_cazlelong = 0;
+
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
+        $marhuns = LelongBid::where('caw_id', '=', $cawid)
+        ->where('lelong_id', '=', $lelongid)
+        ->where('caw_id','=',$cawid)
+        ->where('status_jual', '=', 1)
+        ->get();
+        // dd($marhuns);
+        $arraymarhun = [];
+        foreach ($marhuns as $index1=> $cal) {
+            //  $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
+            // $cajlelongnew = round($sumcajlelong,1,1);
+            // $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            // $marhuns[$index1]['cajlelong'] = $cajlelongnew;
+            // $marhuns[$index1]['baki'] =  $totalbaki;
+            // $marhuns[$index1]['keuntungan'] = $keuntungan;
+
+            $total_berat = $total_berat + $cal['berat'];
+            $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
+            $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
+            $total_hargajual = $total_hargajual  +  $cal['hargajual'];
+            $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
+            $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong = $total_cazlelong +  $cal['cajlelong'];
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'hargajual' => $cal['hargajual'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+            ]);
+         
+        }
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+        return view('lelong.senaraimarhunpcdone',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        'total_pinjaman',
+        'total_upah',
+        'total_hargaasas',
+        'total_bakiupah',
+        'total_nilaimarhun',
+        'lelonglel',
+        'total_cazlelong',
+        'total_hargajual'));
+    }
+
+    public function exportlelongpcdone(Request $request)
+    {
+
+        $lelong_id = $request->lelongid;
+        $user =  Auth::user();
+        $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
+        $lelong = Lelong::where('id','=',$lelong_id)->first();
+        $cawanganlel = CawanganLelong::where('lelong_id','=',$lelong_id)
+        ->where('caw_id','=',$caw->id)->get();
+        $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
+        $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+        $total_hargajual = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 0;
+        $total_bakiupah = 0;
+
+        foreach($cawanganlel as $cawlel)
+        {
+            $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
+            $databid = LelongBid::select('lelongbid.jbg','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.hargajual','lelongbid.cajlelong','lelongbid.bakiupah')
+            ->where('caw_id','=',$cawlel->caw_id)
+            ->where('status_jual','=',1)
+            ->where('caw_id','=',$cawlel->caw_id)
+            ->get();
+            
+            // dd($databid->toArray());
+            $packet = 0;
+            $berat = 0;
+            $pinjaman =0;
+            $nilai_marhun = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+            $hargajual = 0;
+            $totalbaki = 0;
+
+            foreach($databid as $index1=>$bid)
+            {
+                $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
+                $berat = $berat + $bid['berat']; 
+                $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
+                $pinjaman =$pinjaman + $bid['pinjaman'];
+                $bakiupah = $bakiupah + $bid['bakiupah'];
+                $hargaasas = $hargaasas + $bid['hargaasas'];
+                $cajlelong = $cajlelong + $bid['cajlelong'];
+                $hargajual = $hargajual + $bid['hargajual'];
+                $totalbaki = $bid['baki'];
+
+                // $lelongsim = Lelong::where('id', $lelong_id )->get();
+                // $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                // $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                
+                if($totalbaki > 0)
+                {
+                    $bakilelong = $bakilelong + $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong = $rugilelong - $totalbaki;
+                }
+                
+                
+                $total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','24.0Kgb')
+                                            ->sum('berat');
+                
+                $total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','24.0K')
+                                            ->sum('berat');
+                                            
+                $total23k += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','23.0K')
+                                            ->sum('berat');
+                                            
+                $total22K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','22.0K')
+                                            ->sum('berat');
+                                            
+                $total21K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','21.0K')
+                                            ->sum('berat');
+                                            
+                $total20K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','20.0K')
+                                            ->sum('berat');
+                                            
+                $total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','18.0Kp')
+                                            ->sum('berat');
+                                            
+                $total18K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','18.0K')
+                                            ->sum('berat');
+                                            
+                $total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','14.0Kp')
+                                            ->sum('berat');
+                                            
+                $total14K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','14.0K')
+                                            ->sum('berat');
+                                            
+                $total9K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','9.0K')
+                                            ->sum('berat');
+                            
+                            
+                
+            }
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawangan['id'],
+                'cawangan'=>$cawangan['caw_name'],
+                't_lelong'=>$lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($databid),
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>$bakiupah,
+                'bakiupah'=>$bakiupah,
+                'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+
+            $total_marhun = $total_marhun + sizeof($databid);
+            $total_berat = $total_berat + $berat;
+            $total_pinjaman = $total_pinjaman + $pinjaman;
+            $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_hargajual = $total_hargajual  + $hargajual;
+            $total_cazlelong = $total_cazlelong + $cajlelong;
+            $total_rugilelong = $total_rugilelong + $rugilelong;
+            $total_bakilelong = $total_bakilelong + $bakilelong;
+            $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            $total_bakiupah = $total_bakiupah + $bakiupah;
+            
+            
+            $data = Lelong::where('lelong.id','=',$lelong_id)
+            ->first();
+        }
+        $datacaw = Cawangan::where('id','=',$caw->id)
+        ->get();
+
+
+        $pdf = PDF::loadView('pdf.lelreportpcdone',compact('datacaw','arraycaw',
+                                                    'total_marhun',
+                                                    'total_berat',
+                                                    'total_nmarhun',
+                                                    'total_pinjaman',
+                                                    'total_upah',
+                                                    'total_hargaasas',
+                                                    'total_hargajual',
+                                                    'total_cazlelong',
+                                                    'total_rugilelong',
+                                                    'total_bakilelong',
+                                                    'total24Kgb',
+                                                    'total24K',
+                                                    'total23k',
+                                                    'total22K',
+                                                    'total21K',
+                                                    'total20K',
+                                                    'total18Kp',
+                                                    'total18K',
+                                                    'total14Kp',
+                                                    'total14K',
+                                                    'total9K',
+                                                    'lelkarat',
+                                                    'lelong_id',
+                                                    'jeniskarat',
+                                                    'data',
+                                                    'total_bakiupah',
+                                                    'total_nilaimarhun'
+                                                    ))->setPaper('a4', 'potrait');
+                        return $pdf->download('Laporan Lelong Cawangan.pdf');
+
+    }
+
+
+    
+
 
 
 
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 982a6717..85dd8b65 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -219,7 +219,7 @@
                                             <td>{{$lelong->cajlelong}}</td>
                                             <td><span class="badge badge-pill badge-success">LELONG SELESAI</span></td>
                                             <td style="white-space: nowrap;">
-                                                <a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a>
+                                                {{-- <a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a> --}}
                                                 <a class="btn m-1 btn-warning" href="{{ route('lelong.showlelongdone',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong Selesai"><i class="far fa-calendar"></i></a>
                                                 <a class="btn m-1 btn-success" href="{{ route('lelong.exportDataByCawangan',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Export Data"><i class="fas fa-file-export"></i></a>
                                             </td>
diff --git a/resources/views/lelong/senarailelongpc.blade.php b/resources/views/lelong/senarailelongpc.blade.php
index caef7795..7f7f5d11 100644
--- a/resources/views/lelong/senarailelongpc.blade.php
+++ b/resources/views/lelong/senarailelongpc.blade.php
@@ -31,6 +31,7 @@
                             <th>Harga Emas Asas</th>
                             <th>Tempoh</th>
                             <th>Caj Lelong</th>
+                            <th>Status</th>
                             <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
@@ -71,12 +72,11 @@
                             @hasrole('pengurus-cawangan')
                             <div class="row justify-content-center">
                                 @if($data['laporan']['sts_lelong'] == 0)
-                                 {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
-                                <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                <button class="btn btn-info btn-sm" disabled>LELONGAN BELUM MULA</button>
                                 @elseif($data['laporan']['sts_lelong'] == 1)
                                 <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
                                 @elseif($data['laporan']['sts_lelong'] == 2)
-                                <button class="btn btn-info btn-sm" disabled>JANA PEMENANG</button>
+                                <button class="btn btn-primary btn-sm" disabled>JANA PEMENANG</button>
                                 @elseif($data['laporan']['sts_lelong'] == 3)
                                 <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 {{-- <a href="{{ route('lelong.exportDataByCawangan', $data['laporan']['lelong_id']) }}" class="btn btn-primary btn-sm">EXPORT <i class="fas fa-file-export"></i></a> --}}
@@ -84,6 +84,20 @@
                             </div>
                             @endhasrole
                         </td>
+                        <td class="text-center">
+                            @hasrole('pengurus-cawangan')
+                            <div class="row justify-content-center">
+                                @if($data['laporan']['sts_lelong'] == 0)
+                                 {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
+                                <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                @elseif($data['laporan']['sts_lelong'] == 3)
+                                {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
+                               <a  class="btn m-1 btn-success" href="{{ route('jananotis.showlelongpcdone',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-calendar"></i></a>
+                                @endif
+                            </div>
+                            @endhasrole
+                        </td>
+                        
                     </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/lelong/senaraimarhundone.blade.php b/resources/views/lelong/senaraimarhundone.blade.php
new file mode 100644
index 00000000..d27d8cf7
--- /dev/null
+++ b/resources/views/lelong/senaraimarhundone.blade.php
@@ -0,0 +1,188 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{ route('lelong.showlelongdone',$lelongid) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Sag : {{ $cawanganDetail->caw_name }}
+                </div>
+            </div>
+            <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                @php
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong );
+                $t_lelong = $myDateTime->format('d-m-Y');
+                @endphp
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$t_lelong}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">JBG</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelonglel->jbg}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{sizeof($arraymarhun)}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {{-- <div class="mb-3">
+                    <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                    <a href="{{ route('lelong.listsagbycust',[$lelongid,'cawid'=>$cawid]) }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                </div> --}}
+            <form id="deletesag" method="POST">
+                @csrf
+                <input type="hidden" name="lelongid" value="{{$lelongid}}">
+                <input type="hidden" name="cawid" value="{{$cawid}}">
+                <table class="table text-right table-bordered" id="marhun" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>No Rujukan</th>
+                            {{-- <th>Nama Pelanggan</th> --}}
+                            <th>Tempoh</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Keuntungan (RM)</th>
+                            <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Harga Jual (RM)</th>
+                            <th>Baki Lelong (RM)</th>
+                            {{-- <th>Tindakan</th> --}}
+                        </tr>
+                    </thead>
+                    <tbody>
+                    @php     
+                        $rugilelong = 0;
+                        $bakilelong = 0; 
+                    @endphp
+                        @foreach ($marhuns as $index=> $marhun)
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
+                            {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
+                            <td>{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
+                            @php
+                            $rugi = 0;
+                                $baki = 0;
+                                 if(strpos($marhun['baki'], '-') !== false)
+                                 {
+                                    $baki  = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                                 else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                            @endphp
+                            <td align = 'right'>@if($marhun['baki'] > 0)
+                                {{number_format($marhun['baki'], 2, '.', ',')}}
+                                @elseif($marhun['baki'] < 0 )
+                                ({{number_format(-($marhun['baki']), 2, '.', ',')}})
+                                @endif
+                            </td>
+
+                            {{-- <td class="text-center">
+                                <input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                            </td> --}}
+
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                            <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
+                            {{-- <td align = 'right'></td> --}}
+                        </tr>
+                    </tfoot>
+
+
+                </table>
+               
+                {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
+
+            </form>
+        </div>
+    </div>
+    </div>
+    </div>
+</div>
+<script>
+
+    function confirm() {
+        $.confirm({
+            title: 'Hapus No.Rujukan',
+            content: 'Anda pasti?',
+            type: 'red',
+            typeAnimated: true,
+            buttons: {
+                Hapus: {
+                    btnClass: 'btn-danger',
+                    action: function() {
+                        $("#deletesag").submit();
+                    }
+                },
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                }
+            }
+        });
+    }
+
+    var tablemarhun = $('#marhun').DataTable({
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 999999,
+        dom: 'Bfrtip',
+    });
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/lelong/senaraimarhunpcdone.blade.php b/resources/views/lelong/senaraimarhunpcdone.blade.php
new file mode 100644
index 00000000..377359d3
--- /dev/null
+++ b/resources/views/lelong/senaraimarhunpcdone.blade.php
@@ -0,0 +1,204 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{ route('jananotis.showlelongpcdone',$lelongid) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Lelongan
+                </div>
+            </div>
+            <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                
+                <div class="col-3">
+                    @foreach ($arrayinfo as $laporan)
+                    @php
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+                $datez = $myDateTime->format('d-m-Y');
+                // echo($datez);
+                @endphp
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                            </div>
+                        </div>
+                    </div>
+                    @endforeach
+                </div>
+
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{sizeof($arraymarhun)}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {{-- <div class="mb-3">
+                    <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                    <a href="{{ route('jananotis.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                </div> --}}
+
+      
+
+
+
+
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            {{-- <div class="text-left pt-4">
+                <a href=" {{ route('jananotis.lelongreportpc',[$lelongid,$cawid]) }}" class="btn btn-success">PDF</a>
+                <a href="{{ route('jananotis.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
+                <a href="{{ route('jananotis.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
+                <a href="{{ route('lelonghargajual.senaraimarhunkhasbelumjual',[$lelongid,$cawid])  }}" class="btn btn-success">Belum Jual</a>
+                <a href="{{ route('lelonghargajual.senaraimarhunkhastelahjual',[$lelongid,$cawid])  }}" class="btn btn-success">Telah Jual</a> 
+
+            </div> --}}
+            <form id="deletesag" action="{{route('lelonghargajual.deletemarhun')}}" method="POST">
+                @csrf
+                <input type="hidden" name="lelongid" value="{{$lelongid}}">
+                <input type="hidden" name="cawid" value="{{$cawid}}">
+                <table class="table text-right table-bordered" id="marhun" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>No Rujukan</th>
+                            {{-- <th>Nama Pelanggan</th> --}}
+                            <th>Tempoh</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Keuntungan (RM)</th>
+                            <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Harga Jual (RM)</th>
+                            <th>Baki Lelong (RM)</th>
+                            {{-- <th>Tindakan</th> --}}
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @php     
+                        $rugilelong = 0;
+                        $bakilelong = 0; 
+                    @endphp
+                        @foreach ($arraymarhun as $index=> $marhun)
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
+                            {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
+                            <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
+                            @php
+                            $rugi = 0;
+                                $baki = 0;
+                                 if(strpos($marhun['baki'], '-') !== false)
+                                 {
+                                    $baki  = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                                 else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                            @endphp
+                            <td align = 'right'>@if($marhun['baki'] > 0)
+                                {{number_format($marhun['baki'], 2, '.', ',')}}
+                                @elseif($marhun['baki'] < 0 )
+                                ({{number_format(-($marhun['baki']), 2, '.', ',')}})
+                                @endif
+                            </td>
+                           
+
+                            {{-- <td class="text-center">
+                                <input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                            </td> --}}
+
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                            <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
+                            {{-- <td align = 'right'></td> --}}
+                        </tr>
+                    </tfoot>
+
+                </table>
+                <div class="text-right pt-4">
+                    {{-- <a  href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a> --}}
+                    {{-- <button type="button" class="btn btn-danger" onclick="confirm()">Hapus</button> --}}
+                </div>
+                {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
+
+            </form>
+        </div>
+
+    </div>
+</div>
+<script>
+
+    function confirm() {
+        $.confirm({
+            title: 'Confirmation',
+            content: 'Anda pasti?',
+            type: 'red',
+            typeAnimated: true,
+            buttons: {
+                Delete: {
+                    btnClass: 'btn-danger',
+                    action: function() {
+                        $("#deletesag").submit();
+                    }
+                },
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                }
+            }
+        });
+    }
+
+    var tablemarhun = $('#marhun').DataTable({
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 999999,
+        dom: 'Bfrtip',
+    });
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/lelong/showlelongdone.blade.php b/resources/views/lelong/showlelongdone.blade.php
index 5a275ae5..afe868c0 100644
--- a/resources/views/lelong/showlelongdone.blade.php
+++ b/resources/views/lelong/showlelongdone.blade.php
@@ -5,7 +5,7 @@
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
             <div class="card-header header-style">
-                <a href="{{ route('jananotis.senarailelongpc') }}" class="header-style-icon">
+                <a href="{{ route('lelong.senarailelong',) }}" class="header-style-icon">
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
@@ -176,8 +176,9 @@
                                     <th>N. Marhun (RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Harga Asas (RM)</th>
                                     <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
+                                    <th>Harga Jual (RM)</th>
                                     <th>Baki (RM)</th>
                                     <th>Rugi (RM)</th>
                                 </tr>
@@ -187,14 +188,15 @@
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
                                     <td>{{$index+1}}</td>
-                                    <td><a href=" {{ route('jananotis.senaraimarhunpc',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td><a href=" {{ route('jananotis.senaraimarhundone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
                                     <td>{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                     <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
@@ -208,8 +210,9 @@
                                     <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
-                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
                                     <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                 </tr>
diff --git a/resources/views/lelong/showlelongpcdone.blade.php b/resources/views/lelong/showlelongpcdone.blade.php
new file mode 100644
index 00000000..811db7ff
--- /dev/null
+++ b/resources/views/lelong/showlelongpcdone.blade.php
@@ -0,0 +1,473 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+            <div class="card-header header-style">
+                <a href="{{ route('jananotis.senarailelongpcdone') }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    @foreach($data as $data1)
+                    @php 
+                        $today = date('d-m-Y');
+                        $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                        $datez = $myDateTime->format('d-m-Y');
+                    @endphp
+                    @endforeach
+                    butiran lelong : {{$datez}}
+                </div>
+            </div>
+              <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                <form id="exportform" action="{{route('jananotis.exportlelongpcdone')}}" method="POST">
+                    @csrf
+                    <input type="hidden" name="type" value="User">
+                    <input type="hidden" name="lelongid" value="{{ $lelong_id }}">
+                    <div class="row">
+                        <div class="col-md-12 col-lg">
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        @foreach($data as $data1)
+                                            @php 
+                                            $today = date('d-m-Y');
+                                            $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                                              $datez = $myDateTime->format('d-m-Y');
+                                            //   echo($datez);
+                                          
+                                          @endphp
+                                        @endforeach
+                                        <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">JBG</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        @foreach($data as $data)
+                                        {{-- <td>Tempoh : {{$data['jbg'] }}</td> --}}
+                                        <input type="text" readonly class="form-control bg-light" value="{{$data['jbg']}}">
+                                        @endforeach
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Bilangan SAG</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$total_marhun}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Harga Emas Per Gram</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{$tarikhkemaskini->harga2}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-1"></div>
+                        <div class="col-md-12 col-lg">
+                           
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Harga Asas Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_hargaasas, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Caj Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_cazlelong, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Baki Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakilelong, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Rugi Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="(RM{{ number_format($total_rugilelong, 2, '.', ',') }})">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    
+                        
+                    <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
+                        <table class="table text-right table-bordered" id="simulasi">
+                            <thead class="bg-primary text-white">
+                                <tr class="text-center">
+                                    <th>No</th>
+                                    <th>Cawangan</th>
+                                    <th>Bil SAG</th>
+                                    <th>Berat (gm)</th>
+                                    <th>N. Marhun (RM)</th>
+                                    <th>Pembiayaan (RM)</th>
+                                    <th>Keuntungan (RM)</th>
+                                    <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
+                                    <th>Harga jual (RM)</th>
+                                    <th>Baki (RM)</th>
+                                    <th>Rugi (RM)</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                
+                                @foreach ($arraycaw as $index=>$caw)
+                                <tr>
+                                    <td>{{$index+1}}</td>
+                                    <td><a href=" {{ route('jananotis.senaraimarhunpcdone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td>{{ $caw['bil_marhun'] }}</td>
+                                    <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                    <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            <tfoot>
+                                <tr>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                                </tr>
+                            </tfoot>
+                            
+                        </table>
+
+                        <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
+                        <table class="table table-bordered text-center" id="jumlahberat">
+                            <thead class="bg-light">
+                                <!-- <tr class="text-center">
+                                    <th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
+                                </tr> -->
+                                <tr>
+                                    <th>MUTU</th>
+                                    @foreach ($lelkarat as $index=>$karat)
+                                    <th>{{$karat->karat}}</th>
+                                    @endforeach
+                                </tr>
+                            </thead>
+                            <tbody>
+
+                                <tr>
+                                    <td>BERAT (gm)</td>
+                                    <td>{{$total24Kgb}}</td>
+                                    <td>{{$total24K}}</td>
+                                    <td>{{$total23k}}</td>
+                                    <td>{{$total22K}}</td>
+                                    <td>{{$total21K}}</td>
+                                    <td>{{$total20K}}</td>
+                                    <td>{{$total18Kp}}</td>
+                                    <td>{{$total18K}}</td>
+                                    <td>{{$total14Kp}}</td>
+                                    <td>{{$total14K}}</td>
+
+                                </tr>
+                            </tbody>
+
+                        </table>
+                    </form>
+                    <div class="row">
+                        <div class="text-center">
+                            {{-- <a class="btn btn-primary" href="{{ route('lelong.create',$lelong_id) }}">Create Lelong</a> --}}
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane fade" id="nav-hargaasas" role="tabpanel" aria-labelledby="nav-hargaasas-tab">
+                    <br>
+                    <div class="row ">
+                        <div class="col-md-10 mx-auto ">
+                            <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
+                            
+                            <div id="hideform">
+                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label>
+                                <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
+                                <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
+                                <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button>
+                            </div>
+                            
+                        </div>
+                    </div>
+              
+                    {{-- <a class="btn btn-primary" href="{{ route('lelong.kemaskinihargaasas',$lelong_id) }}">Kemaskini</a> --}}
+                    
+                    
+                </div>
+              </div>
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            {{-- {{$cawangan[0] }} --}}
+        </div>
+        <div class="modal fade" tabindex="-1" id="modalfilter">
+            <div class="modal-dialog modal-lg">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">Filter By</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                    <form action="{{ route('analisa.filter') }}" method="POST" id="formfilter">
+                        @csrf
+                        <div class="row justify-content-center">
+                            <div class="col-md-8">
+                                <div class="form-group row">
+                                    <input type="hidden" name="idmarhun" id="idmarhun" >
+                                    
+                                </div>
+                            </div>                       
+                          </div>
+                      </form>
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+                  <button type="button" class="btn btn-primary" onclick="">Jana Semula Simulasi</button>
+                </div>
+              </div>
+            </div>
+          </div>
+    </div>
+</div>
+<script>
+    $("#hideform").hide();
+    $('#btnsimpan').prop('disabled', true)
+    function kemaskini() {
+       var inputdata =  $("td.input").find("input");
+       if(inputdata.length ==0)
+       {
+        $("td.input").each(function(index) {
+            // console.log(index)
+            var la = $(this).html();
+            // if(index%2 ==0 ) //even-0-2-4
+            // { 
+                $(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
+            // }
+            // else //odd-1-3-5-7
+            // {
+            //     $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
+            // }
+            
+        })
+        $("#hideform").show();
+        $("#btnkemaskini").hide();
+       }
+       else
+       {
+            $("td.input").each(function() {
+                var la = $(this).html();
+                $(this).html($(la).val());
+            })
+            $("#hideform").hide();
+            $("#btnkemaskini").show();
+       }
+        
+    }
+
+    function calculate(e)
+    {
+        let hargaasasbaru = $('#txthargaasas').val();
+
+        let jeniskarat = $(e).data('jeniskarat');
+        
+        // let maxcolumn = 2;
+        let count = 0;
+        let indexarray = 0;
+        $("td.input").each(function(index) {
+            if(hargaasasbaru)
+            {
+                $('#btnsimpan').prop('disabled', false)
+                // if(index%2 == 0)
+                // {
+                    let harga1 = parseFloat(hargaasasbaru);
+                    let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                    let newhargaasas = harga1 + (harga2); 
+                    count++;
+                    $('#harga2'+index).val(newhargaasas.toFixed(2));
+                // }
+                // else
+                // {
+                //     let harga1 = parseFloat(hargaasasbaru);
+                //     let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                //     let newhargaasas = (harga1 + (harga2))/2.72;; 
+                //     count++;
+                //     $('#harga'+index).val(newhargaasas.toFixed(2));
+                // }
+
+                // if(count == maxcolumn)
+                // {
+                //     count = 0;
+                    indexarray++;
+                // }
+            }
+            else
+            {
+                $('#btnsimpan').prop('disabled', true)
+                let dummy =0;
+                if(index%2 == 0)
+                {
+                    $('#harga2'+index).val(dummy.toFixed(2));
+                }
+                // else
+                // {
+
+                //     $('#harga'+index).val(dummy.toFixed(2));
+                // }
+            }
+            
+        })
+        
+    }
+
+    function save(){
+        $('#formhargaasas').submit();
+    }
+
+    $('a.confirmdel').confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    location.href = this.$target.attr('href');
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+
+    var tablesimulasi = $('#simulasi').DataTable( {
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false,
+                "width": 100%
+                }
+            ],
+            order: [[0, 'asc']],
+            // "ordering": false,
+            "searching":true,
+            "info": false,
+            "lengthChange": false,
+            "scrollX": true,
+            "paging": false,
+
+    });
+        var tableJumlahBerat = $('#jumlahberat').DataTable({
+        "scrollX": true,
+        "info": false,
+        "paging": false,
+        "searching": false,
+        "ordering": false
+    });
+
+        $('.addsim').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addsim').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+
+
+    function selectall(cb) {
+        tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php
index e574951a..080490b5 100644
--- a/resources/views/marhun/senarailelongscanjual.blade.php
+++ b/resources/views/marhun/senarailelongscanjual.blade.php
@@ -4,8 +4,24 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <h4> Senarai Lelongan Scan Kepada Pembida</h4>
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Senarai Lelongan Scan Kepada Pembida
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert mt-2 alert-success">
+                        {{ $message }}
+                    </div>
+                    @elseif ($message = Session::get('failed'))
+                    <div class="alert mt-2 alert-danger">
+                        {{ $message }}
+                    </div>
+                    @endif
+            {{-- <h4> Senarai Lelongan Scan Kepada Pembida</h4> --}}
             <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
                 <thead class="bg-primary text-white">
                     <tr>
diff --git a/resources/views/pdf/cetakmasukscanbarcode.blade.php b/resources/views/pdf/cetakmasukscanbarcode.blade.php
index 2f43fcb3..e0c63e14 100644
--- a/resources/views/pdf/cetakmasukscanbarcode.blade.php
+++ b/resources/views/pdf/cetakmasukscanbarcode.blade.php
@@ -90,11 +90,11 @@
                           <tr>
                             <th>Bil</th>
                             <th>No Rujukan</th>
-                            <th>Status</th>
                             <th>Tarikh/Masa Scan Keluar</th>
                             <th>Tarikh/Masa Terima Marhun</th>
                             <th>Tarikh/Masa Serah Marhun</th>
                             <th>Tarikh/Masa Scan Masuk</th>
+                            <th>Status</th>
                         </tr>
                         </thead>
           
diff --git a/resources/views/pdf/lelreportdone.blade.php b/resources/views/pdf/lelreportdone.blade.php
index c033cebc..f3b11ba4 100644
--- a/resources/views/pdf/lelreportdone.blade.php
+++ b/resources/views/pdf/lelreportdone.blade.php
@@ -34,6 +34,8 @@
   .row {
     margin-right:-5px;
     margin-right:-5px;
+    font-size:10px;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
   }
     
   .column {
@@ -54,6 +56,7 @@
     border-spacing: 0;
     width: 200%;
     border: 1px solid #ddd;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
   }
   
   td {
@@ -80,33 +83,15 @@
     @endforeach
     </header>
                                           
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
-                        <thead>
-                          <tr>
-                            <td>Bilangan Lelong:  {{$total_marhun}}</td>
-                            <td>Nilai Marhun Keseluruhan: RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                            <td>Pembiayaan Keseluruhan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td>
-                            <td>Keuntungan Keseluruhan:RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                                                  
-                        </thead>
-                      </table>
+                    
 
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0"  height="25" align="left" id="sim">
-                            <thead>
-                            <tr>
-                              <td>Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',')  }}</td>
-                              <td>Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                            <td>Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                            <td>Tempoh: {{ $data['jbg']}}</td> 
-                            <td>Tarikh Lelong :@php 
+                      <div class = 'row'>Tarikh Lelong :@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
-                                $datez = $myDateTime->format('d-m-Y');
-                                echo($datez);                            
-                            @endphp
-                          </td> 
-                            </tr>
-                        </thead>
-                      </table>             
+                              $datez = $myDateTime->format('d-m-Y');
+                              echo($datez);                            
+                              @endphp</div>
+                      <div class = 'row'>Tempoh: {{ $data['jbg']}}</div>
+                   
                   
               
                       <br>
@@ -121,11 +106,12 @@
                                 <th>Cawangan</th>
                                 <th>Bil SAG</th>
                                 <th>Berat (gm)</th>
-                                <th>Nilai Marhun (RM)</th>
-                                <th>Pinjaman (RM)</th>
+                                <th>Nilai Marhun Asal(RM)</th>
+                                <th>Pembiayaan(RM)</th>
                                 <th>Keuntungan (RM)</th>
-                                <th>Harga Asas (RM)</th>
                                 <th>Caj Lelong (RM)</th>
+                                <th>Harga Asas (RM)</th>
+                                <th>Harga Jual (RM)</th>
                                 <th>Baki Lelong (RM)</th>
                                 <th>Rugi Lelong (RM)</th>
                             </tr>
@@ -141,8 +127,9 @@
                                 <td align = 'right'>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                 <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                             </tr>
@@ -156,8 +143,9 @@
                                     <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
-                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                             </tr>
diff --git a/resources/views/pdf/lelreportpcdone.blade.php b/resources/views/pdf/lelreportpcdone.blade.php
new file mode 100644
index 00000000..2e374a31
--- /dev/null
+++ b/resources/views/pdf/lelreportpcdone.blade.php
@@ -0,0 +1,193 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+  
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+    font-size:10px;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
+
+<body>
+
+  <header>
+    @foreach($datacaw as $data1)
+    <u><b><h5>LAPORAN LELONGAN CAWANGAN: {{$data1['caw_name']}}</h5></b></u>
+    @endforeach
+    </header>
+                                          
+                    <div class = 'row'>Tarikh Lelong :@php 
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
+                        $datez = $myDateTime->format('d-m-Y');
+                        echo($datez);                            
+                        @endphp</div>
+                    <div class = 'row'>Tempoh: {{ $data['jbg']}}</div>
+          
+                  
+              
+                      <br>
+                      <table width="100%" id="sim">      
+                        <thead>
+                                    
+                        {{-- <tr>                       
+                          <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
+                        </tr> --}}
+                            <tr >
+                                <th>No</th>
+                                <th>Cawangan</th>
+                                <th>Bil SAG</th>
+                                <th>Berat (gm)</th>
+                                <th>Nilai Marhun (RM)</th>
+                                <th>Pinjaman (RM)</th>
+                                <th>Keuntungan (RM)</th>
+                                <th>Caj Lelong (RM)</th>
+                                <th>Harga Asas (RM)</th>
+                                <th>Harga Jual (RM)</th>
+                                <th>Baki Lelong (RM)</th>
+                                <th>Rugi Lelong (RM)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            
+                            @foreach ($arraycaw as $index=>$caw)
+                            <tr>
+                                <td>{{$index+1}}</td>
+                                <td align = 'left' style="white-space: nowrap;">{{ $caw['cawangan'] }}</td>
+                                <td align = 'center'>{{ $caw['bil_marhun'] }}</td>
+                                <td align = 'right'>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td align = 'center'><b>{{ $total_marhun }}</td>
+                                    <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                            </tr>
+                        </tfoot>
+                        
+                    </table>
+
+                    <br>
+                      <table width="100%" border="0" id="sim">
+                    
+                      <thead>
+
+                        <tr>
+                          <th style="text-align:center;" colspan="10"><b>JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</b></h5></th>   
+                      </tr>
+                      <tr>
+                        <td colspan="1" align="left"><strong>MUTU &nbsp;</strong></td>
+                        <td colspan="1" align="center">24Kgb</td>
+                        <td colspan="1" align="center">24K</td>
+                        <td colspan="1" align="center">23K</td>
+                        <td colspan="1" align="center">22K</td>
+                        <td colspan="1" align="center">21K</td>
+                        <td colspan="1" align="center">20K</td>
+                        <td colspan="1" align="center">18K</td>
+                        <td colspan="1" align="center">14K</td>
+                        <td colspan="1" align="center">9K</td>
+                      </tr>
+                      <tr>
+                        <td colspan="1" align="left"><strong>BERAT(gm)</strong></td>
+                        <td colspan="1" align="center">{{$total24Kgb}}</td>
+                        <td colspan="1" align="center">{{$total24K}}</td>
+                        <td colspan="1" align="center">{{$total23k}}</td>
+                        <td colspan="1" align="center">{{$total22K}}</td>
+                        <td colspan="1" align="center">{{$total21K}}</td>
+                        <td colspan="1" align="center">{{$total20K}}</td>
+                        <td colspan="1" align="center">{{$total18Kp}}</td>
+                        <td colspan="1" align="center">{{$total14K}}</td>
+                        <td colspan="1" align="center">{{$total9K}}</td>
+                      </tr>
+                    </thead>
+
+                      </table>
+               
+                      
+                    
+</tbody>
+
diff --git a/routes/web.php b/routes/web.php
index 6fd670a4..9694aeac 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -470,6 +470,11 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
     Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']);
     Route::post('/exportlelongpc',['as'=>'jananotis.exportlelongpc','uses'=>'LelongController@exportlelongpc']);
     Route::get('/lelongreportpc/{lelongid}/{cawid}',['as'=>'jananotis.lelongreportpc','uses'=>'ReportController@lelongreportpc']);
+    Route::get('/senaraimarhundone/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhundone','uses'=>'LelongController@senaraimarhundone']);
+    Route::get('/senarailelongpcdone',['as'=>'jananotis.senarailelongpcdone','uses'=>'LelongController@senarailelongpcdone']);
+    Route::get('/showlelongpcdone/{id}',['as'=>'jananotis.showlelongpcdone','uses'=>'LelongController@showlelongpcdone']); 
+    Route::get('/senaraimarhunpcdone/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhunpcdone','uses'=>'LelongController@senaraimarhunpcdone']);
+    Route::post('/exportlelongpcdone',['as'=>'jananotis.exportlelongpcdone','uses'=>'LelongController@exportlelongpcdone']);
 
 });
 

From f924ea12740e97356eaa1c45968ea8ba2b2a5dff Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sat, 26 Nov 2022 21:04:10 +0800
Subject: [PATCH 14/23] update part bayaran tunai

---
 app/Http/Controllers/PaymentController.php    | 11 ++++-
 .../pembayaran/kaunterpembayaran.blade.php    | 40 +++++++++----------
 .../pembayaran/senarailelongbayaran.blade.php | 36 ++++++++---------
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 4478f92f..a9e08c85 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -301,7 +301,8 @@ class PaymentController extends Controller
         $sagmenang = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('users', 'lelongbidder.user_id', '=', 'users.id')
         ->where('lelongbid.status_jual', 1)
-        ->where('users.id', $request->user_id)
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('lelongbidder.user_id', $request->user_id)
         ->where('lelongbid.lelong_id', $request->lelong_id)
         ->where('lelongbid.kodcaw', $user->kodcaw)
         ->select('lelongbidder.hargabida',
@@ -312,6 +313,9 @@ class PaymentController extends Controller
                     'lelongbidder.status_payment'
                     )
         ->get();
+
+        // dd($sagmenang);
+
    
         foreach($sagmenang as $index1=>$bid)
         {
@@ -319,6 +323,8 @@ class PaymentController extends Controller
             $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->join('users', 'lelongbidder.user_id', '=', 'users.id')
             ->where('lelongbidder.lelongbid_id', $bid->lelongbid_id)
+            ->where('lelongbid.status_jual', 1)
+            ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbidder.user_id', $request->user_id)
             ->where('lelongbid.kodcaw', $user->kodcaw)
             ->select('lelongbidder.hargabida',
@@ -338,6 +344,7 @@ class PaymentController extends Controller
                 'user_id' => $request->user_id,
                 'lelong_id' => $request->lelong_id,
                 'kodcaw' => $user->kodcaw,
+                'lelongbid_id' => $bid->lelongbid_id,
                 // 'norujukan' => $norujukan_id[$index1],
                 'norujukan' => $bid->norujukan,
                 'status_payment_opt' => 1,
@@ -362,7 +369,7 @@ class PaymentController extends Controller
             $eachbidupdate = LelongBid::where('id',$bid->lelongbid_id)->first();
             $eachbidupdate->status_jual = 1;
             $eachbidupdate->status_payment = '1';
-            $eachbidupdate->t_jual = $currentdate;
+            // $eachbidupdate->t_jual = $currentdate;
             $eachbidupdate->hargajual = $eachbid->hargabida;
             $eachbidupdate->save();
 
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index a36f4e38..17c3c9c7 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -4,28 +4,28 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col mx-auto p-4">
-        <div class="col-md-11 mx-auto card p-4">
-        @if ($message = Session::get('success'))
-                <div class="alert alert-success">
-                    <p>{{ $message }}</p>
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
+                    {{$data1['caw_name']}}
+                    @endforeach 
                 </div>
-        @elseif ($message = Session::get('failed'))
-                <div class="alert alert-danger">
-                    <p>{{ $message }}</p>
-                </div>
-        @endif
-        {{-- <h4> Senarai Bayaran Pemenang </h4> --}}
-        <div class="card-header header-style">
-            <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
-                <i class="fas fa-arrow-left"></i>
-            </a>
-            <div class="header-style-title">
-                Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
-                {{$data1['caw_name']}}
-                @endforeach 
             </div>
-        </div>
+            <div class="card-body">
+            @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        <p>{{ $message }}</p>
+                    </div>
+            @elseif ($message = Session::get('failed'))
+                    <div class="alert alert-danger">
+                        <p>{{ $message }}</p>
+                    </div>
+            @endif
         <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php
index e5a1715e..86ce86c7 100644
--- a/resources/views/pembayaran/senarailelongbayaran.blade.php
+++ b/resources/views/pembayaran/senarailelongbayaran.blade.php
@@ -3,27 +3,25 @@
 @section('content')
 
 <div class="container-fluid">
-    <div class="row ">
+    <div class="row">
         <div class="col">
             <div class="card">
-        <div class="col-md-11 mx-auto card p-4">
-        @if ($message = Session::get('success'))
-                <div class="alert alert-success">
-                    <p>{{ $message }}</p>
-                </div>
-        @endif
-        <div class="col mx-auto p-4">
-            <div class="card">
-            <div class="card-header header-style">
-                <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
-                    <i class="fas fa-arrow-left"></i>
-                </a>
-                <div class="header-style-title">
-                    Senarai Lelong : @foreach($datacaw as $data1)
-                    {{$data1['caw_name']}}
-                    @endforeach 
-                </div>
-            </div>
+                <div class="card-header header-style">
+                        <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                            Senarai Lelong : @foreach($datacaw as $data1)
+                            {{$data1['caw_name']}}
+                            @endforeach 
+                        </div>
+                    </div>
+                    <div class="card-body">
+                    @if ($message = Session::get('success'))
+                            <div class="alert alert-success">
+                                <p>{{ $message }}</p>
+                            </div>
+                    @endif
         <table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>

From 44225b006220caf475309a0a15757976ac17a864 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sat, 26 Nov 2022 21:25:27 +0800
Subject: [PATCH 15/23] Fix redirect auth

---
 app/Http/Controllers/Auth/LoginController.php |  5 ++++
 app/Http/Middleware/Authenticate.php          |  2 +-
 resources/views/includes/head.blade.php       | 26 +++++++++++++++++
 resources/views/layouts/app.blade.php         | 29 ++-----------------
 resources/views/lelong/showlelong.blade.php   |  4 +--
 5 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 resources/views/includes/head.blade.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index ee04aa70..5ef14149 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -42,4 +42,9 @@ class LoginController extends Controller
     {
         return 'username';
     }
+
+    public function redirectLogin()
+    {
+        return redirect()->route('login');
+    }
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 73edac06..704089a7 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -15,7 +15,7 @@ class Authenticate extends Middleware
     protected function redirectTo($request)
     {
         if (! $request->expectsJson()) {
-            return route('loginUser');
+            return route('login');
         }
     }
 }
diff --git a/resources/views/includes/head.blade.php b/resources/views/includes/head.blade.php
new file mode 100644
index 00000000..2fe0c5a0
--- /dev/null
+++ b/resources/views/includes/head.blade.php
@@ -0,0 +1,26 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+<!-- CSRF Token -->
+<meta name="csrf-token" content="{{ csrf_token() }}">
+
+<title>{{ config('app.name') }}</title>
+
+<link rel="icon" href="{{asset('img/arrahn_favicon.ico')}}">
+
+<!-- Scripts -->
+<script src="{{ asset('js/app.js') }}"></script>
+<script src="{{ asset('js/jquery-confirm.min.js') }}"></script>
+<script src="{{ asset('js/dataTables.buttons.min.js') }}"></script>
+
+{{-- <script src="{{ asset('js/dataTables.select.min.js') }}" ></script> --}}
+
+<!-- Fonts -->
+<link rel="dns-prefetch" href="//fonts.gstatic.com">
+<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded" rel="stylesheet" />
+
+<!-- Styles -->
+<link href="{{ asset('css/app.css') }}" rel="stylesheet">
+<link href="{{ asset('css/jquery-confirm.min.css') }}" rel="stylesheet">
+<link href="{{ asset('css/buttons.dataTables.min.css') }}" rel="stylesheet">
\ No newline at end of file
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d6a8b9aa..b5159981 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -2,33 +2,8 @@
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- CSRF Token -->
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-
-    <title>{{ config('app.name', 'ArrahnBid') }}</title>
-
-    <link rel="icon" href="{{asset('img/arrahn_favicon.ico')}}">
-
-    <!-- Scripts -->
-    <script src="{{ asset('js/app.js') }}"></script>
-    <script src="{{ asset('js/jquery-confirm.min.js') }}"></script>
-    <script src="{{ asset('js/dataTables.buttons.min.js') }}"></script>
-
-    {{-- <script src="{{ asset('js/dataTables.select.min.js') }}" ></script> --}}
-
-    <!-- Fonts -->
-    <link rel="dns-prefetch" href="//fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded" rel="stylesheet" />
-
-    <!-- Styles -->
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/jquery-confirm.min.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/buttons.dataTables.min.css') }}" rel="stylesheet">
-
+    @include('includes.head')
+    
     <script type="text/javascript">
         $(document).ready(function() {
             $('#sidebarCollapse').on('click', function() {
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 8059da67..91b2054e 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -102,10 +102,10 @@
                         <div class="col-lg-1"></div>
                         <div class="col-md-12 col-lg">
                             <div class="form-group row">
-                                <div class="col-6">
+                                <div class="col-12 col-form-label">
                                     <div class="input-group">
                                         @if($kemaskini == $today) 
-                                        <button class="btn btn-success btn-sm" disabled>Harga Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
+                                        <button class="btn btn-success btn-sm" disabled>Harga Emas Lelong Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
                                         {{-- Harga Emas Per Gram (916) : RM{{$simulasi->harga_emas_asas}} --}}
                                         @else
                                         <button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>

From 8113dc9030e9987b11f1fff71f3b4a66c3f6ffb8 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sat, 26 Nov 2022 21:28:50 +0800
Subject: [PATCH 16/23] Add redirect login in web.php

---
 routes/web.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 9694aeac..f47d8ed9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,9 +14,7 @@ use Illuminate\Support\Facades\Http;
 |
 */
 
-Route::get('/', function () {
-    return view('welcome');
-})->name('login');
+Route::get('/','Auth\LoginController@redirectLogin')->name('redirectLogin');
 
 Route::get('/test', function () {
     $response = Http::get('http://localhost:8000/api/lelongDetails/today')->json();

From 012f66578c6e079bfdea7f6e5cbcfeda850d2451 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Sat, 26 Nov 2022 22:03:55 +0800
Subject: [PATCH 17/23] update template laporan operasi

---
 app/Http/Controllers/LelongController.php     |  86 ++++----
 app/Http/Controllers/ReportController.php     |   8 +-
 resources/views/pdf/listlelong.blade.php      | 179 +++++++++--------
 .../views/pdf/listlelongdetails.blade.php     | 186 +++++++++---------
 .../views/pdf/pdflapbrglelpembida.blade.php   | 169 ++++++++--------
 resources/views/pdf/pdflaplelong.blade.php    | 176 ++++++++---------
 .../views/pdf/pdfsenarailapbidaan.blade.php   | 170 ++++++++--------
 7 files changed, 499 insertions(+), 475 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 6965b653..8d9b35df 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -4779,46 +4779,68 @@ class LelongController extends Controller
         $total_bakiupah = 0;
         $total_nilaimarhun = 0;
         $keuntungan = 0;
-        $bakilelong = 0;
-        $total_cazlelong = 0;
 
-        $lelonglel = Lelong::with('cawangan')->find($lelongid);
-
-        $cawanganDetail = $lelonglel->cawangan->find($cawid);
-
-        $marhuns = LelongBid::where('caw_id', '=', $cawid)
-        ->where('lelong_id', '=', $lelongid)
-        ->where('caw_id','=',$cawid)
-        ->get();
+        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
+        ->where('status_jual','=',0)
+        ->select(
+            'lelongbid.t_lelong',
+            'lelongbid.kodcaw',
+            'cawangan.caw_name',
+            'lelongbid.norujukan',
+            'lelongbid.pinjaman',
+            'lelongbid.berat',
+            'lelongbid.nilaimarhun',
+            'lelongbid.hargaasas',
+            'lelongbid.hargajual',
+            'lelongbid.t_jual',
+            'lelongbid.upahsimpan',
+            'lelongbid.cajlelong',
+            'lelongbid.baki',
+            'lelongbid.bakiupah',
+            'lelongbid.status_jual',
+            'lelongbid.jbg'
+        )
+        ->get()->toArray();
         // dd($marhuns);
         $arraymarhun = [];
         foreach ($marhuns as $index1=> $cal) {
-             $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
-            $cajlelongnew = round($sumcajlelong,1,1);
-            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
-            $marhuns[$index1]['cajlelong'] = $cajlelongnew;
-            $marhuns[$index1]['baki'] =  $totalbaki;
-            $marhuns[$index1]['keuntungan'] = $keuntungan;
+            // dd($cal);
+            $gadai = Gadai::on($cal['kodcaw'])
+            ->where('norujukan','=',$cal['norujukan'])
+            ->first();
+            // dd($gadai);
+            $customer =  Customer::where('kpbaru','=',$gadai['nokp'])
+            ->orWhere('kplama','=',$gadai['nokp'])
+            ->first();
+            // dd($customer);
 
+            // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
+            $marhuns[$index1]['keuntungan'] = $keuntungan;
+            $marhuns[$index1]['nama'] = $customer;
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $gadai['tempoh'],
+                'nama' => $customer['nama'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'hargajual' => $cal['hargajual'],
+                't_jual' => $cal['t_jual'],
+                'pinjaman' => $cal['pinjaman'],
+                'pinjasal' => $gadai['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+                'upah6bulan' => $gadai['bakiupah']
+            ]);
+            // $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $cal['berat'];
             $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
-            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
-
-            array_push($arraymarhun,[
-                'norujukan' => $cal['norujukan'],
-                'tempoh' => $cal['jbg'],
-                'berat' => $cal['berat'],
-                'nilaimarhun' => $cal['nilaimarhun'],
-                'hargaasas' => $cal['hargaasas'],
-                'pinjaman' => $cal['pinjaman'],
-                'bakiupah' => $cal['bakiupah'],
-                'cajlelong' => $cajlelongnew,
-                'baki' => $cal['baki'],
-            ]);
-         
         }
 
         $arrayinfo = [];
@@ -4844,9 +4866,7 @@ class LelongController extends Controller
         'total_upah',
         'total_hargaasas',
         'total_bakiupah',
-        'total_nilaimarhun',
-        'lelonglel',
-        'total_cazlelong'));
+        'total_nilaimarhun'));
     }
 
     public function showlelongpc(Request $request, $id)
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 9d5d4cdc..d438ee53 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -93,7 +93,8 @@ class ReportController extends Controller
         ->find($lelong_id);
 
         $cawangan = $test->cawangan
-        ->where('kodcaw','=',$kodcaw);
+        ->where('caw_code','=',$kodcaw);
+        // dd($cawangan[0]['caw_name']);
 
         $lelong_bid = $test->lelongBid
         ->where('kodcaw','=',$kodcaw);
@@ -112,7 +113,7 @@ class ReportController extends Controller
      
 
 
-        $pdf = PDF::loadView('pdf.listlelong',compact('cawangan','lelong_bid','total_hargaasas','total_berat'))
+        $pdf = PDF::loadView('pdf.listlelong',compact('test','cawangan','lelong_bid','total_hargaasas','total_berat'))
         ->setPaper('a4', 'potrait');
             
         return $pdf->download('Senarai Barang Lelong.pdf');
@@ -937,6 +938,9 @@ class ReportController extends Controller
             $cawangan[$index1]['detail']=$marhuns;
         }
 
+        $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+
        return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan'));
     }
 
diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php
index 212fec80..efcc52de 100644
--- a/resources/views/pdf/listlelong.blade.php
+++ b/resources/views/pdf/listlelong.blade.php
@@ -1,111 +1,110 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+
+  #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
 
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: left;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  text-align: left;
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  background-color: #f2f2f2;
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-                    <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
+                        {{-- <h6>PERMODALAN KELANTAN BERHAD</h6> --}}
+                    <u><b><h5>LAPORAN BARANG LELONG</h5></b></u>
 
-                        <tr>
-                          <td colspan="2"><u><b>LAPORAN BARANG LELONG</b></u></td>
 
-                        </tr>
-                    </table>
-
-                    {{-- <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
-                        <br>
                         <tr>
-                          @foreach ($arrayinfo as $laporan)
-                          <td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
-                          <td>Tarikh Lelong : @php
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+                          <div>Fasa : {{$test['fasa']}}</div>
+                          <div>Batch Lelong : {{$test['id']}}</div>
+                          <div>Tarikh Lelong : @php
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $test['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
-                            @endphp</td>
-                            <td>Fasa : {{$laporan['laporan']['fasa']}}</td>
+                            @endphp</div>
+                            
 
-                          @foreach ($laporan['details'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
-                          @endforeach
-                        @endforeach
+                          <div>Cawangan : {{$cawangan[0]['caw_name']}}</div>
+                        
                         </tr>
                       </thead>
-                    </table> --}}
+                    </table>
 
                       <br>
           
diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php
index c8434cd8..e666f915 100644
--- a/resources/views/pdf/listlelongdetails.blade.php
+++ b/resources/views/pdf/listlelongdetails.blade.php
@@ -1,106 +1,106 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+
+  #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
 
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: left;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  text-align: left;
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  background-color: #f2f2f2;
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-  <table width="100%" border="0" id="sim">
-    <tr>
-      <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-    </tr>
+      {{-- <h6>PERMODALAN KELANTAN BERHAD</h6> --}}
+      <u><b><h5>LAPORAN BARANG LELONG DETAILS</h5></b></u>
 
-    <tr>
-      <td colspan="2"><u><b>LAPORAN BARANG LELONG Details</b></u></td>
-
-    </tr>
-</table>
-
-<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
   <thead>
-    <br>
     <tr>
       @foreach ($arrayinfo as $laporan)
-      <td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
-      <td>Tarikh Lelong : @php
+      <div>Fasa : {{$laporan['laporan']['fasa']}}</div>
+      <div>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</div>
+      <div>Tarikh Lelong : @php
         $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
         $t_lelong =  $myDateTime->format('d-m-Y');
         echo($t_lelong);
-    @endphp</td>
-        <td>Fasa : {{$laporan['laporan']['fasa']}}</td>
+    @endphp</div>
 
       @foreach ($laporan['details'] as $details)
-      <td>Cawangan : {{$details['caw_name']}}
+      <div>Cawangan : {{$details['caw_name']}}</div>
       @endforeach
     @endforeach
     </tr>
@@ -114,13 +114,13 @@ tr:nth-child(even) {
                         <thead>
                         <tr> 
                           <th width="2%" align="left">No</th> 
-                              <th width="15%" align="left">No Rujukan </th> 
-                              <th width="10%" align="left">Jenis Marhun</th>
+                              <th width="18%" align="left">No Rujukan </th> 
+                              <th width="6%" align="left">Jenis Marhun</th>
                               <th width="10%" align="left">Karat</th> 
-                              <th width="10%" align="left">Berat(gm)</th> 
+                              <th width="6%" align="left">Berat(gm)</th> 
                               <th width="12%" align="left">Harga(RM)</th>
-                              <th width="12%" align="left">Nilai Marhun(RM)</th>
-                              <th width="14%" align="left">Harga Asas(RM)</th>
+                              <th width="15%" align="left">Nilai Marhun(RM)</th>
+                              <th width="15%" align="left">Harga Asas(RM)</th>
                               <th width="13%" align="left">Nota</th>
                         </tr>
                         </thead>
@@ -158,10 +158,10 @@ tr:nth-child(even) {
 
                         <tr>
                           <td colspan="4" align="left"></td>
-                          <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                          <td><b>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
-                          <td>{{ number_format($marhun['nmarhuns'], 2, '.', ',') }}</td>
-                          <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                          <td><b>{{ number_format($marhun['nmarhuns'], 2, '.', ',') }}</td>
+                          <td><b>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                           <td></td>
                         </tr>  
                         @endforeach      
diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php
index ef163c1e..09f6d438 100644
--- a/resources/views/pdf/pdflapbrglelpembida.blade.php
+++ b/resources/views/pdf/pdflapbrglelpembida.blade.php
@@ -1,109 +1,110 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+
+  #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
 
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: left;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  text-align: left;
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  background-color: #f2f2f2;
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
+           {{-- <h6>PERMODALAN KELANTAN BERHAD</h6> --}}
+      <u><b><h5>LAPORAN BARANG LELONG PEMBIDA</h5></b></u>
 
-                        <tr>
-                          <td colspan="2"><u><b>LAPORAN LELONG KESELURUHAN</b></u></td>
-
-                        </tr>
-                    </table>
-
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
-                          <td>Batch Lelong:  {{$lelong_id}}</td>
                           @foreach ($info as $info)                     
+                          <div>Fasa: {{$info->fasa}} </div>                
+                          <div>Batch Lelong:  {{$lelong_id}}</div>
                                 
-                          <td>Tarikh Lelong: @php
+                          <div>Tarikh Lelong: @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
-                        @endphp</td>    
-                        <td>Fasa: {{$info->fasa}} </td>                
+                        @endphp</div>    
                   
                           @endforeach
                           @foreach ($arrayinfocaw as $laporancaw)
                           @foreach ($laporancaw['cawangan'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
+                          <div>Cawangan : {{$details['caw_name']}}</div>
                           @endforeach
                           @endforeach
                          
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 14f7e4b8..1686d322 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -1,109 +1,109 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+
+  #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
 
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: left;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  text-align: left;
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  background-color: #f2f2f2;
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
+          {{-- <h6>PERMODALAN KELANTAN BERHAD</h6> --}}
+      <u><b><h5>LAPORAN LELONG KESELURUHAN</h5></b></u>
 
-                        <tr>
-                          <td colspan="2"><u><b>LAPORAN LELONG KESELURUHAN</b></u></td>
-
-                        </tr>
-                    </table>
-
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
-                        <br>
                         <tr>
-                        <td>Batch Lelong:  {{$lelong_id}}</td>
-                        @foreach ($info as $info)                     
+                          @foreach ($info as $info)                     
+                          <div>Fasa:  {{$info->fasa}}</div>
+                          <div>Batch Lelong:  {{$lelong_id}}</div>
                               
-                            <td>Tarikh Lelong:@php
+                            <div>Tarikh Lelong:@php
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
                               $t_lelong =  $myDateTime->format('d-m-Y');
                               echo($t_lelong);
-                          @endphp</td>
-                          <td>Fasa:  {{$info->fasa}}</td>
+                          @endphp</div>
 
                         @endforeach
                         @foreach ($arrayinfocaw as $laporancaw)
                         @foreach ($laporancaw['cawangan'] as $details)
-                        <td>Cawangan : {{$details['caw_name']}}
+                        <div>Cawangan : {{$details['caw_name']}}</div>
                         @endforeach
                         @endforeach
                          
@@ -200,8 +200,8 @@ tr:nth-child(even) {
           
            
             <tr>              
-              <td>Jumlah Baki A: {{$bakilelong}}</td>         
-              <td>Jumlah Baki B: {{$rugilelong}}</td>          
+              <td><b>Jumlah Baki A: {{$bakilelong}}</td>         
+              <td><b>Jumlah Baki B: {{$rugilelong}}</td>          
               <td><b>Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}<b></td>
             </tr>
   
diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php
index b5351e0b..e8e6d7f7 100644
--- a/resources/views/pdf/pdfsenarailapbidaan.blade.php
+++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php
@@ -1,107 +1,107 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+
+  #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
 
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: left;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  text-align: left;
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  background-color: #f2f2f2;
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-                    <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
+                     {{-- <h6>PERMODALAN KELANTAN BERHAD</h6> --}}
+      <u><b><h5>LAPORAN SENARAI BIDAAN PEMBIDA</h5></b></u>
 
-                        <tr>
-                          <td colspan="2"><u><b>LAPORAN SENARAI BIDAAN PEMBIDA</b></u></td>
-
-                        </tr>
-                    </table>
-
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
-                        <br>
                         <tr>
-                          <td>Batch Lelong:  {{$lelong_id}}</td>
                           @foreach ($lelongid as $info)                        
-                          <td>Tarikh Lelong:@php
+                          <div>Fasa : {{ $info->fasa}}</div>               
+                          <div>Batch Lelong:  {{$lelong_id}}</div>
+                          <div>Tarikh Lelong:@php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
-                        @endphp</td> 
-                          <td>Fasa : {{ $info->fasa}}</td>               
+                        @endphp</div> 
                           @endforeach
                           @foreach ($arrayinfocaw as $laporancaw)
                           @foreach ($laporancaw['cawangan'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
+                          <div>Cawangan : {{$details['caw_name']}}</div>
                           @endforeach
                           @endforeach
                         </tr>

From 94e044ebaa5601efd35ac22c7304a9158f28b41a Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Sat, 26 Nov 2022 22:34:06 +0800
Subject: [PATCH 18/23] update sen semakan cawangan

---
 app/Http/Controllers/MarhunController.php   |   2 +-
 resources/views/pdf/marhundetails.blade.php | 158 ++++++++++----------
 2 files changed, 83 insertions(+), 77 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 025b4abe..0d9502d0 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -729,7 +729,7 @@ class MarhunController extends Controller
             ->where('kodcaw', '=', $user['kodcaw'])
             ->get()
             ->toArray();
-        //dd($lelongs);
+        dd($lelongs);
 
         $arraycaw = [];
 
diff --git a/resources/views/pdf/marhundetails.blade.php b/resources/views/pdf/marhundetails.blade.php
index 8a500d5a..3b993983 100644
--- a/resources/views/pdf/marhundetails.blade.php
+++ b/resources/views/pdf/marhundetails.blade.php
@@ -1,85 +1,91 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
+
+  #sim2 {
     font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
+    font-size:10px;
+    border-collapse: collapse;
+    width: 40%;
+    border: 0px solid #ddd;
 
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: left;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-th, td {
-  text-align: left;
-  padding: 16px;
-}
-
-tr:nth-child(even) {
-  background-color: #f2f2f2;
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-                      <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
-
-                        <tr>
-                          <td colspan="2"><u><b>LAPORAN SENARAI MARHUN</b></u></td>
-                        </tr>
-                      </table>
-
-                      <br><br>
+                      {{-- <h6>PERMODALAN KELANTAN BERHAD</h6> --}}
+      <u><b><h5>LAPORAN SENARAI SEMAKAN MARHUN</h5></b></u>
                 
                       <table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
                         <thead>
@@ -129,10 +135,10 @@ tr:nth-child(even) {
 
                         <tr>
                           <td colspan="4" align="left"></td>
-                          <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                          <td><strong>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
-                          <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                          <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                          <td><strong>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                          <td><strong>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                           <td></td>
                         </tr>  
                         @endforeach      

From 33a972f1165ad9fca0b9b7bd9de6678cd3ef8451 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 27 Nov 2022 01:05:00 +0800
Subject: [PATCH 19/23] Testing connection db and api production

---
 .../Controllers/AuthMobile/AuthController.php |  2 +-
 app/Http/Controllers/DatabaseController.php   | 11 ++++++++--
 .../pengurusandatabase/senaraidb.blade.php    | 20 +++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php
index 0ceb7a3f..b64bfd75 100644
--- a/app/Http/Controllers/AuthMobile/AuthController.php
+++ b/app/Http/Controllers/AuthMobile/AuthController.php
@@ -133,7 +133,7 @@ class AuthController extends Controller
     }
 
     public function logoutUser(Request $request){
-        auth()->user()->tokens()->delete();
+        auth()->user()->currentAccessToken()->delete();
 
         return [
             'message' => 'Logged Out'
diff --git a/app/Http/Controllers/DatabaseController.php b/app/Http/Controllers/DatabaseController.php
index ba0cd084..72175e58 100644
--- a/app/Http/Controllers/DatabaseController.php
+++ b/app/Http/Controllers/DatabaseController.php
@@ -7,7 +7,8 @@ use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
 use App\Models\Cawangan;
-
+use App\Models\Gadai;
+use Illuminate\Support\Facades\Http;
 
 class DatabaseController extends Controller
 {
@@ -31,7 +32,13 @@ class DatabaseController extends Controller
         $caw = Cawangan::all();
         // $user =  Auth::user();
         // $user->assignRole('admin');
-        return view('pengurusandatabase.senaraidb',compact('caw'));
+
+        $gadai = Gadai::on('KB2')->orderBy('t_gadai', 'DESC')->first();
+        $roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/KB2' , [
+            'role_harian' => 'penilai',
+        ])->json();
+
+        return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'roles_harian_penilai'));
     }
 
     public function showConn($id)
diff --git a/resources/views/pengurusandatabase/senaraidb.blade.php b/resources/views/pengurusandatabase/senaraidb.blade.php
index bd7eaf41..9cbed5a9 100644
--- a/resources/views/pengurusandatabase/senaraidb.blade.php
+++ b/resources/views/pengurusandatabase/senaraidb.blade.php
@@ -50,6 +50,26 @@
                     
                 </table>
             </form>
+            <table class="table table-bordered" style="width: 35%;">
+              <tbody>
+                <tr class="bg-light">
+                  <td>gadai latest</td>
+                  <td>t_gadai</td>
+                </tr>
+                <tr>
+                  <td>{{$gadai->norujukan}}</td>
+                  <td>{{$gadai->t_gadai}}</td>
+                </tr>
+                <tr class="bg-light">
+                  <td>role_harian</td>
+                  <td>name</td>
+                </tr>
+                <tr>
+                  <td>{{$roles_harian_penilai[0]['role_harian']}}</td>
+                  <td>{{$roles_harian_penilai[0]['name']}}</td>
+                </tr>
+              </tbody>
+            </table>
         </div>
         
     </div>

From 538ce1dd0c9d532b70416c72a8b6020aa7fa726d Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sun, 27 Nov 2022 01:21:30 +0800
Subject: [PATCH 20/23] update scan barcode pembida

---
 app/Http/Controllers/MarhunController.php     |  96 ++++++++++-
 app/Models/LelongBid.php                      |   5 +
 .../views/marhun/scanbarcodejual.blade.php    |  39 ++++-
 .../marhun/senarailelongscanjual.blade.php    |   8 +-
 .../views/pdf/marhundetailspembida.blade.php  | 158 ++++++++++++++++++
 .../views/pembayaran/SAGBidItem.blade.php     |   2 +-
 .../pembayaran/kaunterpembayaran.blade.php    |   4 +-
 .../pembayaran/senarailelongbayaran.blade.php |   2 +-
 .../simulasi/senaraitempsimulasi.blade.php    |  18 +-
 .../simulasi/tempbycawsimulasi.blade.php      |  64 ++++---
 routes/web.php                                |   1 +
 11 files changed, 346 insertions(+), 51 deletions(-)
 create mode 100644 resources/views/pdf/marhundetailspembida.blade.php

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 0d9502d0..0fc0e9ae 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -22,6 +22,7 @@ use App\Models\LelKarat;
 use App\Models\LelKarat_temp;
 use App\Models\Pengesahan;
 use App\Models\GadaiMarhun;
+use App\Models\LelongBidder;
 use App\Models\ScanSemak;
 use App\Models\TangguhLelong;
 use Carbon\Carbon;
@@ -2058,6 +2059,22 @@ class MarhunController extends Controller
 
     public function listScanBarcodejual($lelong_id)
     {
+        // $user = Auth::user();
+        // $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
+
+        // $lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
+        // $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
+        //     ->where('status_payment', '=', '1')
+        //     ->where('caw_id', '=', $caw->id)
+        //     ->get();
+
+        // $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
+        //     ->where('kodcaw', '=', $caw->caw_code)
+        //     ->where('serahkpdpembida', '=', '1')
+        //     ->orderBy('id', 'desc')
+        //     ->get();
+        // dd($senaraiScanKeluar);
+
         $user = Auth::user();
         $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
 
@@ -2065,16 +2082,36 @@ class MarhunController extends Controller
         $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
             ->where('status_payment', '=', '1')
             ->where('caw_id', '=', $caw->id)
+            ->select('id')
+            ->get()
+            ->keyBy('id');
+        foreach ($lelongbid as $index => $value) {
+            $namabidder = LelongBidder::
+            where('lelongbid_id', '=',  $value['id'])
+            // ->where('lelongbid.kodcaw', '=', $user->kodcaw)
+            ->where('lelongbidder.status_bidder','=','1')
+            ->select('lelongbidder.lelongbid_id','lelongbidder.nama_bidder') 
             ->get();
-
+            // dump($namabidder);
+            $lelongbid[$index]['nama_bidder'] = $namabidder;
+        }
+        // dd($namabidder);
         $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
             ->where('kodcaw', '=', $caw->caw_code)
             ->where('serahkpdpembida', '=', '1')
-            ->orderBy('id', 'desc')
+            // ->whereNull('scan_masuk')
             ->get();
-        // dd($senaraiScanKeluar);
 
-        return view('marhun.scanbarcodejual', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
+        $pluckLelongBid = $lelongbid->pluck('id')->toArray();
+        $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
+        $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
+
+        $new_lelong_bid = LelongBid::with('scanSemakSelesaiJual')
+            ->whereIn('id', $diff_lelong_bid)
+            ->get();
+        // dd($new_lelong_bid);
+
+        return view('marhun.scanbarcodejual', compact('namabidder','new_lelong_bid','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
     }
     public function scanKeluarMarhunjual(Request $request)
     {
@@ -2280,6 +2317,57 @@ class MarhunController extends Controller
         return $this->marhunPhotoService->show($request->lelong_id, $marhun);
     }
 
+    public function exportmarhundetailspembida($lelong_id)
+    {
+        $user = Auth::user();
+        //dd($user);
+        $lelongs = LelongBid::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('lelongbid.lelong_id', '=', $lelong_id)
+            ->where('lelongbid.kodcaw', '=', $user->kodcaw)
+            ->where('lelongbidder.status_bidder','=','1')
+            ->where('lelongbid.status_jual', '=', 1)
+            ->where('lelongbid.status_payment', '=', 1)
+            ->select('lelongbid.id','lelongbid.norujukan','lelongbidder.nama_bidder') 
+            ->orderBy('lelongbid.norujukan')
+            ->get();
+            // ->toArray();
+        // dd($lelongs);
+
+        $arraycaw = [];
+
+        $total_berat = 0;
+        $berat = 0;
+
+        $total_harga = 0;
+        $harga = 0;
+
+        $total_nmarhun = 0;
+        $nilai_marhun = 0;
+
+        $total_hargaasas = 0;
+        $hargaasas = 0;
+
+        foreach ($lelongs as $index1 => $lelong) {
+            $marhun = LelongBidMarhun::where('lelongbid_id', '=', $lelong['id'])->get();
+            $total_berat = $total_berat + $marhun->sum('berat');
+
+            $lelongs[$index1]['detailmarhun'] = $marhun;
+        }
+        // dd( $total_berat );
+       
+
+        array_push($arraycaw, [
+            'berat' => $berat,
+            'harga' => $harga,
+            'n_marhun' => $nilai_marhun,
+            'hargaasas' => $hargaasas,
+        ]);
+
+        $pdf = PDF::loadView('pdf.marhundetailspembida', compact('lelongs', 'arraycaw', 'total_nmarhun', 'total_berat', 'total_harga', 'total_hargaasas'))->setPaper('a4', 'potrait');
+
+        return $pdf->download('Senarai Marhun Pembida.pdf');
+    }
+
    
     
 }
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index 6aac38d6..af22f092 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -81,4 +81,9 @@ class LelongBid extends Model
     {
         return $this->hasOne(Payment::class, 'norujukan', 'norujukan')->where('status', 2);
     }
+
+    public function scanSemakSelesaiJual()
+    {
+        return $this->hasMany(ScanSemak::class, 'lelongbid_id', 'id')->whereNotNull('serahkpdpembida');
+    }
 }
diff --git a/resources/views/marhun/scanbarcodejual.blade.php b/resources/views/marhun/scanbarcodejual.blade.php
index fd340cfa..17b66d44 100644
--- a/resources/views/marhun/scanbarcodejual.blade.php
+++ b/resources/views/marhun/scanbarcodejual.blade.php
@@ -3,9 +3,16 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto p-4">
+        <div class="col mx-auto p-4">
             <div class="card">
-                <div class="card-header">Scan Barcode Serahan Marhun Kepada Pembida</div>
+                <div class="card-header header-style">
+                    <a href="{{ route('marhun.senarailelongscanjual') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                     Scan Barcode Keluar Kepada Pembida
+                    </div>
+                </div>
                 <div class="card-body">
                     @if ($message = Session::get('success'))
                     <div class="alert mt-2 alert-success">
@@ -16,7 +23,7 @@
                         <p>{{ $message }}</p>
                     </div>
                     @endif
-                    <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
+                    {{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a> --}}
                     
                     <p>Tarikh Lelong:
                         @php
@@ -37,7 +44,18 @@
                     </ul>
                     <div class="tab-content" id="myTabContent">
                         <div class="tab-pane fade show active" id="senarai" role="tabpanel" aria-labelledby="senarai-tab">
-                            <table class='table table-bordered table-hover' id='table-senarai'>
+                            <div class="row justify-content-center mb-4">
+                                <div class="col-5">
+                                    <form action="{{ route('marhun.scankeluarmarhunjual') }}" method="POST">
+                                        @csrf
+
+                                        <div style="text-align: center;">Scan Barcode Marhun Untuk Serah Kepada Pembida</div>
+                                        <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
+                                        <input type="hidden" name="lelong_id" value="{{$lelong_id}}">
+                                    </form>
+                                </div>
+                            </div>
+                            <table class="table text-center table-bordered" id='table-scan-jual'>
                                 <thead class="bg-primary text-white">
                                     <tr>
                                         <th>Bil</th>
@@ -45,16 +63,23 @@
                                         <th>Marhun</th>
                                         <th>N. Marhun</th>
                                         <th>Berat</th>
+                                        {{-- <th>Nama Pembida</th> --}}
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach($lelongbid as $index)
+                                    @foreach($new_lelong_bid as $index)
                                     <tr>
                                         <td>{{$loop->iteration}}</td>
                                         <td>{{$index->norujukan}}</td>
                                         <td>{{$index->marhun}}</td>
                                         <td>{{ number_format($index->nilaimarhun, 2, '.', ',')}}</td>
                                         <td>{{$index->berat}}</td>
+                                        {{-- <td> 
+                                            @foreach($namabidder as $index=>$nama)
+                                            {{ $namabidder[0]['nama_bidder']}}
+                                            @endforeach
+                                        </td> --}}
+                                        
                                     </tr>
                                     @endforeach
                                 </tbody>
@@ -63,13 +88,13 @@
                         <div class="tab-pane fade" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
                             <div class="row justify-content-center mb-4">
                                 <div class="col-5">
-                                    <form action="{{ route('marhun.scankeluarmarhunjual') }}" method="POST">
+                                    {{-- <form action="{{ route('marhun.scankeluarmarhunjual') }}" method="POST">
                                         @csrf
                                         
                                         <div style="text-align: center;">Scan Barcode Marhun Serahan Kepada Pembida</div>
                                         <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
                                         <input type="hidden" name="lelong_id" value="{{$lelong_id}}">
-                                    </form>
+                                    </form> --}}
                                 </div>
                             </div>
                             <div style="text-align: left;"> <a  href="{{ route('marhun.cetakkeluarscanbarcodejual', $lelong_id) }}" class="btn btn-info">Laporan Serahan Kepada Pembida</a><br></div>
diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php
index 080490b5..b4b29d7c 100644
--- a/resources/views/marhun/senarailelongscanjual.blade.php
+++ b/resources/views/marhun/senarailelongscanjual.blade.php
@@ -8,7 +8,7 @@
             <div class="card">
                 <div class="card-header header-style">
                     <div class="header-style-title">
-                        Senarai Lelongan Scan Kepada Pembida
+                        Senarai Batch Lelongan (Scan Barcode Keluar Marhun Kepada Pembida)
                     </div>
                 </div>
                 <div class="card-body">
@@ -22,7 +22,7 @@
                     </div>
                     @endif
             {{-- <h4> Senarai Lelongan Scan Kepada Pembida</h4> --}}
-            <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
+            <table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
                 <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -49,8 +49,8 @@
                         </td>
                         <td>
                             @if($lel['info']['sts_lelong'] == 3)
-                            <a href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
-                            <a href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a>
+                            <a class="btn m-1 btn-warning" href="{{ route('marhun.exportmarhundetailspembida', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a>
                             @endif
                         </td>
                     </tr>
diff --git a/resources/views/pdf/marhundetailspembida.blade.php b/resources/views/pdf/marhundetailspembida.blade.php
new file mode 100644
index 00000000..703a2a57
--- /dev/null
+++ b/resources/views/pdf/marhundetailspembida.blade.php
@@ -0,0 +1,158 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+#sim {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 1px solid;
+    padding: 1px;
+    text-align: left;
+    
+}
+
+#sim tr:nth-child(even){}
+
+#sim tr:hover {}
+
+#sim th {
+    text-align: left;
+    border: 1px solid;
+	table-layout:auto;
+    color: black;
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+.row {
+  margin-left:-5px;
+  margin-right:-5px;
+}
+  
+.column {
+  float: left;
+  width: 100%;
+  padding: 5px;
+}
+
+/* Clearfix (clear floats) */
+.row::after {
+  content: "";
+  clear: both;
+  display: table;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 200%;
+  /* border: 0px solid #ddd; */
+}
+
+th, td {
+  text-align: left;
+  padding: 16px;
+}
+
+tr:nth-child(even) {
+  /* background-color: #f2f2f2; */
+}
+
+</style>
+
+<body>
+
+                      <table width="100%" border="0" id="sim">
+                        <tr>
+                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
+                        </tr>
+
+                        <tr>
+                          <td colspan="2"><u><b>LAPORAN SENARAI MARHUN PEMBIDA</b></u></td>
+                        </tr>
+                      </table>
+
+                      <br><br>
+                
+                      <table  class="table table-bordered text-center" cellspacing="0" cellpadding="5" style="float:right;" border="1" width="100%" height="80" align="left" id="sim">
+                        <thead>
+                        <tr> 
+                          <th width="2%" align="left">No</th> 
+                              <th width="15%" align="left">No Rujukan </th> 
+                              <th width="10%" align="left">Jenis Marhun</th>
+                              <th width="10%" align="left">Karat</th> 
+                              <th width="10%" align="left">Berat(gm)</th> 
+                              {{-- <th width="12%" align="left">Harga(RM)</th>
+                              <th width="12%" align="left">Nilai Marhun(RM)</th>
+                              <th width="14%" align="left">Harga Asas(RM)</th> --}}
+                              <th width="13%" align="left">Nota</th>
+                              <th width="13%" align="left">Nama Pembeli</th>
+                        </tr>
+                        </thead>
+          
+  
+  		
+                        @foreach ($lelongs as $marhun)
+                        <tr>
+                            <td>{{ $loop->iteration }} </td>
+                            <td>{{ $marhun['norujukan'] }}</td>
+                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['marhun'] }}<br>
+                            @endforeach</td>
+                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['karat'] }}<br>
+                            @endforeach</td>
+                            <td align = 'text-right'>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['berat'] }}<br>
+                            @endforeach</td>  
+                            {{-- <td>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['harga'] }}<br>
+                            @endforeach</td>   
+                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['n_marhun'] }}<br>
+                            @endforeach</td>           
+                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['hargaasas'] }}<br>
+                            @endforeach</td>         --}}
+                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                              {{ $item['nota'] }}<br>
+                            @endforeach</td>   
+                          <td style='white-space:nowrap;'>{{$marhun['nama_bidder']}}</td>
+
+
+
+                        </tr>
+
+                        {{-- <tr>
+                          <td colspan="4" align="left"></td>
+                          <td>{{dd($marhun['detailmarhun'][berat])}}{{ number_format($marhun['detailmarhun']['berat'], 2, '.', ',') }}</td>
+                          <td></td>
+                          <td></td>
+
+
+                        </tr>   --}}
+                        @endforeach      
+                        @foreach ($arraycaw as $index=>$caw)
+
+                        <tr>
+                          <td colspan="4" align="left"><strong>Jumlah Keseluruhan</strong></td>
+                          <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
+                          {{-- <td><strong>{{ number_format($total_harga, 2, '.', ',') }}</strong></td>
+                          <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
+                          <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td> --}}
+                          <td></td>
+                          <td></td>
+                        </tr>                                         
+      @endforeach
+                      </table> 
+              
+                                
+                    
+</tbody>
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index d5e4573b..109814c3 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -143,7 +143,7 @@
                 </div>
             @elseif($statuspayment->opencash == '1' && $statuspayment->status_payment == '1')
                 <div class="text-right">
-                    <button type="button" class="btn btn-primary" style="width:15%" >Telah Selesai Bayaran</button>
+                    <button type="button" class="btn btn-success" style="width:15%" >Telah Selesai Bayaran</button>
                 </div>
             @endif
             {{-- <div>
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index 17c3c9c7..7ba0b413 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -61,11 +61,11 @@
                                 @endif
                             </td>
                             <td align="center">
-                                <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
+                                <a class="btn m-1 btn-warning"  href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
                             </td>
 
                             <td align="center">
-                                <a href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
+                                <a class="btn m-1 btn-success" href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
                             </td>
 
                             {{-- <td>
diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php
index 86ce86c7..04434405 100644
--- a/resources/views/pembayaran/senarailelongbayaran.blade.php
+++ b/resources/views/pembayaran/senarailelongbayaran.blade.php
@@ -55,7 +55,7 @@
                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                         @endif
                     </td>
-                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
+                    <td><a class="btn m-1 btn-primary" href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
                 </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php
index 68a56478..b53166ea 100644
--- a/resources/views/simulasi/senaraitempsimulasi.blade.php
+++ b/resources/views/simulasi/senaraitempsimulasi.blade.php
@@ -3,7 +3,14 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-12 mx-auto card">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                   <div class="header-style-title">
+                        Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}
+                    </div>
+                </div>
+                <div class="card-body">
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger" style="margin-top:1%;">
                     <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
                 <div class="alert alert-info">{{ Session::get('message') }}</div>
             @endif --}}
 
-            <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}</h3>
+            {{-- <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}</h3> --}}
             <!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
             <form action="{{route('analisa.janadata2')}}" method="POST" enctype="multipart/form-data">
             <!-- <form action="{{route('analisa.importgadaifrommaster')}}" method="POST" enctype="multipart/form-data"> -->
@@ -56,7 +63,7 @@
                     </div>
                 </div>
              </div>
-             <table class="table table-striped  table-xl text-center" id="senaraitemp" style="width:100%">
+             <table class="table text-right table-bordered" id="senaraitemp" style="width:100%">
                 <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" class="check_all"></th>
@@ -72,13 +79,14 @@
                         </tr>
                 </thead>
                 <tbody>
+                    @php $count = 1; @endphp
                     @foreach($senarai as $send)
                         @if($send['bil_lelong'] > 0)
                                 
                         <tr>
                             <td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}" class="custom_name"></td>
-                            <td>{{ $loop->iteration }}</td>
-			    <td>{{ $send['kodcaw'] }}</td>
+                            <td>{{ $count++ }}</td>
+			                <td>{{ $send['kodcaw'] }}</td>
                             <td >{{ $send['caw_name'] }}</td>
                             <td>{{ $send['bil_lelong'] }} </td>
                             <td>{{ number_format($send['total_berat'], 2) }} </td>
diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php
index 22dd9b58..30e779a4 100644
--- a/resources/views/simulasi/tempbycawsimulasi.blade.php
+++ b/resources/views/simulasi/tempbycawsimulasi.blade.php
@@ -3,10 +3,20 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-12 mx-auto card">
-            </div>
-            <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-            <h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3>
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        Butiran Gadaian Cawangan {{ $details }}
+                    </div>
+                </div>
+                <div class="card-body">
+            {{-- <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+           
+            <h3 class="pt-3" style="margin-bottom:2%; margin-top:1%;">Butiran Gadaian Cawangan {{ $details }}</h3> --}}
             
             @if ($message = Session::get('failed'))
                 <div class="alert alert-danger">
@@ -16,7 +26,7 @@
             <form action="{{route('analisa.senaraitempsimulasi')}}" id="formtlelong" method="POST">
                    
                     @csrf
-                <table class="table table-striped  table-xl text-center" id="detailsgadai" style="width:100%; margin-top:1%;">
+                <table class="table text-right table-bordered" id="detailsgadai" style="width:100%; margin-top:1%;">
                     <thead class="bg-primary text-white">
                             <tr>
                                 <th>Bil</th>
@@ -24,12 +34,12 @@
                                 <th>No Kad Pengenalan</th>
                                 <th>Tempoh</th>
                                 <th>Berat (gm)</th>
+                                <th>Nilai Marhun Asal(RM)</th>
                                 <th>Pembiayaan (RM)</th>
                                 <th>Baki Pembiayaan (RM)</th>
-                                <th>Keuntungan 6 Bulan (RM)</th>
                                 <th>Keuntungan Telah Bayar (RM)</th>
+                                <th>Keuntungan 6 Bulan (RM)</th>
                                 <th>Keuntungan Semasa (RM)</th>
-                                <th>Nilai Marhun (RM)</th>
                                 <th>Tamat Kontrak</th>
                                 
                             </tr>
@@ -38,17 +48,17 @@
                         @foreach($getsurat as $surat)
                             <tr>
                                 <td>{{ $loop->iteration }}</td>
-                                <td>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
+                                <td style='white-space:nowrap;'>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
                                 <td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
                                 <td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
+                                <td>{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['list_norujukan'][0]['berat'] , 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['list_norujukan'][0]['pinjaman'] , 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['list_norujukan'][0]['bakipjm'] , 2, '.', ',') }}</td>
-                                <td>{{ number_format($surat['list_norujukan'][0]['bakiupah'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
+                                <td>{{ number_format($surat['list_norujukan'][0]['bakiupah'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['keuntungan'] , 2, '.', ',') }}</td>
-                                <td>{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }}</td>
-                                <td>{{ $surat['list_norujukan'][0]['t_matang1'] }}</td>
+                                <td style='white-space:nowrap;'>{{ $surat['list_norujukan'][0]['t_matang1'] }}</td>
                             </tr>
                         @endforeach
                     </tbody>
@@ -97,22 +107,22 @@
                 //         })
                 //     }
                 // },
-                {
-                    className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-                    titleAttr: 'Senarai Gadaian Excel',
-                    text: '<i class="fas fa-download"></i>',
-                    action: function ( e, dt, node, config ) {
-                        $("#exportform").submit();
-                    }
-                },
-                {
-                    className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-                    titleAttr: 'Senarai Gadaian PDF',
-                    text: '<i class="fas fa-download"></i>',
-                    action: function ( e, dt, node, config ) {
-                        $("#exportform").submit();
-                    }
-                }
+                // {
+                //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                //     titleAttr: 'Senarai Gadaian Excel',
+                //     text: '<i class="fas fa-download"></i>',
+                //     action: function ( e, dt, node, config ) {
+                //         $("#exportform").submit();
+                //     }
+                // },
+                // {
+                //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+                //     titleAttr: 'Senarai Gadaian PDF',
+                //     text: '<i class="fas fa-download"></i>',
+                //     action: function ( e, dt, node, config ) {
+                //         $("#exportform").submit();
+                //     }
+                // }
             ]
     });
 
diff --git a/routes/web.php b/routes/web.php
index f47d8ed9..344f5a6e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -273,6 +273,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
     Route::get('/semak/{id}/{lelong_id}',['as'=>'marhun.semak','uses'=>'MarhunController@semak']);
     Route::post('/tambahmarhun',['as'=>'marhun.tambahmarhun','uses'=>'MarhunController@tambahmarhun']);
     Route::get('/exportmarhundetails/{lelong_id}',['as'=>'marhun.exportmarhundetails','uses'=>'MarhunController@exportmarhundetails']);
+    Route::get('/exportmarhundetailspembida/{lelong_id}',['as'=>'marhun.exportmarhundetailspembida','uses'=>'MarhunController@exportmarhundetailspembida']);
 
     //action khazanah untuk serahan marhun kepada pembida menang
     Route::get('/senarailelongscanjual',['as'=>'marhun.senarailelongscanjual','uses'=>'MarhunController@senarailelongscanjual']); 

From 421908073de1c1a4bb923253ebd7f92049c2cb67 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Sun, 27 Nov 2022 01:25:03 +0800
Subject: [PATCH 21/23] update word keuntungan pada tempsimulasi

---
 resources/views/simulasi/tempbycawsimulasi.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php
index 30e779a4..59bf443f 100644
--- a/resources/views/simulasi/tempbycawsimulasi.blade.php
+++ b/resources/views/simulasi/tempbycawsimulasi.blade.php
@@ -37,7 +37,7 @@
                                 <th>Nilai Marhun Asal(RM)</th>
                                 <th>Pembiayaan (RM)</th>
                                 <th>Baki Pembiayaan (RM)</th>
-                                <th>Keuntungan Telah Bayar (RM)</th>
+                                <th>Jumlah Bayaran(RM)</th>
                                 <th>Keuntungan 6 Bulan (RM)</th>
                                 <th>Keuntungan Semasa (RM)</th>
                                 <th>Tamat Kontrak</th>

From 5da8e05b0b734b3117dff0f72409edffb535af4e Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 27 Nov 2022 02:31:09 +0800
Subject: [PATCH 22/23] Add testing connection in admin page

---
 app/Http/Controllers/DatabaseController.php   | 15 +++++-
 .../pengurusandatabase/senaraidb.blade.php    | 47 +++++++++++++++++--
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/DatabaseController.php b/app/Http/Controllers/DatabaseController.php
index 72175e58..22551c58 100644
--- a/app/Http/Controllers/DatabaseController.php
+++ b/app/Http/Controllers/DatabaseController.php
@@ -8,6 +8,7 @@ use Spatie\Permission\Models\Permission;
 use Illuminate\Support\Facades\Auth;
 use App\Models\Cawangan;
 use App\Models\Gadai;
+use App\Models\TransaksiKeuntungan;
 use Illuminate\Support\Facades\Http;
 
 class DatabaseController extends Controller
@@ -33,12 +34,22 @@ class DatabaseController extends Controller
         // $user =  Auth::user();
         // $user->assignRole('admin');
 
+        //db cawangan - success
+        //db online_arrahn - success
+        //api_kaunter - success
+        //api_arrahn
+
         $gadai = Gadai::on('KB2')->orderBy('t_gadai', 'DESC')->first();
-        $roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/KB2' , [
+        $transaksi_keuntungan = TransaksiKeuntungan::on('main')->orderBy('id', 'DESC')->first();
+        $roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/KB2', [
             'role_harian' => 'penilai',
         ])->json();
+        // $customer_details = Http::withOptions(['verify' => config('app.api_verify')])
+        // ->get('https://api.arrahn.com.my/api/customers/960403065465')->json();
 
-        return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'roles_harian_penilai'));
+        // dd($gadai, $transaksi_keuntungan, $roles_harian_penilai, $customer_details);
+
+        return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'transaksi_keuntungan', 'roles_harian_penilai'));
     }
 
     public function showConn($id)
diff --git a/resources/views/pengurusandatabase/senaraidb.blade.php b/resources/views/pengurusandatabase/senaraidb.blade.php
index 9cbed5a9..d7c03bfc 100644
--- a/resources/views/pengurusandatabase/senaraidb.blade.php
+++ b/resources/views/pengurusandatabase/senaraidb.blade.php
@@ -50,26 +50,65 @@
                     
                 </table>
             </form>
+            <div>db cawangan</div>
             <table class="table table-bordered" style="width: 35%;">
               <tbody>
                 <tr class="bg-light">
-                  <td>gadai latest</td>
+                  <td>gadai latest KB2</td>
                   <td>t_gadai</td>
                 </tr>
                 <tr>
                   <td>{{$gadai->norujukan}}</td>
                   <td>{{$gadai->t_gadai}}</td>
                 </tr>
-                <tr class="bg-light">
-                  <td>role_harian</td>
+                
+              </tbody>
+            </table>
+            <div>db online_arrahn</div>
+            <table class="table table-bordered" style="width: 35%;">
+              <tbody>
+              <tr class="bg-light">
+                  <td>bayar latest</td>
+                  <td>tarikh_bayaran</td>
+                </tr>
+                <tr>
+                  <td>{{$transaksi_keuntungan->norujukan}}</td>
+                  <td>{{$transaksi_keuntungan->tarikh_bayaran}}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div>api_kaunter</div>
+            <table class="table table-bordered" style="width: 35%;">
+              <tbody>
+              <tr class="bg-light">
+                  <td>role_harian KB2</td>
                   <td>name</td>
                 </tr>
+                @if(!empty($roles_harian_penilai))
+                <tr>
+                  <td>{{$roles_harian_penilai[0]['role_harian']}}</td>
+                  <td>{{$roles_harian_penilai[0]['name']}}</td>
+                </tr>
+                @else
+                <tr>
+                  <td colspan="2">pc belum set role harian</td>
+                </tr>
+                @endif
+              </tbody>
+            </table>
+            {{--<div>api_arrahn</div>
+            <table class="table table-bordered" style="width: 35%;">
+              <tbody>
+              <tr class="bg-light">
+                  <td>customer details(name)</td>
+                  <td>(ic)</td>
+                </tr>
                 <tr>
                   <td>{{$roles_harian_penilai[0]['role_harian']}}</td>
                   <td>{{$roles_harian_penilai[0]['name']}}</td>
                 </tr>
               </tbody>
-            </table>
+            </table>--}}
         </div>
         
     </div>

From 9b567fd0138d4c4dacefbc53712c390166e7a448 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 27 Nov 2022 03:10:05 +0800
Subject: [PATCH 23/23] Fix update taglel when jana simulasi

---
 app/Http/Controllers/SimulasiController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 99dfa779..8fd629f8 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -402,7 +402,7 @@ class SimulasiController extends Controller
                 foreach($simulasi_bid_arr as $index) {
                     $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
                                     ->post(config('app.api_url').'taglel/update',[
-                                        'kodcaw'=>$index['caw_id'],
+                                        'kodcaw'=>$index['kodcaw'],
                                         'norujukan'=>$index['norujukan']
                                         ])
                                     ->json();