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 09/18] 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 @@
+ @if ($message = Session::get('failed'))
+
+ @endif
Notis Sebelum Tamat Kontrak
- @if ($message = Session::get('failed'))
-
- @endif