From afa1f4eb4883aeed3fd25b765a876fb6e7b615f9 Mon Sep 17 00:00:00 2001
From: BTMS1 <btms1@BTMS1s-Mac-mini.local>
Date: Tue, 28 Nov 2023 09:21:54 +0800
Subject: [PATCH] tambah function lelongan ujrah

---
 app/Http/Controllers/LelongController.php     |   2 +-
 .../Controllers/LelongUjrahController.php     | 192 ++++
 app/Http/Controllers/SimulasiController.php   |   5 +-
 .../Controllers/SimulasiUjrahController.php   | 913 ++++++++++++++++++
 app/Models/LelongBid.php                      |   3 +-
 app/Models/Simulasi.php                       |   1 +
 ...23_115819_add_ujrah_to_simulasis_table.php |  49 +
 ...11_27_130441_add_ujrah_to_lelong_table.php |  48 +
 database/seeders/RolesSeeder.php              |   6 +
 resources/views/includes/sidebar.blade.php    |  21 +
 .../views/lelong/listsagbycust.blade.php      |   6 +-
 .../views/lelong/senarailelong.blade.php      |   6 +-
 .../views/lelong/senaraimarhun.blade.php      |   9 +
 resources/views/lelong/showlelong.blade.php   |  12 +
 .../simulasiujrah/janasimulasi.blade.php      | 124 +++
 .../simulasiujrah/listsagbycust.blade.php     | 219 +++++
 .../simulasiujrah/senaraimarhunlel.blade.php  | 210 ++++
 .../simulasiujrah/senaraisimulasi.blade.php   | 168 ++++
 .../senaraitempsimulasi.blade.php             | 202 ++++
 .../simulasiujrah/showsimulasi.blade.php      | 510 ++++++++++
 routes/web.php                                |  21 +
 21 files changed, 2722 insertions(+), 5 deletions(-)
 create mode 100644 app/Http/Controllers/LelongUjrahController.php
 create mode 100644 app/Http/Controllers/SimulasiUjrahController.php
 create mode 100644 database/migrations/2023_11_23_115819_add_ujrah_to_simulasis_table.php
 create mode 100644 database/migrations/2023_11_27_130441_add_ujrah_to_lelong_table.php
 create mode 100644 resources/views/simulasiujrah/janasimulasi.blade.php
 create mode 100644 resources/views/simulasiujrah/listsagbycust.blade.php
 create mode 100644 resources/views/simulasiujrah/senaraimarhunlel.blade.php
 create mode 100644 resources/views/simulasiujrah/senaraisimulasi.blade.php
 create mode 100644 resources/views/simulasiujrah/senaraitempsimulasi.blade.php
 create mode 100644 resources/views/simulasiujrah/showsimulasi.blade.php

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 95864f19..9ca267b1 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3811,7 +3811,7 @@ class LelongController extends Controller
 
 
        
-        return view('lelong.listsagbycust',compact('customers','cawanganDetail','lelongid','cawid'));
+        return view('lelong.listsagbycust',compact('lelonglel','customers','cawanganDetail','lelongid','cawid'));
 
         // return view('lelong.listsagbycust',compact('lelonglel','cawanganDetail','marhuns','lelongid','cawid','listsag','ktlhbyr','arrayinfo'));
     }
diff --git a/app/Http/Controllers/LelongUjrahController.php b/app/Http/Controllers/LelongUjrahController.php
new file mode 100644
index 00000000..23ce0c31
--- /dev/null
+++ b/app/Http/Controllers/LelongUjrahController.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use App\Models\Simulasi;
+use App\Models\CawanganSimulasi;
+use App\Models\SimKarat;
+use App\Models\Lelong;
+use App\Models\LelKarat;
+use App\Models\CawanganLelong;
+use App\Models\SimulasiBid;
+use App\Models\LelongBid;
+use App\Models\SimulasiBidMarhun;
+use App\Models\LelongBidMarhun;
+use App\Models\LogUser;
+use DateTime;
+
+class LelongUjrahController extends Controller
+{
+   /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+    public function index()
+    {
+    
+    }
+    public function create($id)
+    {
+        $user = Auth::user();
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+        $simulasi = Simulasi::where('id','=',$id)->first();
+        $cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get();
+        $simkarat = SimKarat::where('simulasi_id','=',$id)->get();
+
+
+        $lelong = new Lelong();
+        $lelong->tarikh_lelong = $simulasi->tarikh_lelong;
+        $lelong->harga_emas_asas = $simulasi->harga_emas_asas;
+        $lelong->jbg = $simulasi->jbg;
+        $lelong->cajlelong = $simulasi->cajlelong;
+        $lelong->fasa = $simulasi->fasa;
+        $lelong->kali = $simulasi->kali;
+        $lelong->ujrah = 1;
+        $lelong->save();
+
+
+        foreach($simkarat as $simulasikarat)
+        {
+            $lelkarat = new LelKarat;
+            $lelkarat->lelong_id = $lelong->id;
+            $lelkarat->karat = $simulasikarat->karat;
+            $lelkarat->keterangan = $simulasikarat->keterangan;
+            $lelkarat->harga = $simulasikarat->harga;
+            $lelkarat->harga2 = $simulasikarat->harga2;
+            $lelkarat->save();
+        }
+
+        foreach($cawangansim as $caw)
+        {
+            $cawanganlel = CawanganLelong::where('caw_id','=',$caw->caw_id)->orderBy('id','desc')->first();
+            if($cawanganlel)
+            {
+                $batchno = $cawanganlel->batchlel+1;
+            }
+            else
+            {
+                $batchno = 1;
+            }
+            $caw_lelong = new CawanganLelong;
+            $caw_lelong->batchlel = $batchno;
+            $caw_lelong->lelong_id = $lelong->id;
+            $caw_lelong->caw_id = $caw->caw_id;
+            $caw_lelong->online = $caw->online;
+            $caw_lelong->lokasi = $caw->lokasi;
+            $caw_lelong->fasa = $caw->fasa;
+            $caw_lelong->kali = $caw->kali;
+            $caw_lelong->ujrah = 1;
+            $caw_lelong->save();
+
+            $datasimbid = SimulasiBid::where('caw_id','=',$caw->caw_id)->where('simulasi_id',$id)->get();
+            $suratcaw = $datasimbid->all();
+                foreach(array_chunk($suratcaw,100) as $data_chunk)
+                {
+                    //dd($data);
+                    foreach($data_chunk as $data)
+                   {
+                            //dd($simulasi->id);
+                            $lelongbid = LelongBid::create([
+                                "lelong_id" => $lelong->id,
+                                "caw_id" => $data->caw_id,
+                                "kodcaw" => $data->kodcaw,
+                                "norujukan" => $data->norujukan,
+                                "t_lelong" => $data->t_lelong,
+                                "hargaasas" => $data->hargaasas,
+                                "hargajual" => 0.00,
+                                "jbg" => $data->jbg,
+                                "kadarupah" => $data->kadarupah,
+                                "ansuran" => $data->ansuran,
+                                "nilaimarhun" => $data->nilaimarhun,
+                                "pinjaman" => $data->pinjaman,
+                                "bakiupah" => $data->bakiupah,
+                                "upahsimpan" => $data->bakiupah,
+                                "cajlain" =>  $data->cajlain,
+                                "cajlelong" => 0.00,
+                                "baki" => 0.00,
+                                "berat" => $data->berat,
+                                "marhun" => $data->marhun,
+                                "percent" => $data->percent,
+                                "status_jual" => 0,
+                                "status_payment" => 0,
+                                "mora_upah" => 0,
+                                "fasa" => $data->fasa,
+                                "ujrah" => 1
+                            ]);
+
+
+                        $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get();
+                        foreach($simulasibidmarhun as $simbidmarhun)
+                        {
+                            $lelongbidmarhun = new LelongBidMarhun;
+                            $lelongbidmarhun->lelongbid_id = $lelongbid->id;
+                            $lelongbidmarhun->bil = $simbidmarhun->bil;
+                            $lelongbidmarhun->marhun = $simbidmarhun->marhun;
+                            $lelongbidmarhun->nota = $simbidmarhun->nota;
+                            $lelongbidmarhun->old_marhun = $simbidmarhun->marhun;
+                            $lelongbidmarhun->old_karat = $simbidmarhun->karat;
+                            $lelongbidmarhun->old_berat = $simbidmarhun->berat;
+                            $lelongbidmarhun->old_harga = $simbidmarhun->harga;
+                            $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
+                            $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
+                            $lelongbidmarhun->karat = $simbidmarhun->karat;
+                            $lelongbidmarhun->berat = $simbidmarhun->berat;
+                            $lelongbidmarhun->harga = $simbidmarhun->harga;
+                            $lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun;
+                            $lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas;
+                            $lelongbidmarhun->save();
+
+                        }
+
+                        if($lelongbidmarhun->save())
+                        {
+                            // $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
+                            // $updategadai->taglel = 1;
+                            // $updategadai->save();
+
+                            $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first();
+                            $hapussimulasi->delete();
+
+                            //insert loguser
+                            $loguser = new LogUser;
+                            $loguser->user_id = $user->id;
+                            $loguser->date = $currentdate;
+                            $loguser->username = $user->username;
+                            $loguser->nama_user = $user->name;
+                            $loguser->norujukan = $data->norujukan;
+                            $loguser->nota = 'Daftar Batch Lelong Ujrah'.$lelong->id;
+                            $loguser->save();
+                        }
+
+
+                    }
+                }
+
+
+        }
+        $simulasi =  Simulasi::where('id','=',$id)->where('ujrah', 1)->first();
+        // dd($role);
+        $simulasi->delete();
+
+        return redirect()->route('lelong.senarailelong')
+        ->with('success','Pendaftaran Lelong Berjaya');
+
+    }
+
+    
+}
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 889ca2d3..09c715bb 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -257,6 +257,7 @@ class SimulasiController extends Controller
                         ->where('tagpalsu','=',0)
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
+                        ->where('tagbaru','=',0)
                         ->where('lelong_tawarruq','=',1);
                         // ->count('norujukan');
 
@@ -267,6 +268,7 @@ class SimulasiController extends Controller
                         ->where('sttebus','=','')
                         ->where('tagpalsu','=',0)
                         ->where('tagpalsu2','=',0)
+                        ->where('tagbaru','=',0)
                         ->where('taglel','=',0);
                         // ->count('norujukan');
                 }
@@ -290,6 +292,7 @@ class SimulasiController extends Controller
                 'fasa' => $fasa,
                 'kali' => $kali,
                 'success_import' => 1,
+                'ujrah' => 0
             ]);
 
             //create harga asas berdasarkan input harga asas
@@ -704,7 +707,7 @@ class SimulasiController extends Controller
 
     public function senaraisimulasi()
     {
-        $simulasiAll = Simulasi::with('cawangan')->orderBy('id', 'desc')->get();
+        $simulasiAll = Simulasi::with('cawangan')->where('ujrah', 0)->orderBy('id', 'desc')->get();
 
         return view('simulasi.senaraisimulasi',compact('simulasiAll'));
     }
diff --git a/app/Http/Controllers/SimulasiUjrahController.php b/app/Http/Controllers/SimulasiUjrahController.php
new file mode 100644
index 00000000..dc4c4f8a
--- /dev/null
+++ b/app/Http/Controllers/SimulasiUjrahController.php
@@ -0,0 +1,913 @@
+<?php
+
+namespace App\Http\Controllers;
+use Carbon\Carbon;
+use App\Models\Cawangan;
+use App\Models\Tetapan;
+use App\Models\Gadai;
+use App\Models\Simulasi;
+use App\Models\JenisKarat;
+use App\Models\SimKarat;
+use App\Models\CawanganSimulasi;
+use App\Models\SimulasiBid;
+use App\Models\GadaiMarhun;
+use App\Models\SimulasiBidMarhun;
+use Illuminate\Support\Facades\Http;
+use App\Models\CawanganLelong;
+use Illuminate\Support\Facades\Auth;
+use App\Models\LelongTebus;
+use App\Models\LogUser;
+use App\Models\TransaksiKeuntungan;
+use App\Models\Customer;
+
+use Illuminate\Http\Request;
+
+class SimulasiUjrahController extends Controller
+{
+     /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Contracts\Support\Renderable
+     */
+
+    public function index()
+    {
+        $currentDate = Carbon::now();
+        $currentDate = $currentDate->toDateString();
+        $caw = Cawangan::all();
+        $tetapan = Tetapan::where('id','=',1)->first();
+        return view('simulasiujrah.janasimulasi',compact('caw','tetapan', 'currentDate'));
+    }
+
+
+    public function senaraitempsimulasi(Request $request)
+    {
+        $t_lelong1 = date('d-m-Y', strtotime($request->tarikh_lelong));
+        $t_lelong2 = $request->tarikh_lelong;
+        $t_lelong = Carbon::parse($request->tarikh_lelong);
+        $bulan = (int)round($request->jbg);
+        $fasa = $request->fasa;
+        $jbg = $request->jbg;
+        $cajlelong = $request->cajlelong;
+        $kali = $request->kali;
+        $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
+        $t_lelongdisplay = $t_lelong->format('d-m-Y');
+        $tetapan = Tetapan::where('id','=',1)->first();
+        if($t_lelong != null)
+        {
+           
+            if($request->fasa == '1'){
+                $cawangan_all = Cawangan::orderBy('caw_name')->get();
+                // dd($cawangan_all);
+                $senarai = [];
+                $total_bil_lelong = 0;
+                foreach($cawangan_all as $cawangan){
+                    $getsurat = Gadai::on($cawangan->caw_code)
+                        ->where('t_gadai','<=',$jbgadai)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('lelong_tawarruq','=',1)
+                        ->where('tagbaru','=',1)
+                        ->whereNotNull('upah12');
+
+                    $cawangan_simulasi = CawanganLelong::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count();
+                    if($cawangan_simulasi == 0){
+                        $bil_lelong = $getsurat->count('norujukan');
+                        $total_bil_lelong += $bil_lelong;
+                        $total_berat = $getsurat->sum('berat');
+                        $total_nilaimarhun = $getsurat->sum('nilaimarhun');
+                        $total_pembiayaan = $getsurat->sum('pinjaman');
+                        $total_bakipjm = $getsurat->sum('bakipjm');
+                        $data = [
+                            'bil_lelong'=>$bil_lelong,
+                            'total_berat'=>$total_berat,
+                            'total_nilaimarhun'=>$total_nilaimarhun,
+                            'total_pembiayaan'=>$total_pembiayaan,
+                            'total_bakipjm'=>$total_bakipjm,
+                            'kodcaw'=>$cawangan->caw_code,
+                            'caw_name'=>$cawangan->caw_name];
+                        array_push($senarai,$data);
+                    }
+                }
+            }
+
+            else if($request->fasa == '2'){
+                $cawangan_all = Cawangan::all();
+                $senarai = [];
+                $total_bil_lelong = 0;
+                //dd($jbgadai);
+                foreach($cawangan_all as $cawangan){
+                    $getsurat = Gadai::on($cawangan->caw_code)->where('t_gadai','<=',$jbgadai)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('tagbaru','=',1)
+                        // ->where('lelong_tawarruq','=',1)
+                        ->whereNotNull('upah12');
+
+                    $cawangan_simulasi = CawanganLelong::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count();
+                    if($cawangan_simulasi == 0){
+                        $bil_lelong = $getsurat->count('norujukan');
+                        $total_bil_lelong += $bil_lelong;
+                        $total_berat = $getsurat->sum('berat');
+                        $total_nilaimarhun = $getsurat->sum('nilaimarhun');
+                        $total_pembiayaan = $getsurat->sum('pinjaman');
+                        $total_bakipjm = $getsurat->sum('bakipjm');
+                        $data = [
+                            'bil_lelong'=>$bil_lelong,
+                            'total_berat'=>$total_berat,
+                            'total_nilaimarhun'=>$total_nilaimarhun,
+                            'total_pembiayaan'=>$total_pembiayaan,
+                            'total_bakipjm'=>$total_bakipjm,
+                            'kodcaw'=>$cawangan->caw_code,
+                            'caw_name'=>$cawangan->caw_name];
+                        array_push($senarai,$data);
+                    }
+                }
+            }
+            // dd($total_bil_lelong);
+
+            if($total_bil_lelong == 0)
+            {
+            return redirect()->route('analisaujrah.janasimulasi')
+                    ->with('failed','Tiada surat untuk di lelong');
+            }
+
+
+           
+            return view('simulasiujrah.senaraitempsimulasi', compact( 't_lelong',
+                                                        'getsurat',
+                                                        'senarai',
+                                                        't_lelong1',
+                                                        't_lelong2',
+                                                        't_lelongdisplay',
+                                                        'jbgadai',
+                                                        'fasa',
+                                                        'jbg',
+                                                        'cajlelong',
+                                                        'tetapan'
+
+
+                                                    ));
+        }
+        else
+        {
+            return redirect()->route('analisaujrah.janasimulasi')
+                            ->with('failed','Sila Masukkan Tarikh Lelongan');
+        }
+    }
+
+    public function janadata2(Request $request)
+    {
+        $t_lelong = Carbon::parse($request->tarikh_lelong);
+        $bulan = (int)round($request->jbg);
+        $fasa = $request->fasa;
+        $jbg = $request->jbg;
+        $kali = $request->kali;
+        $hargaasas = $request->hargaasas;  //rial
+        $selected_caw = $request->caw;
+        if(!empty($selected_caw))
+        {
+            $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
+            $caws = Cawangan::whereIn('caw_code',$selected_caw)->get();
+            // dd($caws);
+            $bil_surat = 0;
+            $sag_cawangans = [];
+            foreach($caws as $caw){
+                if($fasa == '1'){
+                    $surat = Gadai::on($caw->caw_code)
+                        ->where('t_gadai','<=',$jbgadai)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('tagbaru','=',1)
+                        ->where('lelong_tawarruq','=',1);
+                        
+                        // ->count('norujukan');
+
+                }
+                else if($fasa == '2'){
+                    $surat = Gadai::on($caw->caw_code)
+                        ->where('t_gadai','<=',$jbgadai)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('tagbaru','=',1)
+                        ->where('taglel','=',0);
+                        // ->count('norujukan');
+                }
+                $bil_sag_cawangan = $surat->count('norujukan');
+                array_push($sag_cawangans,['cawangan'=>$caw,'data'=>$surat->get()]);
+                $bil_surat += $bil_sag_cawangan;
+            }
+
+            if($bil_surat == 0)
+            {
+                return redirect()->route('analisaujrah.janasimulasi')
+                            ->with('failed','Tiada surat untuk di lelong');
+            }
+
+            //create simulasi
+            $simulasi = Simulasi::create([
+                'tarikh_lelong' => $request->tarikh_lelong,
+                'harga_emas_asas' => $hargaasas,
+                'jbg' => $jbg,
+                'cajlelong' => $request->cajlelong,
+                'fasa' => $fasa,
+                'kali' => $kali,
+                'success_import' => 1,
+                'ujrah' => 1
+            ]);
+
+            //create harga asas berdasarkan input harga asas
+            $karat = JenisKarat::all();
+            $karat_data = [];
+            foreach($karat as $item)
+            {
+                $data_karat = [
+                    'simulasi_id' => $simulasi->id,
+                    'karat' => $item->karat,
+                    'keterangan' => $item->keterangan,
+                    'harga' => ($hargaasas + ($item->dariharga916)),
+                    'harga2' => $hargaasas + ($item->dariharga916)
+                ];
+
+                array_push($karat_data,$data_karat);
+            }
+
+            $simkarat = SimKarat::insert($karat_data);
+
+            $simkarattemp = SimKarat::where('simulasi_id','=',$simulasi->id)->get()->keyBy('karat');
+
+            foreach($sag_cawangans as $index=>$cawsimulasi){
+
+                $caw_simulasi = new CawanganSimulasi;
+                $caw_simulasi->simulasi_id = $simulasi->id;
+                $caw_simulasi->caw_id = $cawsimulasi['cawangan']->id;
+                $caw_simulasi->online = 'Online';
+                $caw_simulasi->lokasi = $cawsimulasi['cawangan']->lokasi;
+                $caw_simulasi->fasa = $request->fasa;
+                $caw_simulasi->kali = $request->kali;
+                $caw_simulasi->ujrah = 1;
+                $caw_simulasi->save();
+
+                $suratcaw = $cawsimulasi['data'];
+
+                $simulasi_bid_arr = [];
+                $now = Carbon::now();
+                foreach($suratcaw as $surat)
+                {
+                    $simulasi_to_be_inserted = new SimulasiBid();
+                    $simulasi_to_be_inserted->simulasi_id = $simulasi->id;
+                    $simulasi_to_be_inserted->caw_id = $cawsimulasi['cawangan']->id;
+                    $simulasi_to_be_inserted->kodcaw = $surat->kodcaw;
+                    $simulasi_to_be_inserted->norujukan = $surat->norujukan;
+                    $simulasi_to_be_inserted->t_lelong = $request->tarikh_lelong;
+                    $simulasi_to_be_inserted->hargaasas = 0.00;
+                    $simulasi_to_be_inserted->hargajual = 0.00;
+                    $simulasi_to_be_inserted->jbg = $surat->tempoh;
+                    $simulasi_to_be_inserted->kadarupah = $surat->kadarupah;
+                    $simulasi_to_be_inserted->nilaimarhun = $surat->nilaimarhun;
+                    $simulasi_to_be_inserted->pinjaman = $surat->bakipjm;
+                    $simulasi_to_be_inserted->bakiupah = $surat->bakiupah;
+                    $simulasi_to_be_inserted->cajlain =  $surat->cajlain;
+                    $simulasi_to_be_inserted->cajlelong = 0.00;
+                    $simulasi_to_be_inserted->baki = 0.00;
+                    $simulasi_to_be_inserted->berat = $surat->berat;
+                    $simulasi_to_be_inserted->marhun = $surat->marhun;
+                    $simulasi_to_be_inserted->percent = $surat->percentpinj;
+                    $simulasi_to_be_inserted->status_jual = 0;
+                    $simulasi_to_be_inserted->status_payment = 0;
+                    $simulasi_to_be_inserted->mora_upah = 0;
+                    $simulasi_to_be_inserted->fasa = $request->fasa;
+                    $simulasi_to_be_inserted->ujrah = 1;
+                    $simulasi_bid_arr[] = $simulasi_to_be_inserted->attributesToArray();
+                }
+
+                $simulasi_bid_collection = collect($simulasi_bid_arr);
+
+                SimulasiBid::insert($simulasi_bid_arr);
+
+                $gadaimarhun_to_update = $simulasi_bid_collection->pluck('norujukan');
+
+
+                $gadaimarhun = GadaiMarhun::on($cawsimulasi['cawangan']->caw_code)->whereIn('norujukan',$gadaimarhun_to_update)->get();
+
+
+
+                $simulasi_bid_ = SimulasiBid::whereIn('norujukan',$gadaimarhun_to_update)->get()->keyBy('norujukan');
+
+                $simulasi_bid_marhun_arr = [];
+
+                foreach($gadaimarhun as $marhun) {
+
+                    if($simkarattemp[$marhun->karat] && $simulasi_bid_[$marhun->norujukan] ) {
+
+                        $val = round($marhun->berat * $simkarattemp[$marhun->karat]->harga);
+
+                        $simmarhun = new SimulasiBidMarhun();
+                        $simmarhun->simulasibid_id = $simulasi_bid_[$marhun->norujukan]->id;
+                        $simmarhun->bil = $marhun->bil;
+                        $simmarhun->marhun = $marhun->marhun;
+                        $simmarhun->nota = $marhun->nota;
+                        $simmarhun->karat = $marhun->karat;
+                        $simmarhun->berat = $marhun->berat;
+                        $simmarhun->harga = $simkarattemp[$marhun->karat]->harga;
+                        $simmarhun->n_marhun = $marhun->n_marhun;
+                        $simmarhun->hargaasas = $val;
+
+                        $simulasi_bid_marhun_arr[] = $simmarhun->attributesToArray();
+                    }
+                }
+                SimulasiBidMarhun::insert($simulasi_bid_marhun_arr);
+
+                foreach($simulasi_bid_arr as $index) {
+                    $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+                                    ->post(config('app.api_url').'taglel/update',[
+                                        'kodcaw'=>$index['kodcaw'],
+                                        'norujukan'=>$index['norujukan']
+                                        ])
+                                    ->json();
+                }
+                
+            }
+
+        }
+        else
+        {
+            return redirect()->route('analisaujrah.janasimulasi')->with('failed','Tiada surat untuk di lelong');
+        }
+
+        return redirect()->route('analisaujrah.show',$simulasi->id);
+        // return redirect()->route('analisa.senaraisimulasi')->with('success',"Success daftar simulasi!");
+
+    }
+    public function senaraisimulasi()
+    {
+        $simulasiAll = Simulasi::with('cawangan')->where('ujrah', 1)->orderBy('id', 'desc')->get();
+
+        return view('simulasiujrah.senaraisimulasi',compact('simulasiAll'));
+    }
+
+    public function kemaskinidata($simulasi_id)
+    {
+        $user = Auth::user();
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+        $data = [];
+        
+        $getcaw = Simulasi::join('cawangan_simulasi','cawangan_simulasi.simulasi_id','=','simulasi.id')
+        ->join('simulasibid','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
+        ->where('simulasi.id', $simulasi_id)
+        ->groupBy('simulasibid.caw_id')
+        ->select('simulasibid.caw_id')
+        ->get();
+        // dd($getcaw);
+        foreach($getcaw as $index=>$caw)
+        {
+            $cawid = $caw['caw_id'];
+            $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
+            ->where('simulasi_id','=',$simulasi_id)
+            ->where('caw_id','=',$caw['caw_id']);
+    
+            $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+            $datasimulasi = $marhun->get();
+            // dd($datasimulasi[$index]['fasa']);
+            
+            $senaraisag = Gadai::on($datasimulasi[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->get();
+            // dd($senaraisag);
+            foreach($senaraisag as $data)
+            {
+                // dd($data['norujukan']);
+                // dd($datasimulasi[$index]['fasa']);
+                if($datasimulasi[$index]['fasa'] == 1){
+                    //insert lelong_tebus
+                    if($data['sttebus'] == "T")
+                    {
+                        $lelongtebus = new LelongTebus;
+                        $lelongtebus->tarikh = $currentdate;
+                        $lelongtebus->kodcaw = $data['kodcaw'];
+                        $lelongtebus->teller = $user->name;
+                        $lelongtebus->norujukan = $data['norujukan'];
+                        $lelongtebus->batch_no = $simulasi_id;
+                        $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                        $lelongtebus->pinjaman = $data['pinjaman'];
+                        $lelongtebus->upah = $data['bakiupah'];
+                        $lelongtebus->jbg = $data['jbg'];
+                        $lelongtebus->jenis_tebus = 'T';
+                        $lelongtebus->save();
+
+                        $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+                        ->post(config('app.api_url').'taglel/revert',[
+                            'kodcaw'=>$data['kodcaw'],
+                            'norujukan'=>$data['norujukan']
+                            ])
+                        ->json();
+
+                        // dd($data['norujukan']);
+                        $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
+                        $updatesimulasi->delete();
+                        //insert loguser
+                        $loguser = new LogUser;
+                        $loguser->user_id = $user->id;
+                        $loguser->date = $currentdate;
+                        $loguser->username = $user->username;
+                        $loguser->nama_user = $user->name;
+                        $loguser->norujukan = $data['norujukan'];
+                        $loguser->nota = ' LELONG TEBUS '.$simulasi_id;
+                        $loguser->save();
+
+
+                    }
+                    else if($data['sttebus'] == ""){
+                        $ktlhbyr = $data['hargajualan']-$data['bakihargajualan'];
+                        if($ktlhbyr >= $data['bakiupah'])
+                        {
+                            $lelongtebus = new LelongTebus;
+                            $lelongtebus->tarikh = $currentdate;
+                            $lelongtebus->kodcaw = $data['kodcaw'];
+                            $lelongtebus->teller = $user->name;
+                            $lelongtebus->norujukan = $data['norujukan'];
+                            $lelongtebus->batch_no = $simulasi_id;
+                            $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                            $lelongtebus->pinjaman = $data['pinjaman'];
+                            $lelongtebus->upah = $data['bakiupah'];
+                            $lelongtebus->jbg = $data['jbg'];
+                            $lelongtebus->jenis_tebus = 'A';
+                            $lelongtebus->save();
+
+                            $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+                            ->post(config('app.api_url').'taglel/revert',[
+                                'kodcaw'=>$data['kodcaw'],
+                                'norujukan'=>$data['norujukan']
+                                ])
+                            ->json();
+        
+                            // dd($data['norujukan']);
+                            $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
+                            $updatesimulasi->delete();
+                            //insert loguser
+                            $loguser = new LogUser;
+                            $loguser->user_id = $user->id;
+                            $loguser->date = $currentdate;
+                            $loguser->username = $user->username;
+                            $loguser->nama_user = $user->name;
+                            $loguser->norujukan = $data['norujukan'];
+                            $loguser->nota = ' KELUAR LELONG '.$simulasi_id;
+                            $loguser->save();
+                        }
+                        else{
+                            //kemaskini keuntungan
+                            $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
+                            $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
+                            $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                            
+                            $jbg = $data['tempoh']-$data['tempohbayar'];
+							$jbg2 = 12- $data['tempohbayar'];
+                            if($data['tempoh'] <= '12.00'){
+                                $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                            }else{
+                                $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                            }
+                            // dd($keuntungan);
+                            //update dalam simulasibid
+                            $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
+                                            ->where('simulasi_id', $simulasi_id)
+                                            ->first();
+                            $updatetempoh->jbg = $data['tempoh'];
+                            $updatetempoh->pinjaman = $data['bakipjm'];
+                            $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                            $updatetempoh->update();
+
+                            //insert loguser
+                            $loguser = new LogUser;
+                            $loguser->user_id = $user->id;
+                            $loguser->date = $currentdate;
+                            $loguser->username = $user->username;
+                            $loguser->nama_user = $user->name;
+                            $loguser->norujukan = $data['norujukan'];
+                            $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                            $loguser->save();
+                        }
+                    
+                        $date = Carbon::now()->toDateTimeString();
+                        $simulasi = Simulasi::where('id','=',$simulasi_id)->first();
+                        $simulasi->masakemaskini_data = $date;
+                        $simulasi->save();
+                    }
+                }else if($datasimulasi[$index]['fasa'] == 2){
+                    // dd($datasimulasi[$index]['fasa']);
+                    if($data['sttebus'] == "T")
+                    {
+                        $lelongtebus = new LelongTebus;
+                        $lelongtebus->tarikh = $currentdate;
+                        $lelongtebus->kodcaw = $data['kodcaw'];
+                        $lelongtebus->teller = $user->name;
+                        $lelongtebus->norujukan = $data['norujukan'];
+                        $lelongtebus->batch_no = $simulasi_id;
+                        $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                        $lelongtebus->pinjaman = $data['pinjaman'];
+                        $lelongtebus->upah = $data['bakiupah'];
+                        $lelongtebus->jbg = $data['jbg'];
+                        $lelongtebus->jenis_tebus = 'T';
+                        $lelongtebus->save();
+
+                        $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+                        ->post(config('app.api_url').'taglel/revert',[
+                            'kodcaw'=>$data['kodcaw'],
+                            'norujukan'=>$data['norujukan']
+                            ])
+                        ->json();
+
+                        // dd($data['norujukan']);
+                        $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
+                        $updatesimulasi->delete();
+                        //insert loguser
+                        $loguser = new LogUser;
+                        $loguser->user_id = $user->id;
+                        $loguser->date = $currentdate;
+                        $loguser->username = $user->username;
+                        $loguser->nama_user = $user->name;
+                        $loguser->norujukan = $data['norujukan'];
+                        $loguser->nota = ' LELONG TEBUS '.$simulasi_id;
+                        $loguser->save();
+                    }
+                    else{
+                        //kemaskini keuntungan
+                        $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
+                        $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
+                        $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                        
+                        $jbg = $data['tempoh']-$data['tempohbayar'];
+                        $jbg2 = 12- $data['tempohbayar'];
+                        if($data['tempoh'] <= '12.00'){
+                            $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                        }else{
+                            $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                        }
+                        // dd($keuntungan);
+                        //update dalam simulasibid
+                        $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
+                                        ->where('simulasi_id', $simulasi_id)
+                                        ->first();
+                        $updatetempoh->jbg = $data['tempoh'];
+                        $updatetempoh->pinjaman = $data['bakipjm'];
+                        $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                        $updatetempoh->update();
+
+                        //insert loguser
+                        $loguser = new LogUser;
+                        $loguser->user_id = $user->id;
+                        $loguser->date = $currentdate;
+                        $loguser->username = $user->username;
+                        $loguser->nama_user = $user->name;
+                        $loguser->norujukan = $data['norujukan'];
+                        $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                        $loguser->save();
+                    }
+                    $date = Carbon::now()->toDateTimeString();
+                    $simulasi = Simulasi::where('id','=',$simulasi_id)->first();
+                    $simulasi->masakemaskini_data = $date;
+                    $simulasi->save();
+                }
+
+                   
+                }
+               
+            }
+            return redirect()->route('analisaujrah.senaraisimulasi')
+            ->with('success','Kemaskini Berjaya');
+    }
+
+    public function show($id)
+    {
+        $simulasi_id = $id;
+        $simulasi = Simulasi::with(['cawangan', 'simulasiBid.simulasiBidMarhun', 'simkarat'])
+        ->where('ujrah',1)
+        ->find($id);
+        $data = $simulasi;
+        $simkarat = $simulasi->simkarat;
+        $jeniskarat = JenisKarat::all();
+
+        $cawanganAll = $simulasi->cawangan;
+        $simBidGroupByCawId = $simulasi->simulasiBid->groupBy('caw_id');
+
+        foreach($cawanganAll as $caw_key_by_id)
+        {
+            if($simBidGroupByCawId[$caw_key_by_id['id']]);
+            {
+                $caw_key_by_id['simulasiBid'] = $simBidGroupByCawId[$caw_key_by_id['id']];
+            }
+        }
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+
+        $total_marhun = 0;
+        $total_nilaimarhun = 0;
+        $total_pinjaman = 0;
+        $total_bakiupah = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+        $total_cazlelong = 0;
+        $total_berat = 0;
+        $total_hargaasas = 0;
+        $arraycaw = [];
+
+        foreach ($cawanganAll as $caw) {
+            $berat = 0;
+            $nilai_marhun = 0;
+            $pinjaman = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+            foreach ($caw['simulasiBid'] as $sim_bid) {
+                $total_marhun += 1;
+                $nilai_marhun += $sim_bid->nilaimarhun;
+                $pinjaman += $sim_bid->pinjaman;
+                $bakiupah += $sim_bid->bakiupah;
+                $berat += $sim_bid->berat;
+                $hargaasas += $sim_bid->hargaasas;
+          
+
+                $sumcajlelong =  $sim_bid['hargaasas'] * ($simulasi['cajlelong']/100);                
+                $cajlelongnew = round($sumcajlelong, 1, 1);
+		        // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+		        $cajlelong = $cajlelong + $cajlelongnew;
+                $totalbaki = $sim_bid['hargaasas'] - $sim_bid['pinjaman'] - $sim_bid['bakiupah'] - $cajlelongnew;
+                if(strpos($totalbaki, '-') !== false)
+                {
+                   $rugi  = -$totalbaki;
+                   $rugilelong += $rugi;
+                }
+                else {
+                   $baki = $totalbaki;
+                   $bakilelong += $baki;
+                }
+
+                foreach ($sim_bid->simulasiBidMarhun as $sim_bid_marhun) {
+                    if ($sim_bid_marhun->karat == "24.0Kgb") {
+                        $total24Kgb += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "24.0K") {
+                        $total24K += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "23.0K") {
+                        $total23k += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "22.0K") {
+                        $total22K += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "21.0K") {
+                        $total21K += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "20.0K") {
+                        $total20K += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "18.0Kp") {
+                        $total18Kp += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "18.0K") {
+                        $total18K += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "14.0Kp") {
+                        $total14Kp += $sim_bid_marhun->berat;
+                    } else if ($sim_bid_marhun->karat == "14.0K") {
+                        $total14K += $sim_bid_marhun->berat;
+                    }
+                }
+            }
+
+            array_push($arraycaw, [
+                'id_cawangan' => $caw['id'],
+                'cawangan' => $caw->caw_name,
+                't_lelong' => $simulasi['tarikh_lelong'],
+                'bil_marhun' => count($caw['simulasiBid']),
+                'berat' => $berat,
+                'n_marhun' => $nilai_marhun,
+                'pinjaman' => $pinjaman,
+                'upahsimpan' => $bakiupah,
+                'bakiupah' => $bakiupah,
+                'hargaasas' => $hargaasas,
+                'cajlelong' => $cajlelong,
+                'rugilelong' => $rugilelong,
+                'bakilelong' => $bakilelong,
+            ]);
+
+            $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;
+        }
+        $tarikhkemaskini = $simulasi->simkarat[0];
+        $data = $simulasi;
+
+        return view('simulasiujrah.showsimulasi', compact(
+            'tarikhkemaskini',
+            'data',
+            'simkarat',
+            'jeniskarat',
+            'arraycaw',
+            'total_marhun',
+            'total_berat',
+            'total_pinjaman',
+            'total_hargaasas',
+            'total_cazlelong',
+            'total_rugilelong',
+            'total_bakilelong',
+            'total24Kgb',
+            'total24K',
+            'total23k',
+            'total22K',
+            'total21K',
+            'total20K',
+            'total18Kp',
+            'total18K',
+            'total14Kp',
+            'total14K',
+            'simulasi_id',
+            'total_bakiupah',
+            'total_nilaimarhun',
+            'simulasi'
+        ));
+    }
+
+    public function delete($id)
+    {
+        $simulasibid = SimulasiBid::where('simulasi_id','=',$id)->get();
+        foreach($simulasibid as $data)
+        {
+            $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+                        ->post(config('app.api_url').'taglel/revert',[
+                            'kodcaw'=>$data->kodcaw,
+                            'norujukan'=>$data->norujukan
+                            ])
+                        ->json();
+        }
+        $role = Simulasi::where('id','=',$id)->first();
+        $role->delete();
+        return redirect()->route('analisaujrah.senaraisimulasi')
+                        ->with('success','Padam Simulasi Berjaya');
+    }
+
+    public function senaraimarhunlel($simulasi_id, $cawid)
+    {
+        $total_berat = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $total_cazlelong = 0;
+        $rugilelong = 0;
+        $bakilelong = 0;
+        $keuntungan = 0;
+        $total_baki = 0;
+
+        $simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
+
+        $cawanganDetail = $simulasilel->cawangan->find($cawid);
+        
+        $marhuns = SimulasiBid::where('caw_id', '=', $cawid)
+        ->where('simulasi_id', '=', $simulasi_id)
+        ->get();
+
+        // $gadaiAll = Gadai::on($cawanganDetail->caw_code)->whereIn('norujukan', $marhuns->pluck('norujukan'))->get()->keyBy('norujukan');
+
+        $arraymarhun = [];
+        foreach($marhuns->toArray() as $index1=>$cal){
+            // $gadai = Gadai::on($cal['kodcaw'])
+            //         ->where('norujukan','=',$cal['norujukan'])
+            //         ->first();
+            //         // dd($gadai);
+            // $customer =  Customer::where('kpbaru','=',$gadai['nokp'])
+            //     ->orWhere('kplama','=',$gadai['nokp'])
+            //     ->first();
+
+            // $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;
+
+            // $simulasilel = Simulasi::where('id',$simulasi_id)->get();
+            $sumcajlelong =  $cal['hargaasas'] * ($simulasilel->cajlelong/100);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $baki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $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_baki = $total_baki + $baki;
+            $total_cazlelong = $total_cazlelong +  $cajlelongnew;
+            
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                // 'nama' => $customer['nama'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cajlelongnew,
+                'baki' => $baki,
+            ]);
+        }
+
+
+        return view('simulasiujrah.senaraimarhunlel',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','total_berat',
+        'total_nilaimarhun',
+        'total_pinjaman',
+        'total_bakiupah',
+        'total_hargaasas',
+        'simulasilel',
+        'cawanganDetail',
+        'total_cazlelong',
+        'total_baki'));
+    }
+
+    public function listsagbycust($simulasi_id, $cawid)
+    {
+        $keuntungan = 0;
+        $arraylistgadai = 0;
+
+        $simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
+
+        $cawanganDetail = $simulasilel->cawangan->find($cawid);
+
+       $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
+        ->where('simulasi_id','=',$simulasi_id)
+        ->where('caw_id','=',$cawid);
+
+        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+        $datasimulasi = $marhun->get();
+        $marhuns = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+        ->select('nokp')
+        ->groupBy('nokp')->get();
+        // dd($datagadai); 
+        $arraysag = [];
+       
+        foreach($marhuns as $index1=>$cal)
+        {
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
+            ->orWhere('kplama','=',$cal['nokp'])
+            ->first();
+            // dd($customer);
+
+            $listsag = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->where('nokp','=',$cal['nokp'])
+            ->get();
+            // dd($listgadai);
+            foreach($listsag as $index=>$listing){
+                $ktlhbyr = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
+                // dd($ktlhbyr);  
+                $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('keuntungan_rebet');
+                $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
+                $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+
+                // $keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan;
+                // dd($keuntungan);
+                $jbg = $listing['tempoh']-$listing['tempohbayar'];
+                $jbg2 = 12- $listing['tempohbayar'];
+                if($listing['tempoh'] <= '12.00'){
+                    $keuntungan = bcdiv(($jbg)*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan;
+                }else{
+                    $keuntungan = bcdiv(($jbg2)*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan;
+                }
+                $listsag[$index]['ktlhbyr'] = $ktlhbyr; 
+                $listsag[$index]['keuntungan'] = $keuntungan; 
+            }
+            $marhuns[$index1]['nama'] = $customer;
+            $marhuns[$index1]['listsag'] = $listsag;
+
+        }
+        return view('simulasiujrah.listsagbycust',compact('simulasilel','cawanganDetail','marhuns','simulasi_id','cawid','ktlhbyr'));
+    }
+
+
+}
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index e18e85ce..bc84a1da 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -37,7 +37,8 @@ class LelongBid extends Model
         'status_jual',
         'status_payment',
         'mora_upah',
-        'fasa'
+        'fasa',
+        'ujrah'
     ];
 
     public function cawangan()
diff --git a/app/Models/Simulasi.php b/app/Models/Simulasi.php
index 8e4091c7..771be330 100644
--- a/app/Models/Simulasi.php
+++ b/app/Models/Simulasi.php
@@ -20,6 +20,7 @@ class Simulasi extends Model
         'cajlelong',
         'fasa',
         'success_import',
+        'ujrah'
     ];
 
     public function cawangan()
diff --git a/database/migrations/2023_11_23_115819_add_ujrah_to_simulasis_table.php b/database/migrations/2023_11_23_115819_add_ujrah_to_simulasis_table.php
new file mode 100644
index 00000000..299b6011
--- /dev/null
+++ b/database/migrations/2023_11_23_115819_add_ujrah_to_simulasis_table.php
@@ -0,0 +1,49 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUjrahToSimulasisTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('simulasi', function (Blueprint $table) {
+            $table->integer('ujrah')->default(0);
+        });
+
+        Schema::table('cawangan_simulasi', function (Blueprint $table) {
+            $table->integer('ujrah')->default(0);
+        });
+
+        Schema::table('simulasibid', function (Blueprint $table) {
+            $table->integer('ujrah')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('simulasi', function (Blueprint $table) {
+            $table->dropColumn('ujrah');
+        });
+
+        Schema::table('cawangan_simulasi', function (Blueprint $table) {
+            $table->dropColumn('ujrah');
+        });
+
+        Schema::table('simulasibid', function (Blueprint $table) {
+            $table->dropColumn('ujrah');
+        });
+        
+    }
+}
diff --git a/database/migrations/2023_11_27_130441_add_ujrah_to_lelong_table.php b/database/migrations/2023_11_27_130441_add_ujrah_to_lelong_table.php
new file mode 100644
index 00000000..4e09a4a6
--- /dev/null
+++ b/database/migrations/2023_11_27_130441_add_ujrah_to_lelong_table.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUjrahToLelongTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('lelong', function (Blueprint $table) {
+            $table->integer('ujrah')->default(0);
+        });
+
+        Schema::table('cawangan_lelong', function (Blueprint $table) {
+            $table->integer('ujrah')->default(0);
+        });
+
+        Schema::table('lelongbid', function (Blueprint $table) {
+            $table->integer('ujrah')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('lelong', function (Blueprint $table) {
+            $table->dropColumn('ujrah');
+        });
+
+        Schema::table('cawangan_lelong', function (Blueprint $table) {
+            $table->dropColumn('ujrah');
+        });
+
+        Schema::table('lelongbid', function (Blueprint $table) {
+            $table->dropColumn('ujrah');
+        });
+    }
+}
diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php
index 58056523..9453fdd1 100644
--- a/database/seeders/RolesSeeder.php
+++ b/database/seeders/RolesSeeder.php
@@ -159,6 +159,11 @@ class RolesSeeder extends Seeder
             'description' => 'Wang Tidak Dituntut'
         ]);
 
+        Permission::create([
+            'name' => 'analisaujrah',
+            'description' => 'Simulasi Ujrah'
+        ]);
+
         //account
         Permission::create([
             'name' => 'pengesahanbayaran',
@@ -252,6 +257,7 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('reportbycaw');
         $role6->givePermissionTo('parameter');
         $role6->givePermissionTo('WTD');
+        $role6->givePermissionTo('analisaujrah');
 
 
 
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 2e700eb3..c4cf937b 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -645,6 +645,27 @@
         </li>
       </ul>
     </li>
+    <li>
+      <a href="#analisaujrahSubmenu" data-toggle="collapse" aria-expanded="false">
+        <div class="sidebar-menu">
+          <div class="sidebar-menu-main-title">
+            <span class="material-symbols-rounded sidebar-menu-item-main">
+              track_changes
+            </span>
+            Simulasi Ujrah
+          </div>
+          <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+        </div>
+      </a>
+      <ul class="list-unstyled collapse {{ (request()->is('analisaujrah/*')) ? 'show' : '' }} ||  {{ (request()->is('tetapanujrah/*')) ? 'show' : '' }}" id="analisaujrahSubmenu">
+        <li class="{{ (request()->is('analisaujrah/janasimulasi/*') || request()->is('analisaujrah/janasimulasi') ) ? 'active' : '' }}">
+          <a href="{{url('analisaujrah/janasimulasi')}}">Jana Simulasi Ujrah</a>
+        </li>
+        <li class="{{ (request()->is('analisaujrah/senaraisimulasi/*') || request()->is('analisaujrah/senaraisimulasi') ) ? 'active' : '' }}">
+          <a href="{{url('analisaujrah/senaraisimulasi')}}">Senarai Simulasi Ujrah</a>
+        </li>
+      </ul>
+    </li>
     <li>
       <a href="#lelongSubmenu" data-toggle="collapse" aria-expanded="false">
         <div class="sidebar-menu">
diff --git a/resources/views/lelong/listsagbycust.blade.php b/resources/views/lelong/listsagbycust.blade.php
index 2a2f4751..7fba2db3 100644
--- a/resources/views/lelong/listsagbycust.blade.php
+++ b/resources/views/lelong/listsagbycust.blade.php
@@ -34,7 +34,11 @@
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
                 <table class="table text-center table-bordered" id="marhun" >
-                    <thead class="bg-primary text-white" >
+                    @if($lelonglel->ujrah == '0')
+                        <thead class="bg-primary text-white" >
+                    @elseif($lelonglel->ujrah == '1')
+                        <thead class="bg-success text-white" >
+                    @endif
                         <tr>
                             <th>No</th>
                             <th>Nama Pelanggan</th> 
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 74d83c1d..c34290ac 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -83,8 +83,12 @@
                                             <td><span class="badge badge-pill badge-info">LELONG BELUM MULA</span></td>
                                             <td style="white-space: nowrap;">
                                                     {{-- <a class="btn m-1 btn-warning confirmrefresh" href="{{ route('lelong.kemaskinidata',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a> --}}
+                                                    @if($lelong->ujrah =='1')
+                                                    <a class="btn m-1 btn-success" href="{{ route('lelong.show',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Lelong Ujrah"><i class="far fa-edit"></i></a>
+                                                    @elseif($lelong->ujrah == '0')
                                                     <a class="btn m-1 btn-primary" href="{{ route('lelong.show',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Lelong"><i class="far fa-edit"></i></a>
-                                                   @hasrole('operasi')
+                                                    @endif
+                                                    @hasrole('operasi')
                                                     <a class="btn m-1 btn-danger confirmdel" href="{{ route('lelong.delete',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Lelong"><i class="far fa-trash-alt"></i></a>
                                                     @endhasrole
                                             </td>
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 84362f5d..d6623afb 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -11,7 +11,11 @@
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
+                    @if($lelonglel->ujrah == '0')
                     senarai Sag : {{ $cawanganDetail->caw_name }}
+                    @elseif($lelonglel->ujrah == '1')
+                    senarai Sag Ujrah: {{ $cawanganDetail->caw_name }}
+                    @endif
                 </div>
             </div>
             <div class="card-body">
@@ -63,7 +67,12 @@
                 <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%">
+                    @if($lelonglel->ujrah == '0')
                     <thead class="bg-primary text-white">
+                    @elseif($lelonglel->ujrah == '1')
+                    <thead class="bg-success text-white">
+                    @endif
+
                         <tr>
                             @hasrole('operasi')
                             <th>Tindakan</th>
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 4d297c4e..3bc8301f 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -16,7 +16,11 @@
                         $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                         $t_lelong = $myDateTime->format('d-m-Y');
                         @endphp
+                        @if($lelong->ujrah == '0')
                         butiran lelong : {{$t_lelong}}
+                        @elseif($lelong->ujrah == '1')
+                        butiran lelong Ujrah: {{$t_lelong}}
+                        @endif
                     </div>
                 </div>
                 <div class="card-body">
@@ -176,7 +180,11 @@
                     <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
                         <div style="overflow-x: auto;">
                         <table class="table text-right table-bordered" id="simulasi">
+                            @if($lelong->ujrah == '0')
                             <thead class="bg-primary text-center text-white">
+                            @elseif($lelong->ujrah == '1')
+                            <thead class="bg-success text-center text-white">
+                            @endif
                                 <tr class="text-center">
                                     <th>No</th>
                                     <th>Cawangan</th>
@@ -184,7 +192,11 @@
                                     <th>Berat (gm)</th>
                                     <th>N. Marhun Asal (RM)</th>
                                     <th>Pembiayaan (RM)</th>
+                                    @if($lelong->ujrah == '0')
                                     <th>Keuntungan (RM)</th>
+                                    @elseif($lelong->ujrah == '1')
+                                    <th>K.Ujrah (RM)</th>
+                                    @endif
                                     <th>Caj (RM)</th>
                                     <th>Harga Asas (RM)</th>
                                     <th>Baki (RM)</th>
diff --git a/resources/views/simulasiujrah/janasimulasi.blade.php b/resources/views/simulasiujrah/janasimulasi.blade.php
new file mode 100644
index 00000000..357e364f
--- /dev/null
+++ b/resources/views/simulasiujrah/janasimulasi.blade.php
@@ -0,0 +1,124 @@
+@extends('layouts.app')
+
+@section('content')
+<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/js/select2.min.js"></script>
+<div class="container">
+    <div class="row ">
+        <div class="col-10 mx-auto">
+          <div class="card">
+            <div class="card-header header-style">
+                <div class="header-style-title">
+                  Jana Simulasi Ujrah
+                </div>
+            </div>
+            <div class="card-body">
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    {{ $message }}
+                </div>
+            @endif
+            <form action="{{route('analisaujrah.senaraitempsimulasi')}}" method="POST" enctype="multipart/form-data">
+              @csrf
+              <div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
+                <div class="form-group row">
+                  <label for="tarikh_lelong" class="col-sm-2 col-form-label">Tarikh Lelong</label>
+                  <div class="col-sm-3">
+                    <input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong"  value = "{{$tetapan->tetap_tarikh_lelong}}">
+                  </div>
+                  <!-- <label for="hargaasas" class="col-sm-1 col-form-label">Harga Emas Asas</label>
+                  <div class="col-sm-4">
+                    <input type="text" class="form-control" id="hargaasas" name="hargaasas" placeholder="RM">
+                  </div> -->
+                </div>
+                <div class="form-group row">
+                  <label for="jbg" class="col-sm-2 col-form-label">Fasa Lelong</label>
+                  <div class="col-sm-4">
+                  <input type="radio" value='1' id="fasa1" name="fasa" checked>
+                    <label for="1">Fasa 1</label>
+                    <input type="radio" value='2'  id="fasa2" name="fasa">
+                    <label for="2">Fasa 2</label>  
+                  </div>
+                  <!-- <label for="cajlelong" class="col-sm-1 col-form-label">Caj Lelong</label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" id="cajlelong" name="cajlelong" placeholder="%">
+                    </div> -->
+                </div>
+             
+                  <div class="form-group row">
+                  <label for="jbg" class="col-sm-2 col-form-label">Tempoh</label>
+                  <div class="col-sm-4" id="fasa_1">
+                    <input type="text" class="form-control" id="jbg" name="jbg" placeholder="Tempoh">
+                  </div>
+                  
+                  <!-- <label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
+                  <div class="col-sm-4">
+                    <select class="selectpicker" multiple name="caw[]" id="caw">
+                      @foreach ($caw as $item)
+                      <option value="{{$item->id}}">{{$item->caw_name}}</option>
+                      @endforeach
+  
+                    </select>
+                  </div> -->
+                </div>
+                <div class="form-group row">
+                 
+                  <label for="cajlelong" class="col-sm-2 col-form-label">Caj Lelong</label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" id="cajlelong" name="cajlelong"  value = "{{$tetapan->cajlelong}}" readonly>
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                 
+                  <label for="cajlelong" class="col-sm-2 col-form-label">Kali</label>
+                    <div class="col-sm-4">
+                      <input type="text" class="form-control" id="kali" name="kali"  value = "{{$tetapan->kali}}" readonly>
+                    </div>
+                </div>
+                <div class="form-group row">
+                  <div class="col-sm-10">
+                    <button type="submit" class="btn btn-primary">Carian</button>
+                  </div>
+                </div>
+            </form>
+            </div>
+          </div>
+        </div>
+        
+    </div>
+</div>
+<script>
+  var date = '<?php echo $currentDate; ?>';
+
+  $('#caw').select2({
+    width: '100%',
+    placeholder: "Pilih Cawangan",
+    allowClear: true
+  });
+
+  $(document).ready(function () {
+    document.getElementById('tarikh_lelong').setAttribute("min", date);
+     $("input[name=fasa]").change(function(){
+
+        if($("#fasa1").is(':checked')){
+            $("#jbg").val('').prop("readonly", false);
+        }
+        if($("#fasa2").is(':checked')){
+          $("#jbg").val('12').prop("readonly", true);
+        }
+    });
+ });
+</script>
+
+<script>
+$(function() {
+    $( "form" ).submit(function() {
+        $('#loader').show();
+        
+    });
+});
+</script>
+     
+@endsection
diff --git a/resources/views/simulasiujrah/listsagbycust.blade.php b/resources/views/simulasiujrah/listsagbycust.blade.php
new file mode 100644
index 00000000..34b7b695
--- /dev/null
+++ b/resources/views/simulasiujrah/listsagbycust.blade.php
@@ -0,0 +1,219 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{ route('analisaujrah.senaraimarhunlel',[$simulasi_id,$cawid]) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Mengikut Nama Pelanggan : {{ $cawanganDetail->caw_name }}
+                </div>
+            </div>
+            <div class="card-body">
+            @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <div class="mb-3">
+                <a href=" {{ route('report.simulasireportbycust',[$simulasi_id,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                <!-- <a href="{{ route('analisa.senaraimarhunlel',[$simulasi_id,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a> -->
+            </div>
+            <form id="deletesag" action="{{route('analisa.deletemarhunlel')}}" method="POST">
+                @csrf
+                <input type="hidden" name="simulasi_id" value="{{$simulasi_id}}">
+                <input type="hidden" name="cawid" value="{{$cawid}}">
+                <table class="table text-center table-bordered" id="marhun">
+                    <thead class="bg-success text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>Nama Pelanggan</th> 
+                            <th>No.KP</th>   
+                            <th>No.Rujukan</th>   
+                            <th>Tempoh</th>
+                            <th>Berat Asal (gm)</th>
+                            <th>Nilai Marhun Asal (RM)</th>
+                            <!-- <th>Pembiayaan Asal (RM)</th> -->
+                            <th>Baki Pembiayaan (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> -->
+                            <!-- <th>Tindakan</th> -->
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($marhuns as $index=> $marhun)
+                            <tr>
+                                <td>{{$loop->iteration}}</td>                              
+                                <td style='word-wrap' align="left">{{ $marhun['nama']['nama']}}</td>
+                                <td style='word-wrap'>{{ $marhun['nokp']}}</td>
+                                <td style='white-space:nowrap;'>@foreach ($marhun['listsag'] as $item)
+                                {{-- {{$loop->iteration}}.{{ $item['norujukan'] }}<br> --}}
+                                {{ $item['norujukan'] }}<br>
+                                @endforeach</td>
+                                <td>@foreach ($marhun['listsag'] as $item)
+                                {{ $item['tempoh'] }}<br>
+                                @endforeach</td>
+                                <td align = 'right'>
+                                    @php $jumberat = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                        @php 
+                                        $jumberat = $jumberat + $item['berat'];
+                                        @endphp
+                                        {{ number_format($item['berat'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jumberat, 2, '.', ',') }}</strong>
+                                </td> 
+                                <td align = 'right'>
+                                    @php $jumnilaimarhun = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
+                                        @endphp
+                                        {{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                                <!-- <td align = 'right'>
+                                    @php $jumpinjasal = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumpinjasal = $jumpinjasal + $item['pinjaman'];
+                                        @endphp
+                                        {{ number_format($item['pinjaman'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jumpinjasal, 2, '.', ',') }}</strong>
+                               
+                                </td>  -->
+                                <td align = 'right'>
+                                    @php $jumpinjaman = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumpinjaman = $jumpinjaman + $item['bakipjm'];
+                                        @endphp
+                                        {{ number_format($item['bakipjm'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>{{ number_format($jumpinjaman, 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 $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>
+                    
+                </table>
+              
+            </form>
+            </div>
+            </div>
+        </div>
+        
+    </div>
+</div>
+<script>
+    $("#btndelete").prop("disabled", true);
+    function btnDelete(e) {
+        var count = 0;
+        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            if($(this).prop('checked') === true)
+            {
+                count = count + 1;
+            }
+            // $(this).prop('checked', e.checked);
+        })
+        if(count != 0)
+        {
+            $("#btndelete").prop("disabled", false);
+        }
+        else
+        {
+            $("#btndelete").prop("disabled", true);
+        }
+        // let checkbox = $('#checkboxdata').val();
+        // console.log(checkbox)
+        // $("#btndelete").prop("disabled", checkboxdata.length === 0);
+    }
+    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({
+        "scrollX": true,
+        "info": false,
+        "paging": false,
+        "pageLength": 5000,
+        });
+    
+</script>
+@endsection
diff --git a/resources/views/simulasiujrah/senaraimarhunlel.blade.php b/resources/views/simulasiujrah/senaraimarhunlel.blade.php
new file mode 100644
index 00000000..05df6006
--- /dev/null
+++ b/resources/views/simulasiujrah/senaraimarhunlel.blade.php
@@ -0,0 +1,210 @@
+@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('analisaujrah.show',$simulasi_id) }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        senarai Sag Ujrah: {{ $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', $simulasilel->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="{{$simulasilel->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.simulasireport',[$simulasi_id,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                        <a href="{{ route('analisaujrah.listsagbycust',[$simulasi_id,'cawid'=>$cawid]) }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                    </div>
+                    <form id="deletesag" action="{{route('analisa.deletemarhunlel')}}" method="POST">
+                        @csrf
+                        <input type="hidden" name="simulasi_id" value="{{$simulasi_id}}">
+                        <input type="hidden" name="cawid" value="{{$cawid}}">
+                        <table class="table text-right table-bordered" id="marhun" style="width:100%">
+                            <thead class="bg-success text-center text-white">
+                                <tr>
+                                    <th>No</th>
+                                    <th>No Rujukan</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>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 style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
+                                    <td>{{ $marhun['tempoh']}}</td>
+                                    <td>{{ $marhun['berat'] }}</td>
+                                    <td>{{ number_format($marhun['nilaimarhun'], 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;
+                                    if(strpos($marhun['baki'], '-') !== false)
+                                    {
+                                    $baki = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                    }
+                                    else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                    }
+                                    @endphp
+                                    <td>@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" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                                    </td>
+
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            <tfoot class="bg-light">
+                                <tr>
+                                    <td colspan="3" class="text-center"><b>JUMLAH KESELURUHAN</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 align = 'right'><b>@if($bakilelong > 0)
+                                        {{ number_format($bakilelong, 2, '.', ',') }}
+                                    @else
+                                         ({{number_format(-($bakilelong), 2, '.', ',')}})
+                                    @endif</b></td>
+                                    <td></td>
+                                </tr>
+                            </tfoot>
+
+                        </table>
+                        <div class="text-right pt-4">
+                            <button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Hapus</button>
+                        </div>
+                        {{-- <a href="{{url('simulasi/showsimulasi')}}" class="btn btn-primary">Kembali</a> --}}
+
+                    </form>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
+<script>
+    $("#btndelete").prop("enabled", true);
+
+    function btnDelete(e) {
+        var count = 0;
+        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
+            if ($(this).prop('checked') === true) {
+                count = count + 1;
+            }
+            // $(this).prop('checked', e.checked);
+        })
+        if (count != 0) {
+            $("#btndelete").prop("disabled", false);
+        } else {
+            $("#btndelete").prop("disabled", true);
+        }
+        // let checkbox = $('#checkboxdata').val();
+        // console.log(checkbox)
+        // $("#btndelete").prop("disabled", checkboxdata.length === 0);
+    }
+
+    function confirm() {
+        $.confirm({
+            title: 'Padam SAG',
+            content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+            icon: 'fa fa-exclamation-triangle',
+            type: 'red',
+            boxWidth: '500px',
+            useBootstrap: false,
+            typeAnimated: true,
+            buttons: {
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                },
+                Padam: {
+                    btnClass: 'btn-danger',
+                    action: function() {
+                        $("#deletesag").submit();
+                        $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                    }
+                },
+            }
+        });
+    }
+
+    var tableMarhun = $('#marhun').DataTable({
+        "scrollX": true,
+        "pageLength": 500,
+    });
+</script>
+@endsection
diff --git a/resources/views/simulasiujrah/senaraisimulasi.blade.php b/resources/views/simulasiujrah/senaraisimulasi.blade.php
new file mode 100644
index 00000000..c21813f1
--- /dev/null
+++ b/resources/views/simulasiujrah/senaraisimulasi.blade.php
@@ -0,0 +1,168 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        senarai simulasi ujrah
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+                    <form id="exportform" action="" method="POST">
+                        <input type="hidden" name="type" value="User">
+                        <div style="overflow-x: auto;">
+                        <table class="table table-bordered text-center" id="simulasi">
+                            <thead class="bg-success text-white">
+                                <tr>
+                                    <th>No</th>
+                                    <th>Batch Lelong</th>
+                                    <th>Tarikh Lelong</th>
+                                    <th>Fasa</th>
+                                    <th>Cawangan</th>
+                                    <th>Harga Asas (RM)</th>
+                                    <th>Tindakan</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach($simulasiAll as $simulasi)
+                                <tr>
+                                    @php
+                                    $myDateTime = DateTime::createFromFormat('Y-m-d', $simulasi->tarikh_lelong );
+                                    $t_lelong = $myDateTime->format('d-m-Y');
+                                    @endphp
+                                    <td>{{$loop->iteration}}</td>
+                                    <td>{{$simulasi->id}}</td>
+                                    <td>{{$t_lelong}}</td>
+                                    <td>{{$simulasi->fasa}}</td>
+                                    <td>
+                                        @foreach($simulasi->cawangan as $caw)
+                                        <div class="row m-1 justify-content-center">
+                                            <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{$caw->caw_name}}</span>
+                                        </div>
+                                        @endforeach
+                                    </td>
+                                    <td>{{$simulasi->harga_emas_asas}}</td>
+                                    <td>
+                                        <div class="row justify-content-center">
+                                            <a class="confirmrefresh btn m-1 btn-warning" href="{{ route('analisaujrah.kemaskinidata',$simulasi->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Simulasi"><i class="fas fa-sync-alt"></i></a>
+                                            <a class="btn m-1 btn-primary" href="{{ route('analisaujrah.show',$simulasi->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Simulasi"><i class="far fa-edit"></i></a>
+                                            <a class="confirmdel btn m-1 btn-danger" href="{{ route('analisaujrah.delete',$simulasi->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Simulasi"><i class="far fa-trash-alt"></i></a>
+                                        </div>
+                                    </td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+
+                        </table>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
+<script>
+    $(function() {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
+    
+    $('a.confirmdel').confirm({
+        title: 'Padam Simulasi',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'red',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
+            },
+            Padam: {
+                btnClass: 'btn-red',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+    $('a.confirmrefresh').confirm({
+        title: 'Kemaskini Simulasi',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'orange',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
+
+            },
+            Kemaskini: {
+                btnClass: 'btn-orange',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+
+    var tablesimulasi = $('#simulasi').DataTable({
+        "columnDefs": [{
+                "orderable": false,
+                "targets": 4
+            },
+            {
+                "orderable": false,
+                "targets": 6
+            }
+        ],
+        "pageLength": 100,
+    });
+
+
+
+    $('.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
\ No newline at end of file
diff --git a/resources/views/simulasiujrah/senaraitempsimulasi.blade.php b/resources/views/simulasiujrah/senaraitempsimulasi.blade.php
new file mode 100644
index 00000000..231ee045
--- /dev/null
+++ b/resources/views/simulasiujrah/senaraitempsimulasi.blade.php
@@ -0,0 +1,202 @@
+@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">
+                   <div class="header-style-title">
+                        Butiran Gadaian Ujrah 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>
+                </div>
+            @endif
+
+            {{-- @if (Session::has('message'))
+                <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> --}}
+            <form action="{{route('analisaujrah.janadata2')}}" method="POST" enctype="multipart/form-data">
+            <!-- <form action="{{route('analisa.importgadaifrommaster')}}" method="POST" enctype="multipart/form-data"> -->
+
+            @csrf
+          
+           <input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
+             <div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
+
+            <div class="container">
+                <div>
+                    <div style="margin-top:2%; margin-bottom:2%;">
+                            
+                        <p> <b>Tarikh Lelong : </b> {{ $t_lelong1 }}</p>
+                        <p> <b>Tarikh Gadai Sehingga : </b> @php 
+                            if($fasa == '1'){
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $jbgadai );
+                                $t_gadai =  $myDateTime->format('d-m-Y');
+                                $t_gadai1 =  $myDateTime->format('Y-m-d');
+                                echo($t_gadai);
+                            }else{
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong2 );
+                                $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y');
+                                //$t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d');
+                                //$t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d');
+                                $t_gadai1 =  $myDateTime->format('Y-m-d');
+                                echo($tarikhlelong);
+                                }
+                                @endphp</p>
+                            <p> <b>Lelongan Kali Ke -</b> {{ $tetapan->kali }}</p>
+                            <input type="hidden" class="form-control" id="tarikh_lelong" name="tarikh_lelong" value="{{$t_lelong2}}">
+                            <input type="hidden" class="form-control" id="t_gadai" name="t_gadai" value="@php echo($t_gadai1) @endphp">
+                            <input type="hidden" class="form-control" id="jbg" name="jbg" value="{{$jbg}}">
+                            <input type="hidden" class="form-control" id="hargaasas" name="hargaasas" value="0.00">
+                            <input type="hidden" class="form-control" id="cajlelong" name="cajlelong" value="{{$cajlelong}}">
+                            <input type="hidden" class="form-control" id="kali" name="kali" value="{{$tetapan->kali}}">
+                            
+
+                    </div>
+                </div>
+             </div>
+             <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" id="checkall"></th>
+                            <th>Bil</th>
+			    <th>Kod Cawangan</th>
+                            <th>Cawangan</th>
+                            <th>Bil Lelong</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Baki Pembiayaan (RM)</th>
+                            <th class="text-center">Tindakan</th>
+                        </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="checkbox"></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>
+                            <td>{{ number_format($send['total_nilaimarhun'], 2) }} </td>
+                            <td>{{ number_format($send['total_pembiayaan'] , 2) }} </td>
+                            <td>{{ number_format($send['total_bakipjm'] , 2) }} </td>
+                            <td>
+                                <a href=" {{ route('analisa.tempbycawsimulasi', [$send['kodcaw'],$t_gadai1,$fasa]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
+                            </td>
+                        </tr>
+                         @endif       
+                    @endforeach
+                </tbody>
+            </table>
+           
+            <div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
+                <a  href="{{ route('analisa.janasimulasi') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
+                <button type="submit" class="btn btn-success">Jana Simulasi</button>
+            </div> 
+        </form>
+        </div>
+    </div>
+</div>
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablesenaraitemp = $('#senaraitempsimulasi').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 8,
+                "orderable": false
+                }
+            ],
+            order: [[1, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+            //     {
+            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //         titleAttr: 'Export to CSV',
+            //         text: '<i class="fas fa-download"></i>',
+            //         action: function ( e, dt, node, config ) {
+            //             $("#exportform").submit();
+            //         }
+            //     }
+            // ]
+    });
+
+        // $('.addcaw').tooltip();
+        // $('.export').tooltip();
+        // // $( '.dt-buttons').addClass('btn-group');
+        // $( '.addcaw').removeClass('dt-button');
+        // $( '.export').removeClass('dt-button');
+</script>
+<script type='text/javascript'>
+    $(document).ready(function(){
+      // Check or Uncheck All checkboxes
+      $("#checkall").change(function(){
+        var checked = $(this).is(':checked');
+        if(checked){
+          $(".checkbox").each(function(){
+            $(this).prop("checked",true);
+          });
+        }else{
+          $(".checkbox").each(function(){
+            $(this).prop("checked",false);
+          });
+        }
+      });
+    
+     // Changing state of CheckAll checkbox 
+     $(".checkbox").click(function(){
+    
+       if($(".checkbox").length == $(".checkbox:checked").length) {
+         $("#checkall").prop("checked", true);
+       } else {
+         $("#checkall").prop("checked", false);
+       }
+   
+     });
+   });
+   </script>
+<script>
+$(function() {
+    $( "form" ).submit(function() {
+        $('#loader').show();
+        
+    });
+});
+</script>
+     
+@endsection
diff --git a/resources/views/simulasiujrah/showsimulasi.blade.php b/resources/views/simulasiujrah/showsimulasi.blade.php
new file mode 100644
index 00000000..d77eb647
--- /dev/null
+++ b/resources/views/simulasiujrah/showsimulasi.blade.php
@@ -0,0 +1,510 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('analisaujrah.senaraisimulasi') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        @php
+                          $today = date('d-m-Y');
+                        $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
+                        $t_lelong = $myDateTime->format('d-m-Y');
+                        @endphp
+                        butiran simulasi ujrah: {{$t_lelong}}
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+                    <nav>
+                        <div class="nav mb-3 nav-tabs" id="nav-tab" role="tablist">
+                            <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>
+                    </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">
+                            <form id="exportform" action="{{route('analisa.export')}}" method="POST">
+                                @csrf
+                                <input type="hidden" name="type" value="User">
+                                <input type="hidden" name="simulasiid" value="{{ $simulasi_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">
+                                                    <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">JBG</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">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="{{$simulasi->harga_emas_asas}}">
+                                                </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">
+                                            <div class="col-6">
+                                                <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>
+                                                    {{-- 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>
+                                                    {{-- <strong>Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}</strong> --}}
+                                                    @endif    
+                                                </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 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="{{ number_format($total_rugilelong, 2, '.', ',') }}">
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
+
+                                <div style="overflow-x: auto;">
+                                <table class="table text-right table-bordered" id="simulasi">
+                                    <thead class="bg-success text-center text-white">
+                                        <tr>
+                                            <th>No</th>
+                                            <th>Cawangan</th>
+                                            <th>Bil SAG</th>
+                                            <th>Berat (gm)</th>
+                                            <th>Nilai Marhun Asal (RM)</th>
+                                            <th>Pembiayaan (RM)</th>
+                                            <th>K.Ujrah(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>
+                                    </thead>
+                                    <tbody>
+
+                                        @foreach ($arraycaw as $index=>$caw)
+                                        <tr>
+                                            <td>{{$index+1}}</td>
+                                            <td style="white-space: nowrap;"><a href=" {{ route('analisaujrah.senaraimarhunlel',['simulasi_id'=>$simulasi_id,'cawid'=>$caw['id_cawangan']]) }} " 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['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>
+                                        @endforeach
+                                    </tbody>
+                                    <tfoot class="bg-light">
+                                        <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_cazlelong, 2, '.', ',') }}</b></td>--}}
+                                            <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                            <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                                        </tr>
+                                    </tfoot>
+
+                                </table>
+                                </div>
+
+                                <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
+                                <div style="overflow-x: auto;">
+                                <table width="50%" 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 ($simkarat 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>
+                                </div>
+                            </form>
+                            <a class="btn mt-4 btn-primary confirmDaftar" href="{{ route('lelongujrah.create',$simulasi_id) }}">Daftar Lelong</a>
+                        </div>
+                        <div class="tab-pane fade" id="nav-hargaasas" role="tabpanel" aria-labelledby="nav-hargaasas-tab">
+                            <br>
+                            <div class="row ">
+                                <div class="col-10 mx-auto">
+                                    <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini">Ubah</button>
+
+                                    <div id="hideform">
+                                        <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Per Gram (916) RM</label>
+                                        <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
+                                        <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Kemaskini</button>
+                                        <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Batal</button>
+                                    </div>
+
+                                </div>
+                            </div>
+                            <div class="row ">
+                                <div class="col-10 mx-auto">
+                                    <form action="{{ route('analisa.kemaskiniharga') }}" method="POST" id="formhargaasas">
+                                        @csrf
+                                        <div id='loader'><img id="loader-image" src="{{ asset('img/loadingmsg.gif') }}" alt="Sila Tunggu Sebentar..." /></div>
+                                        <input type="hidden" name="idsimulasi" value="{{$simulasi_id}}">
+                                        <table class="table table-bordered" id="kemaskinikarat" style="width:100%">
+                                            <thead class="bg-primary text-white">
+                                                <tr class="text-center">
+                                                    <th>Karat</th>
+                                                    <th>Keterangan</th>
+                                                    <th>Harga</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody class="text-center">
+                                                @foreach ($simkarat as $index=>$karat)
+                                                <tr>
+                                                    <td>{{$karat->karat}}</td>
+                                                    <td>{{$karat->keterangan}}</td>
+                                                    <td class="input">{{$karat->harga2}}</td>
+                                                    {{-- <td class="input"></td> --}}
+                                                </tr>
+                                                @endforeach
+                                            </tbody>
+
+                                        </table>
+                                </div>
+                            </div>
+                        </div>
+                    </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>
+    </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 = parseInt(hargaasasbaru);
+                //     let harga2 = parseInt(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));
+                // }
+            }
+        })
+
+    }
+
+    $('a.confirmDaftar').confirm({
+        title: 'Daftar Lelong',
+        content: 'Adakah anda pasti? Tindakan ini akan mengambil sedikit masa.',
+        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() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+
+    function save() {
+        $('#formhargaasas').submit();
+        $.dialog({
+            icon: 'fa fa-spinner fa-spin',
+            title: 'Dalam Proses !',
+            content: 'Halaman akan dikemaskini selepas proses selesai.',
+            closeIcon: false,
+            boxWidth: '500px',
+            useBootstrap: false,
+        });
+    }
+    $('a.confirmdel').confirm({
+        title: 'Pengesahan',
+        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({
+        "pageLength": 50,
+    });
+
+    var tableJumlahBerat = $('#jumlahberat').DataTable({
+        "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/routes/web.php b/routes/web.php
index e346b7b5..2c11970f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -117,6 +117,19 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct
     Route::get('/showsimulasiall/{kali}',['as'=>'analisa.showsimulasiall','uses'=>'SimulasiController@showsimulasiall']);
 });
 
+Route::group(['middleware' => ['permission:analisaujrah'],'prefix'=>'analisaujrah'], function () {
+    Route::get('/janasimulasi',['as'=>'analisaujrah.janasimulasi','uses'=>'SimulasiUjrahController@index']);
+    Route::post('/senaraitempsimulasi',['as'=>'analisaujrah.senaraitempsimulasi','uses'=>'SimulasiUjrahController@senaraitempsimulasi']); 
+    Route::post('/kemaskini',['as'=>'analisaujrah.kemaskiniharga','uses'=>'SimulasiUjrahController@kemaskini2']);
+    Route::post('/janadata2',['as'=>'analisaujrah.janadata2','uses'=>'SimulasiUjrahController@janadata2']);
+    Route::get('/senaraisimulasi',['as'=>'analisaujrah.senaraisimulasi','uses'=>'SimulasiUjrahController@senaraisimulasi']);
+    Route::get('/kemaskinidata/{simulasi_id}',['as'=>'analisaujrah.kemaskinidata','uses'=>'SimulasiUjrahController@kemaskinidata']);
+    Route::get('/showsimulasi/{id}',['as'=>'analisaujrah.show','uses'=>'SimulasiUjrahController@show']); 
+    Route::get('/deletesimulasi/{id}',['as'=>'analisaujrah.delete','uses'=>'SimulasiUjrahController@delete']);
+    Route::get('/senaraimarhunlel/{simulasi_id}/{cawid}',['as'=>'analisaujrah.senaraimarhunlel','uses'=>'SimulasiUjrahController@senaraimarhunlel']);
+    Route::get('/listsagbycust/{simulasi_id}/{cawid}',['as'=>'analisaujrah.listsagbycust','uses'=>'SimulasiUjrahController@listsagbycust']);
+});
+
 Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], function () {
     Route::get('/database',['as'=>'sistem.database','uses'=>'DatabaseController@index']);
     Route::get('/showConn/{id}',['as'=>'sistem.showConn','uses'=>'DatabaseController@showConn']);
@@ -189,6 +202,9 @@ Route::group(['prefix'=>'lelong'], function () {
    Route::get('/reportcajrugilelong/{lelongid}/{cawid}/{cajlelong}',['as'=>'lelong.reportcajrugilelong','uses'=>'LelongController@reportcajrugilelong']);
    Route::get('/ubahbidaan/{id}/{user_id}', ['as'=>'lelong.ubahbidaan','uses'=>'LelongController@ubahbidaan']);
 
+//lelong ujrah
+   Route::get('/createujrah/{id}',['as'=>'lelongujrah.create','uses'=>'LelongUjrahController@create']); 
+
 });
     Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); 
     Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']);
@@ -391,6 +407,11 @@ Route::group(['middleware' => ['permission:tetapan'],'prefix'=>'tetapan'], funct
     Route::get('/parameter',['as'=>'tetapan.parameter','uses'=>'TetapanController@parameter']); 
     Route::post('/addparameter',['as'=>'tetapan.addparameter','uses'=>'TetapanController@addparameter']); 
 });
+
+Route::group(['middleware' => ['permission:tetapanujrah'],'prefix'=>'tetapanujrah'], function () {
+    Route::get('/parameter',['as'=>'tetapanujrah.parameter','uses'=>'TetapanUjrahController@parameter']); 
+    Route::post('/addparameter',['as'=>'tetapanujrah.addparameter','uses'=>'TetapanUjrahController@addparameter']); 
+});
 //Operasi
 
 Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {