From 782262643a6f901555a7f815a8f46958250dede3 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Wed, 30 Mar 2022 11:00:20 +0800
Subject: [PATCH] update notis tamat kotrak operasi

---
 app/Http/Controllers/TamatKontController.php  | 90 +++++++------------
 .../jananotis/sebelumtamatkont.blade.php      | 10 +--
 .../views/jananotis/senaraitemp.blade.php     | 28 +++---
 3 files changed, 53 insertions(+), 75 deletions(-)

diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php
index 8e32313f..27f95d67 100644
--- a/app/Http/Controllers/TamatKontController.php
+++ b/app/Http/Controllers/TamatKontController.php
@@ -75,10 +75,41 @@ class TamatKontController extends Controller
     public function senaraitemp(Request $request)
     {
         $t_lelong = $request->tarikh_lelong;
-
+        
         if($t_lelong != null)
         {
-            return view('jananotis.sebelumtamatkont');
+            $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
+            ->where('sttebus', '=', '')
+            ->where('taglel', '=', 0)
+            ->where('tagpalsu', '=', 0)
+            ->where('tagpalsu2', '=', 0)
+            ->whereNotNull('upah12')
+            ->get()->toArray();
+            // dd($getsurat);
+                        
+            if(sizeof($getsurat) == 0)
+            {
+            return redirect()->route('notistamatkontrak.sebelumtamatkont')
+                    ->with('failed','Tiada surat untuk di lelong');
+            }
+            
+            $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
+            ->where('gadai.t_matang1', '<', $t_lelong)
+            ->where('gadai.sttebus', '=', '')
+            ->where('gadai.taglel', '=', 0)
+            ->where('gadai.tagpalsu', '=', 0)
+            ->where('gadai.tagpalsu2', '=', 0)
+            ->whereNotNull('gadai.upah12')
+            ->groupBy('gadai.kodcaw','cawangan.caw_name')
+            ->selectRaw('count(*) as bil_lelong, sum(berat) as total_berat,sum(nilaimarhun) as total_nilaimarhun,sum(pinjaman) as total_pembiayaan,sum(bakipjm) as total_bakipjm,gadai.kodcaw,cawangan.caw_name as caw_name')
+            ->get();            
+
+            $bil_lelong = sizeof($getsurat);
+
+            return view('jananotis.senaraitemp', compact( 't_lelong', 
+                                                        'getsurat',
+                                                        'senarai'
+                                                    ));
         }
         else
         {
@@ -86,61 +117,6 @@ class TamatKontController extends Controller
                              ->with('failed','Sila Masukkan Tarikh Lelongan');
         }
 
-        $getsurat = Gadai::where('t_matang1', '<', $t_lelong)
-                         ->where('sttebus', '=', '')
-                         ->where('taglel', '=', 0)
-                         ->where('tagpalsu', '=', 0)
-                         ->where('tagpalsu2', '=', 0)
-                         ->whereNotNull('upah12')
-                         ->get();
-        
-        $details =  Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
-                         ->where('t_matang1', '<', $t_lelong)
-                         ->where('sttebus', '=', '')
-                         ->where('taglel', '=', 0)
-                         ->where('tagpalsu', '=', 0)
-                         ->where('tagpalsu2', '=', 0)
-                         ->whereNotNull('upah12')
-                         ->select('gadai.kodcaw', 'cawangan.caw_name')
-                         ->groupBy('gadai.kodcaw', 'cawangan.caw_name')
-                         ->get()->toArray();
-                     
-                         
-        if(sizeof($getsurat) == 0)
-        {
-            return redirect()->route('notistamatkontrak.sebelumtamatkont')
-                        ->with('failed','Tiada surat untuk di lelong');
-        }
-
-        $total_berat = 0;
-        $total_nilaimarhun = 0;
-        $total_pembiayaan = 0;
-        $total_bakipjm = 0;
-        
-        foreach($getsurat as $index1=>$surats)
-        {
-            $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
-            ->where('norujukan', $surats['norujukan'])
-            ->get();            
-
-            $total_berat = $total_berat + $senarai->sum('berat');
-            $total_nilaimarhun = $total_nilaimarhun + $senarai->sum('nilaimarhun');
-            $total_pembiayaan = $total_pembiayaan + $senarai->sum('pinjaman');
-            $total_bakipjm = $total_bakipjm + $senarai->sum('bakipjm');
-        }
-
-            $bil_lelong = sizeof($getsurat);
-
-            return view('jananotis.senaraitemp', compact( 't_lelong', 
-                                                          'getsurat',
-                                                          'senarai',
-                                                          'details',
-                                                          'bil_lelong',
-                                                          'total_berat',
-                                                          'total_nilaimarhun',
-                                                          'total_pembiayaan',
-                                                          'total_bakipjm'
-                                                        ));
     }
 
     public function tempbycaw($details, $t_lelong)
diff --git a/resources/views/jananotis/sebelumtamatkont.blade.php b/resources/views/jananotis/sebelumtamatkont.blade.php
index 7630e56a..d223a71f 100644
--- a/resources/views/jananotis/sebelumtamatkont.blade.php
+++ b/resources/views/jananotis/sebelumtamatkont.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-4" 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('notistamatkontrak.senaraitemp')}}" id="formsenarai" method="POST">
               @csrf
                 <div class="form-group row" style="margin-top:2%; margin-left:1%;">
diff --git a/resources/views/jananotis/senaraitemp.blade.php b/resources/views/jananotis/senaraitemp.blade.php
index 6cf2f0c9..60f7fb99 100644
--- a/resources/views/jananotis/senaraitemp.blade.php
+++ b/resources/views/jananotis/senaraitemp.blade.php
@@ -34,19 +34,21 @@
                         </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]"></td>
-                        <td>{{ $details[0]['kodcaw'] }}</td>
-                        <td>{{ $details[0]['caw_name'] }}</td>
-                        <td>{{ $bil_lelong }} </td>
-                        <td>{{ $total_berat }} </td>
-                        <td>{{ $total_nilaimarhun }} </td>
-                        <td>{{ $total_pembiayaan }} </td>
-                        <td>{{ $total_bakipjm }} </td>
-                        <td>
-                            <a href=" {{ route('notistamatkontrak.tempbycaw', [$details[0]['kodcaw'], $t_lelong]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
-                        </td>
-                    </tr>
+                    @foreach($senarai as $send)
+                        <tr>
+                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]"></td>
+                            <td>{{ $send['kodcaw'] }}</td>
+                            <td>{{ $send['caw_name'] }}</td>
+                            <td>{{ $send['bil_lelong'] }} </td>
+                            <td>{{ $send['total_berat'] }} </td>
+                            <td>{{ $send['total_nilaimarhun'] }} </td>
+                            <td>{{ $send['total_pembiayaan'] }} </td>
+                            <td>{{ $send['total_bakipjm'] }} </td>
+                            <td>
+                                <a href=" {{ route('notistamatkontrak.tempbycaw', [$send['kodcaw'], $t_lelong]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Gadaian"><i class="far fa-edit"></i></a>
+                            </td>
+                        </tr>
+                    @endforeach
                 </tbody>
             </table>
             <div class="modal-footer; text-center" style="margin-top:2%; margin-bottom:2%;">