diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index c59d8d5c..74038170 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -58,7 +58,6 @@ class SimulasiController extends Controller
     public function janadata(Request $request)
     {
         
-        
         $t_lelong = Carbon::parse($request->tarikh_lelong);
         $bulan = (int)round($request->jbg);
         $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
new file mode 100644
index 00000000..339c023f
--- /dev/null
+++ b/app/Http/Controllers/TamatKontController.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+use App\Models\Gadai;
+use App\Models\GadaiMarhun;
+
+class TamatKontController extends Controller
+{
+    public function notistamatkontrak(Request $request)
+    {
+        $t_lelong = Carbon::parse($request->tarikh_lelong);
+        $bulan = 12;
+        $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
+        // dd($jbgadai);
+        $surat = Gadai::where('t_gadai','<=',$jbgadai)
+                        ->where('t_matang1','<=','t_lelong')
+                        ->whereNotNull('upah12')
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('lelong_tawarruq','=',1)
+                        ->orderBy('norujukan','desc')
+                        ->get();
+        
+        if(sizeof($surat) == 0)
+        {
+            // return redirect()->route('jananotis.notistamatkontrak')
+            //             ->with('failed','Tiada surat untuk di lelong');
+        }
+        
+        return view('jananotis.notistamatkontrak',compact('t_lelong', 'jbgadai'));
+        
+    }
+    
+    public function sebelumtamatkont(Request $request)
+    {
+        $t_lelong = Carbon::parse($request->tarikh_lelong);
+        $bulan = 12;
+        $jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
+        // dd($jbgadai);
+        $surat = Gadai::where('t_gadai','<=',$jbgadai)
+                        ->where('t_matang1','<=','t_lelong')
+                        ->whereNotNull('upah12')
+                        ->where('sttebus','=','')
+                        ->where('tagpalsu','=',0)
+                        ->where('tagpalsu2','=',0)
+                        ->where('taglel','=',0)
+                        ->where('lelong_tawarruq','=',1)
+                        ->orderBy('norujukan','desc')
+                        ->get();
+        // dd($surat);
+        if(sizeof($surat) == 0)
+        {
+            // return redirect()->route('jananotis.notistamatkontrak')
+            //             ->with('failed','Tiada surat untuk di lelong');
+        }
+        
+        return view('jananotis.sebelumtamatkont',compact('t_lelong', 'jbgadai'));
+    }
+}
diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php
index 35b520c2..cc004140 100644
--- a/database/seeders/RolesSeeder.php
+++ b/database/seeders/RolesSeeder.php
@@ -111,6 +111,10 @@ class RolesSeeder extends Seeder
             'name' => 'pengesahan',
             'description' => 'Pengesahan Perubahan Mutu Marhun'
         ]);
+        Permission::create([
+            'name' => 'notistamatkontrak',
+            'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
+        ]);
 
         //account
         Permission::create([
@@ -163,6 +167,7 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('analisa');
         $role6->givePermissionTo('pengesahanpembida');
         $role6->givePermissionTo('pengesahan');
+        $role6->givePermissionTo('notistamatkontrak');
 
         $role7 = Role::create(['name' => 'account']);
         $role7->givePermissionTo('pengesahanbayaran');
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 86dd6c49..c5a9d32c 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -64,6 +64,11 @@
       
       <li class="{{ (request()->is('')) ? 'active' : '' }}">
         <a href="#jananotisSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Notis Lelong</a>
+        <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
+          <li class="{{ (request()->is('jananotis/notistamatkontrak/*') || request()->is('jananotis/notistamatkontrak') ) ? 'active' : '' }}">
+            <a href="{{url('jananotis/notistamatkontrak')}}">Notis Sebelum Tamat Kontrak</a>
+          </li>
+        </ul>
         <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
           <li class="{{ (request()->is('jananotis/notislelong/*') || request()->is('jananotis/notislelong') ) ? 'active' : '' }}">
             <a href="{{url('jananotis/notislelong')}}">Jana Notis Lelong</a>
@@ -93,6 +98,9 @@
       </li>
       @endhasrole
       @hasrole('operasi')
+      <li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
+        <a href="{{url('notistamatkontrak/sebelumtamatkont')}}">Notis Tamat Kontrak</a>
+      </li>
       <li class="{{ (request()->is('analisa/*')) ? 'active' : '' }}">
         <a href="#analisaSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Simulasi</a>
         <ul class="list-unstyled collapse {{ (request()->is('analisa/*')) ? 'show' : '' }}" id="analisaSubmenu" >
diff --git a/resources/views/jananotis/notistamatkontrak.blade.php b/resources/views/jananotis/notistamatkontrak.blade.php
new file mode 100644
index 00000000..41a97f08
--- /dev/null
+++ b/resources/views/jananotis/notistamatkontrak.blade.php
@@ -0,0 +1,40 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-12 mx-auto card">
+            <h3 class="pt-3">Notis Sebelum Tamat Kontrak</h3>
+            
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <form action="{{route('jananotis.notistamatkontrak')}}" method="POST">
+              @csrf
+                <div class="form-group row" style="margin-top:2%; margin-left:1%;">
+                  <label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
+                  <div>
+                    <input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
+                  </div>
+                  <label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Tempoh</label>
+                  <div>
+                    <input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="12" disabled>
+                  </div>
+                </div>
+                
+                <div class="form-group row" style="margin-top:2%;">
+                  <div class="col-sm-10">
+                    <submit class="btn btn-primary" style="width:8%; margin-left:1%;">Carian</submit>
+                  </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script>
+    
+</script>
+     
+@endsection
diff --git a/resources/views/jananotis/sebelumtamatkont.blade.php b/resources/views/jananotis/sebelumtamatkont.blade.php
new file mode 100644
index 00000000..fb003b16
--- /dev/null
+++ b/resources/views/jananotis/sebelumtamatkont.blade.php
@@ -0,0 +1,40 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-12 mx-auto card">
+            <h3 class="pt-3">Notis Sebelum Tamat Kontrak</h3>
+            
+            @if ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+            @endif
+            <form action="{{route('notistamatkontrak.sebelumtamatkont')}}" method="POST">
+              @csrf
+                <div class="form-group row" style="margin-top:2%; margin-left:1%;">
+                  <label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Lelongan</label>
+                  <div>
+                    <input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh Lelongan">
+                  </div>
+                  <label for="tempoh" class="col-sm-1 col-form-label" style="margin-left:3%;">Tempoh</label>
+                  <div>
+                    <input type="text" class="form-control" id="tempoh" name="tempoh" placeholder="12" disabled>
+                  </div>
+                </div>
+                
+                <div class="form-group row" style="margin-top:2%;">
+                  <div class="col-sm-10">
+                    <submit class="btn btn-primary" style="width:8%; margin-left:1%;">Carian</submit>
+                  </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+<script>
+    
+</script>
+     
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 6be473f8..99e95532 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -164,6 +164,10 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'],
     Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']);
     Route::get('/lelbidmarhun/{id}/{norujukan}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']);
 });
+
+Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {
+    Route::get('/sebelumtamatkont',['as'=>'notistamatkontrak.sebelumtamatkont','uses'=>'TamatKontController@sebelumtamatkont']); 
+});
 //Operasi
 
 Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () { 
@@ -197,6 +201,7 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
 
 Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () { 
     Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']); 
+    Route::get('/notistamatkontrak',['as'=>'jananotis.notistamatkontrak','uses'=>'TamatKontController@notistamatkontrak']); 
     Route::get('/pembida',['as'=>'jananotis.pembida','uses'=>'NotisController@pembida']); 
     Route::get('/senarainotis/{lelong_id}',['as'=>'jananotis.senarainotis','uses'=>'NotisController@senarainotis']); 
     Route::get('/jananotis/{lelong_id}',['as'=>'jananotis.jananotis','uses'=>'NotisController@jananotis']);