diff --git a/app/Http/Controllers/PenggunaController.php b/app/Http/Controllers/PenggunaController.php
index ad9ec588..d5d468e3 100644
--- a/app/Http/Controllers/PenggunaController.php
+++ b/app/Http/Controllers/PenggunaController.php
@@ -33,8 +33,8 @@ class PenggunaController extends Controller
     public function index()
     {
         // $alluser = User::all();
-        $alluser = User::with('roles')->get();
-        $allroles = Role::all()->pluck('name');
+        $alluser = User::with('roles')->orderBy('id')->get();
+        $allroles = Role::all();
         $caw = Cawangan::all();
         $user = User::with('roles')->first();
         $userroles = $user->getRoleNames()->toArray();
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 3c9b092b..c80df8ea 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -112,10 +112,11 @@ class SimulasiController extends Controller
             $simkarat->save();
         }
 
-
+        //$fasa = $request->fasa;
         // join cawangan yang terlibat dengan simulasi
         if($request->caw && $request->caw == 'all')
         {
+            //dd($request->fasa);
             foreach($cawangan as $key=>$caw)
             {
                 
@@ -124,6 +125,7 @@ class SimulasiController extends Controller
                 $caw_simulasi->caw_id = $caw->id;
                 $caw_simulasi->online = 'Online';
                 $caw_simulasi->lokasi = $caw->lokasi;
+                $caw_simulasi->fasa = $request->fasa;
                 $caw_simulasi->save();
 
                 $suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
@@ -211,6 +213,7 @@ class SimulasiController extends Controller
             $caw_simulasi->caw_id = $cawsimulasi->id;
             $caw_simulasi->online = 'Online';
             $caw_simulasi->lokasi = $cawsimulasi->lokasi;
+            $caw_simulasi->fasa = $request->fasa;
             $caw_simulasi->save();
             // dd($caw_simulasi);
             
@@ -304,7 +307,7 @@ class SimulasiController extends Controller
         $arrayinfo = [];
 
         $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
-        ->select('simulasi_id','tarikh_lelong')
+        ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa')
         ->groupBy('simulasi_id')
         ->get()
         ->toArray();
diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index b79e75c9..f7fdcd70 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -5,12 +5,28 @@ namespace App\Http\Controllers;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Carbon\Carbon;
+use Spatie\Permission\Models\Role;
+use Spatie\Permission\Models\Permission;
 
 use App\Models\User;
 use App\Models\Gadai;
 use App\Models\GadaiMarhun;
 use App\Models\Cawangan;
 use App\Models\TransaksiKeuntungan;
+use PDF;
+use App\Models\Simulasi;
+use App\Models\SimulasiBid;
+use App\Models\SimulasiBidMarhun;
+use App\Models\SimKarat;
+use App\Models\SimKarat_temp;
+use App\Models\CawanganSimulasi;
+use App\Models\JenisEmas;
+use App\Models\JenisKarat;
+use App\Models\Lelong;
+use App\Models\CawanganLelong;
+use App\Models\LelongBid;
+use App\Models\LelongBidMarhun;
+use App\Models\LelKarat;
 
 use DateTime;
 
@@ -140,9 +156,11 @@ class TamatKontController extends Controller
                              ->where('tagpalsu', '=', 0)
                              ->where('tagpalsu2', '=', 0)
                              ->whereNotNull('upah12')
+                             ->where('t_matang1', '<', $t_lelong)
                              ->orderBy('t_gadai')
-                             ->select('t_gadai')
-                             ->first();      
+                             ->select('t_gadai', 'norujukan')
+                             ->first();    
+                            //dd($t_gadais);  
             // $t_gadais = $request->t_gadai;                 
             // $t_gadaisehingga = Carbon::parse($t_gadais);
             // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
@@ -235,6 +253,157 @@ class TamatKontController extends Controller
                                            't_lelongdisplay'
                                            ));
     }
+    public function janadatatamatkontrak(Request $request)
+    {
+        //dd($request->all());
+        $t_lelong = Carbon::parse($request->trkh_lelong);
+        $bulan = (int)round('12.00');
+        $fasa = '2';
+        $jbg = '12';
+        $cajlelong = '3';
+        //dd($t_lelong);
+        $t_gadai = $request->t_gadai;
+       //dd($t_gadai);
+       if($fasa == '2'){
+            $surat = Gadai::where('t_matang1','<',$t_lelong)
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->get();   
+          
+        } 
+       //dd($surat);
+       // dd($jbg);
+        if(sizeof($surat) == 0)
+        {
+            return redirect()->route('analisa.janasimulasi')
+                        ->with('failed','Tiada surat untuk di lelong');
+        }          
+        $cawangan = Cawangan::all();
+        //create simulasi
+        $simulasi = new Simulasi;
+        $simulasi->tarikh_lelong = $request->trkh_lelong;
+        $simulasi->harga_emas_asas = "0.00";
+        $simulasi->jbg = $jbg;
+        $simulasi->cajlelong = $cajlelong;
+        $simulasi->fasa = $fasa;
+        $simulasi->save();
+
+        //create harga asas berdasarkan input harga asas
+        $karat = JenisKarat::all();
+        $hargaasas = $request->hargaasas;  //rial
+        foreach($karat as $item)
+        {
+            $simkarat = new SimKarat;
+            $simkarat->simulasi_id = $simulasi->id;
+            $simkarat->karat = $item->karat;
+            $simkarat->keterangan = $item->keterangan;
+            $simkarat->harga = ($hargaasas + ($item->dariharga916));   //gram
+            $simkarat->harga2 = $hargaasas + ($item->dariharga916);   //rial
+            $simkarat->save();
+        }
+
+        //$fasa = $request->fasa;
+        // join cawangan yang terlibat dengan simulasi
+        if($request->caw && $request->caw != 'all')
+        {
+           // dd($request->kodcaw);
+            $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
+            // dd($caw);
+            foreach($caw as $index=>$cawsimulasi){ 
+                // dd($cawsimulasi->id);
+            $caw_simulasi = new CawanganSimulasi;
+            $caw_simulasi->simulasi_id = $simulasi->id;
+            $caw_simulasi->caw_id = $cawsimulasi->id;
+            $caw_simulasi->online = 'Online';
+            $caw_simulasi->lokasi = $cawsimulasi->lokasi;
+            $caw_simulasi->fasa = $request->fasa;
+            $caw_simulasi->save();
+            // dd($caw_simulasi);
+            
+            $suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
+
+            // $simulasibid = SimulasiBid::where('caw_id','=',$caw->id)->get();
+            foreach($suratcaw as $data)
+            {
+                $simulasibid = new SimulasiBid;
+                $simulasibid->simulasi_id = $simulasi->id;
+                $simulasibid->caw_id = $cawsimulasi->id;
+                $simulasibid->kodcaw = $data->kodcaw;
+                $simulasibid->norujukan = $data->norujukan;
+                $simulasibid->t_lelong = $request->trkh_lelong;
+                $simulasibid->hargaasas = 0.00;
+                $simulasibid->hargajual = 0.00;
+                $simulasibid->jbg = $data->jbg;
+                $simulasibid->kadarupah = $data->kadarupah;
+                $simulasibid->upahsimpan = $data->upahSim;
+                $simulasibid->ansuran = $data->ansuran;
+                $simulasibid->nilaimarhun = $data->nilaimarhun;
+                $simulasibid->pinjaman = $data->pinjaman;
+                $simulasibid->bakiupah = $data->bakiupah;
+                $simulasibid->cajlain = $data->cajlain;
+                $simulasibid->cajlelong = 0.00;
+                $simulasibid->baki = 0.00;
+                $simulasibid->berat = $data->berat;
+                $simulasibid->marhun = $data->marhun;
+                $simulasibid->percent = $data->percentpinj;
+                $simulasibid->status_jual = 0;
+                $simulasibid->status_payment = 0;
+                $simulasibid->mora_upah = 0;
+                $simulasibid->save();
+
+                $sumhargaasas = 0;
+                $berat = 0;
+                $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
+                foreach($gadaimarhun as $marhun)
+                {
+                    $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
+                    // dd($simkarat);
+                    foreach($simkarat as $karat)
+                    {
+                        
+                        if($karat->karat == $marhun->karat)
+                        {
+                            $val = round($marhun->berat * $karat->harga); 
+                            $sumhargaasas = $sumhargaasas + $val;
+                            $berat = $berat + $marhun->berat;
+
+                            $simmarhun = new SimulasiBidMarhun;
+                            $simmarhun->simulasibid_id = $simulasibid->id;
+                            $simmarhun->bil = $marhun->bil;
+                            $simmarhun->marhun = $marhun->marhun;
+                            $simmarhun->nota = $marhun->nota;
+                            $simmarhun->karat = $marhun->karat;
+                            $simmarhun->berat = $marhun->berat;
+                            $simmarhun->harga = $karat->harga;
+                            $simmarhun->n_marhun = $marhun->berat * $karat->harga;
+                            $simmarhun->hargaasas = $val;
+                            $simmarhun->save();
+                        }
+                    }
+
+                    
+                }
+                
+
+                $calcaj = ($request->cajlelong/100)*$sumhargaasas;
+                $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
+                $updatesimbid->hargaasas = $sumhargaasas;
+                $updatesimbid->cajlelong = $calcaj;
+                $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
+                $updatesimbid->berat = $berat;
+                $updatesimbid->save();  
+            }
+        }
+        }
+        else
+        {
+            dd('error');
+        }
+
+        return redirect()->route('analisa.show',$simulasi->id);
+    }
 
     // public function janasimulasi($t_lelong, )
 }
diff --git a/database/migrations/2021_12_14_041545_create_simulasis_table.php b/database/migrations/2021_12_14_041545_create_simulasis_table.php
index c0323d01..6274d135 100644
--- a/database/migrations/2021_12_14_041545_create_simulasis_table.php
+++ b/database/migrations/2021_12_14_041545_create_simulasis_table.php
@@ -35,6 +35,7 @@ class CreateSimulasisTable extends Migration
             $table->date('export_data_stsdate')->nullable();
             $table->date('import_data_sts_date')->nullable();
             $table->string('lokasi')->nullable();
+            $table->integer('fasa')->default(0);
             $table->timestamps();
 
             $table->foreign('caw_id')
diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php
index 19800d73..f6f5802e 100644
--- a/resources/views/jananotis/senaraitemp.blade.php
+++ b/resources/views/jananotis/senaraitemp.blade.php
@@ -10,31 +10,38 @@
                 </div>
             @endif
             <h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan</h3>
-            
+            <form action="{{route('notistamatkontrak.janadatatamatkontrak')}}" method="POST" enctype="multipart/form-data">
+            @csrf
+           
             <div class="container">
                 <div class="row mb-2">
                     <div class="col-md-11 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
                             
                         <p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
                         <p> <b>Tarikh Gadai Sehingga : </b> @php 
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
-                            $datez = $myDateTime->format('d-m-Y');
-                            echo($datez);
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
+                            $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y');
+                            $t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d');
+                            echo($tarikhlelong);
                             @endphp</p>
                         <p> <b>Tarikh Perlu Blast Notis SMS(30 Hari) : </b> @php 
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
-                            $datez1 = $myDateTime->modify('-1 month')->format('d-m-Y');
-                            echo($datez1);
+                            $trkh_lelong = $myDateTime->format('Y-m-d');
+                            $tblastnotis = $myDateTime->modify('-1 month')->format('d-m-Y');
+                            echo($tblastnotis);
                             @endphp</p>
                         <p> <b>Tarikh Perlu Daftar Batch Lelong(20 Hari) : </b>@php 
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
-                            $datez1 = $myDateTime->modify('-20 days')->format('d-m-Y');
-                            echo($datez1);
+                            $tdaftarbatch = $myDateTime->modify('-20 days')->format('d-m-Y');
+                            echo($tdaftarbatch);
                             @endphp</p>
+                            <input type="hidden" class="form-control" id="trkh_lelong" name="trkh_lelong" value="@php echo($trkh_lelong) @endphp">
+                            <input type="hidden" class="form-control" id="t_gadai" name="t_gadai" value="@php echo($t_gadai) @endphp">
+
                     </div>
                 </div>
-            </div>
-            <table class="table table-striped  table-xl text-center" id="senaraitemp" style="width:100%">
+             </div>
+             <table class="table table-striped  table-xl text-center" id="senaraitemp" style="width:100%">
                 <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
@@ -51,7 +58,7 @@
                 <tbody>
                     @foreach($senarai as $send)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]"></td>
+                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $send['kodcaw'] }}"></td>
                             <td>{{ $send['kodcaw'] }}</td>
                             <td>{{ $send['caw_name'] }}</td>
                             <td>{{ $send['bil_lelong'] }} </td>
@@ -66,10 +73,12 @@
                     @endforeach
                 </tbody>
             </table>
+           
             <div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">
                 <a  href="{{ route('notistamatkontrak.sebelumtamatkont') }}" class="btn btn-primary" style="width:8%;">Kembali</a>
-                <a  href="{{ route('analisa.janadata') }}" class="btn btn-success" style="width:8%; margin-left:1%;">Jana Simulasi</a>
-            </div>
+                <button type="submit" class="btn btn-success">Jana Simulasi</button>
+            </div> 
+        </form>
         </div>
     </div>
 </div>
diff --git a/resources/views/jananotis/tempbycaw.blade.php b/resources/views/jananotis/tempbycaw.blade.php
index e73c41ba..167f2cbb 100644
--- a/resources/views/jananotis/tempbycaw.blade.php
+++ b/resources/views/jananotis/tempbycaw.blade.php
@@ -19,7 +19,7 @@
                         <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
                         <p> <b>Tarikh Lelong : </b> {{ $t_lelongdisplay }}</p>
                         <p> <b>Tarikh Gadai Sehingga : </b> @php 
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_gadais->t_gadai );
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong );
                             $datez = $myDateTime->format('d-m-Y');
                             echo($datez);
                             @endphp</p>
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 02211990..174a0e6d 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -18,6 +18,7 @@
                             <th>No</th>
                             <th>Lelong ID</th>
                             <th>Tarikh Lelong</th>
+                            <th>Fasa</th>
                             <th>Cawangan</th>                   
                             <th class="text-center">Action</th>
                         </tr>
@@ -29,9 +30,10 @@
                             <td>{{$loop->iteration}}</td>
                             <td>{{$info['info']['simulasi_id']}}</td>
                             <td>{{$info['info']['tarikh_lelong']}}</td>
-                            <td>
+                            <td>{{$info['info']['fasa']}}</td>
+                            <td align = 'left'>
                             @foreach($info['detailsinfo'] as $info2)
-                            <span class="m-2">{{$info2['caw_name']}}</span><br>
+                           {{$info2['caw_name']}}<br>
                             @endforeach
                             </td>
                             <td class="text-center">
diff --git a/routes/web.php b/routes/web.php
index 31f8c5f3..0f07ced7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -204,6 +204,7 @@ Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notist
     Route::get('/sebelumtamatkont',['as'=>'notistamatkontrak.sebelumtamatkont','uses'=>'TamatKontController@sebelumtamatkont']); 
     Route::post('/senaraitemp',['as'=>'notistamatkontrak.senaraitemp','uses'=>'TamatKontController@senaraitemp']); 
     Route::get('/tempbycaw/{details}/{t_lelong}',['as'=>'notistamatkontrak.tempbycaw','uses'=>'TamatKontController@tempbycaw']); 
+    Route::post('/janadatatamatkontrak',['as'=>'notistamatkontrak.janadatatamatkontrak','uses'=>'TamatKontController@janadatatamatkontrak']);
 });
 
 Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'], function () {