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

update 15/11/2022

Browse Source
This commit is contained in:
Amirah22
2022-11-15 16:16:23 +08:00
parent ae8135989b
commit 0918122d39
7 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+14 -7
View File
@@ -663,7 +663,7 @@ class LelongController extends Controller
$simulasi->delete();
return redirect()->route('lelong.senarailelong')
->with('success','Create Lelong Berjaya');
->with('success','Pendaftaran Lelong Berjaya');
}
@@ -678,6 +678,7 @@ class LelongController extends Controller
$currentdate = Carbon::now();
$currentdate2 = $currentdate->toDateString();
$lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at')
@@ -689,12 +690,19 @@ class LelongController extends Controller
foreach($lelong as $laporan)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
///////////// lelong belum mula
$lelong2 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
@@ -715,6 +723,7 @@ class LelongController extends Controller
////////// lelong selesai
$lelong3 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at')
->groupBy('lelong_id')
@@ -750,6 +759,7 @@ class LelongController extends Controller
/////////////// lelong jana pemenang
$lelong5 = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong','lelong.created_at')
->groupBy('lelong_id')
@@ -764,9 +774,6 @@ class LelongController extends Controller
->toArray();
array_push($arraydetails5,['laporan5' => $laporan5,'details5' => $details5]);
}
return view('lelong.senarailelong',compact('lelong', 'arraydetails',
'lelong2','arraydetails2',
@@ -3103,7 +3110,7 @@ class LelongController extends Controller
}
return redirect()->route('lelong.senarailelong')
->with('success','Create Lelong Berjaya');
->with('success','Pendaftaran Lelong Berjaya');
}
public function listsagbycust($lelongid, $cawid)
app/Http/Controllers/NotisController.php
+2 -15
View File
@@ -144,6 +144,7 @@ class NotisController extends Controller
$datalelong = $marhun->get();
$marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->select('nokp','norujukan')
->orderBy('nokp', 'asc')
->get();
// dd($marhuns);
$arraysag = [];
@@ -172,20 +173,6 @@ class NotisController extends Controller
}
// dd($marhuns->toArray());
// $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
// $datacustomer = $gadaicaw2->get();
// $customer = Customer::query()
// ->whereIn('kpbaru',$arraycustomer)
// ->orWhereIn('kplama',$arraycustomer)
// ->join('daerah','customer.koddaerah','=','daerah.koddaerah')
// ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri')
// ->join('poskod','customer.poskod','=','poskod.poskod')
// ->get()->toArray();
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan.caw_code','=',$user->kodcaw)
@@ -204,7 +191,7 @@ class NotisController extends Controller
$lelong_id = $request->lelong_id;
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();
resources/views/includes/sidebar.blade.php
+7 -6
View File
@@ -105,16 +105,17 @@
<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>
</li>
</ul>
<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 Peringatan Tamat Kontrak</a>
</li>
</ul>
{{-- <ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
<li class="{{ (request()->is('jananotis/pembida/*') || request()->is('jananotis/pembida') ) ? 'active' : '' }}">
<a href="{{url('jananotis/send-email')}}">Notis Pembida</a>
@@ -195,7 +196,7 @@
<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>
<a href="{{url('jananotis/notistamatkontrak')}}">Notis Peringatan Tamat Kontrak</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('jananotis/*')) ? 'show' : '' }}" id="jananotisSubmenu" >
resources/views/jananotis/notislelong.blade.php
+4 -3
View File
@@ -37,13 +37,14 @@
<td>{{ $bid->fasa }}</td>
<td>{{ $bid['bilangan'] }}</td>
<td class="text-center">
<a class="btn m-1 btn-primary" href="{{ route('jananotis.senarainotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Senarai Notis" ><i class="far fa-edit"></i></a>
@if($bid->fasa == '1')
<a href="{{ route('jananotis.jananotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Jana Notis Fasa 1" style="margin-right:40px" ><i class="fas fa-download"></i></a>
<a class="confirmrefresh btn m-1 btn-danger" href="{{ route('jananotis.jananotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Jana Notis Fasa 1" style="margin-right:40px" ><i class="fas fa-download"></i></a>
@elseif($bid->fasa == '2')
<a href="{{ route('jananotis.jananotisfasa2',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Jana Notis Fasa 2" style="margin-right:40px" ><i class="fas fa-download"></i></a>
<a class="confirmrefresh btn m-1 btn-danger" href="{{ route('jananotis.jananotisfasa2',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Jana Notis Fasa 2" style="margin-right:40px" ><i class="fas fa-download"></i></a>
@endif
<a href="{{ route('jananotis.senarainotis',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Senarai Notis" ><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
resources/views/jananotis/notistamatkontrak.blade.php
+1 -1
View File
@@ -14,7 +14,7 @@
<form action="{{route('jananotis.gadaibycaw')}}" method="POST" id="formsenarai">
@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>
<label for="tarikh_lelong" class="col-sm-1 col-form-label">Tarikh Tamat Kontrak</label>
<div>
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
</div>
resources/views/marhun/terimaserahmarhun.blade.php
+1 -1
View File
@@ -94,7 +94,7 @@
</div>
<div class="tab-pane fade" id="sudah-serah" role="tabpanel" aria-labelledby="sudah-serah-tab">
<div style="text-align: left;"> <a href="{{ route('marhun.cetakterimaserahmarhun', $lelong_id) }}" class="btn btn-info">Laporan Serahan Marhun Kepada Khazanah</a><br></div>
<div style="text-align: left;"> <a href="{{ route('marhun.cetakterimaserahmarhun', $lelong_id) }}" class="btn btn-info">Laporan Serahan Marhun Penilai</a><br></div>
<table class="table table-bordered table-hover" id="table-sudah-serah" style="width: 100%;">
<thead class="bg-primary text-white">
<tr>
resources/views/pdf/jananotis.blade.php
+16 -3
View File
@@ -158,7 +158,7 @@
<td width="15%">TARIKH CETAK
</td>
<td width="1%">:</td>
<td width="43%">@php
<td width="50%">@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@@ -174,6 +174,7 @@
<td>:</td>
<td>{{ $notis['norujukan']}}</td>
<td></td>
<td></td>
<td width="14%">NO TELEFON</td>
<td width="1%">:</td>
<td>{{ $notis['nama']['telefon'] }}</td>
@@ -187,6 +188,8 @@
{{-- {!! ($notis['nama']['alamat1'] === null || $notis['nama']['alamat1'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat1']) !!} <br> --}}
{!! ($notis['nama']['alamat2'] === null || $notis['nama']['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['nama']['alamat2']) !!} <br>
{{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}}</td>
<td></td>
<td></td>
<td style="vertical-align:top;">NO K/P</td>
<td style="vertical-align:top;">:</td>
@@ -197,7 +200,7 @@
@foreach ($lelongid as $bid)
<p>Tuan/Puan,</p>
<h4>LELONGAN BARANGAN GADAIAN SECARA TENDER PADA
<h4>LELONGAN AWAM BARANG GADAIAN PADA
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
$datez = $myDateTime->format('d-m-Y');
@@ -232,7 +235,7 @@
</table>
<p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut <b>pada atau sebelum
<p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut dikaunter cawangan <br><b>sebelum
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
$datez = $myDateTime->modify('-2 day')->format('d-m-Y');
@@ -242,9 +245,19 @@
@php echo $caw['para2']; @endphp
{{-- <p>Bayaran kini boleh dibuat secara atas talian melalui https://pay.arrahn.com.my  <b>sebelum
@php
$myDateTime2 = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
$datez2 = $myDateTime2->modify('-3 day')->format('d-m-Y');
echo($datez2);
@endphp:-</b>
</p> --}}
<p>Notis:</p>
<i>Sila bawa bersama Surat Akaun Gadai (SAG) untuk sebarang urusan.</i>
<br>
<i>Sila abaikan notis ini sekiranya penebusan telah dibuat.</i>
<p>Surat ini adalah cetakan komputer dan tiada tandatangan diperlukan</p>