From c4f548b1e972d935e6f8be6de516f5aaca1487e9 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Wed, 30 Mar 2022 09:36:35 +0800
Subject: [PATCH] update error message

---
 app/Http/Controllers/TamatKontController.php  | 24 +++++++++++++++++--
 .../jananotis/notistamatkontrak.blade.php     | 10 ++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index ddb36fe7..f79827c3 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -17,15 +17,25 @@ class TamatKontController extends Controller
     //PC
     public function notistamatkontrak(Request $request) 
     {
-        
         return view('jananotis.notistamatkontrak');
         
     }
 
     public function gadaibycaw(Request $request)
     {
-        $user = Auth::user();
         $t_lelong = $request->tarikh_lelong;
+
+        if($t_lelong != null)
+        {
+            return view('jananotis.notistamatkontrak');
+        }
+        else
+        {
+            return redirect()->route('jananotis.notistamatkontrak')
+                             ->with('failed','Sila Masukkan Tarikh Lelongan');
+        }
+
+        $user = Auth::user();
         $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
                          ->where('kodcaw', $user->kodcaw)
                          ->where('sttebus', '=', '')
@@ -66,6 +76,16 @@ class TamatKontController extends Controller
     {
         $t_lelong = $request->tarikh_lelong;
 
+        if($t_lelong != null)
+        {
+            return view('jananotis.notistamatkontrak');
+        }
+        else
+        {
+            return redirect()->route('jananotis.notistamatkontrak')
+                             ->with('failed','Sila Masukkan Tarikh Lelongan');
+        }
+        
         $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
                          ->where('sttebus', '=', '')
                          ->where('taglel', '=', 0)
diff --git a/resources/views/jananotis/notistamatkontrak.blade.php b/resources/views/jananotis/notistamatkontrak.blade.php
index 3e6a4624..3b6c8f1e 100644
--- a/resources/views/jananotis/notistamatkontrak.blade.php
+++ b/resources/views/jananotis/notistamatkontrak.blade.php
@@ -4,13 +4,13 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-12 mx-auto card">
+          @if ($message = Session::get('failed'))
+              <div class="alert alert-danger" style="margin-top:1%;">
+                  <p>{{ $message }}</p>
+              </div>
+          @endif
             <h3 class="pt-3" style="margin-left:2%;">Notis Sebelum Tamat Kontrak</h3>
             
-            @if ($message = Session::get('failed'))
-                <div class="alert alert-danger">
-                    <p>{{ $message }}</p>
-                </div>
-            @endif
             <form action="{{route('jananotis.gadaibycaw')}}" method="POST" id="formsenarai">
               @csrf
                 <div class="form-group row" style="margin-top:2%; margin-left:1%;">