KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'atie' into 'main'

Browse Source 
update tarikh tamat kontrak

See merge request online-sistem1/lelong!21
This commit is contained in:
Nur Izzati Zulkifli
2022-04-25 06:26:27 +00:00
parent 3c76260e4b 725d63898c
commit ef91c9de5c
2 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TamatKontController.php
+23 -6
View File
@@ -12,6 +12,8 @@ use App\Models\GadaiMarhun;
use App\Models\Cawangan;
use App\Models\TransaksiKeuntungan;
use DateTime;
class TamatKontController extends Controller
{
//PC
@@ -62,7 +64,9 @@ class TamatKontController extends Controller
$tarikh_lelong = Carbon::parse($t_lelong);
$t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
$t_anggaran = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
// $t_anggaran = date('d-m-Y', strtotime('-1 months', strtotime($tarikh_lelong)));
foreach($getsurat as $index1=>$surats)
{
@@ -80,6 +84,7 @@ class TamatKontController extends Controller
't_lelong',
'user',
't_gadais',
't_gadaisehingga',
't_anggaran',
'bil_lelongcaw'
));
@@ -106,6 +111,12 @@ class TamatKontController extends Controller
public function senaraitemp(Request $request)
{
$t_lelong = $request->tarikh_lelong;
$tarikh_lelong = Carbon::parse($t_lelong);
$t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
if($t_lelong != null)
{
@@ -131,8 +142,12 @@ class TamatKontController extends Controller
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
->first();
// $t_gadais = $request->t_gadai;
// $t_gadaisehingga = Carbon::parse($t_gadais);
// $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
//
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('gadai.t_matang1', '<', $t_lelong)
->where('gadai.sttebus', '=', '')
@@ -147,8 +162,7 @@ class TamatKontController extends Controller
sum(pinjaman) as total_pembiayaan,
sum(bakipjm) as total_bakipjm,
gadai.kodcaw,
cawangan.caw_name as caw_name'
)
cawangan.caw_name as caw_name')
->get();
$bil_lelong = sizeof($getsurat);
@@ -156,7 +170,10 @@ class TamatKontController extends Controller
return view('jananotis.senaraitemp', compact( 't_lelong',
'getsurat',
'senarai',
't_gadais'
't_gadais',
't_anggaran',
't_daftarlelong',
't_lelongdisplay'
));
}
else
resources/views/jananotis/senaraitemp.blade.php
+17 -3
View File
@@ -14,9 +14,23 @@
<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_lelong }}</p>
<p> <b>Tarikh Gadai Sehingga : </b>{{ $t_gadais->t_gadai }}</p>
<p> <b>Anggaran Tarikh Daftar Lelong : </b>{{ $t_anggaran }}</p>
<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);
@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);
@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);
@endphp</p>
</div>
</div>
</div>