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

Merge branch 'atie' into 'main'

Browse Source 
update checkbox dan filter

See merge request online-sistem1/lelong!396
This commit is contained in:
Nur Izzati Zulkifli
2023-02-27 06:20:00 +00:00
parent eb3772ba95 4db72d361c
commit fe21beea7c
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+16 -13
View File
@@ -4306,22 +4306,25 @@ class LelongController extends Controller
$query->where('caw_code','=',$kodcaw);
}])->get();
// dd($lelong);
// dd($lelongAll);
foreach($lelongAll as $laporan)
{
// dd($laporan['tarikh_lelong']);
$tarikh = DateTime::createFromFormat('Y-m-d', $laporan['tarikh_lelong']);
$tarikh_lelong = $tarikh->format('d-m-Y');
if ($laporan->sts_lelong == 0) {
array_push($arraydetails0, $laporan);
} elseif ($laporan->sts_lelong == 1) {
array_push($arraydetails1, $laporan);
} elseif ($laporan->sts_lelong == 2) {
array_push($arraydetails2, $laporan);
} elseif ($laporan->sts_lelong == 3) {
array_push($arraydetails3, $laporan);
// dump($laporan->cawangan->isNotEmpty());
if($laporan->cawangan->isNotEmpty()){
// dd($laporan['tarikh_lelong']);
$tarikh = DateTime::createFromFormat('Y-m-d', $laporan['tarikh_lelong']);
$tarikh_lelong = $tarikh->format('d-m-Y');
if ($laporan->sts_lelong == 0) {
array_push($arraydetails0, $laporan);
} elseif ($laporan->sts_lelong == 1) {
array_push($arraydetails1, $laporan);
} elseif ($laporan->sts_lelong == 2) {
array_push($arraydetails2, $laporan);
} elseif ($laporan->sts_lelong == 3) {
array_push($arraydetails3, $laporan);
}
}
}
resources/views/lelong/senarailelong.blade.php
+1 -1
View File
@@ -132,7 +132,7 @@
<td>{{$lelong->harga_emas_asas}}</td>
<td>{{$lelong->jbg}}</td>
<td>{{$lelong->cajlelong}}</td>
<td><span class="badge badge-pill badge-warning">LELONG SEDANG DIJANLANKAN</span></td>
<td><span class="badge badge-pill badge-warning">LELONGAN SEDANG BERLANGSUNG</span></td>
</tr>
@endforeach
</tbody>
resources/views/lelong/senarailelongpc.blade.php
+1 -1
View File
@@ -130,7 +130,7 @@
<td>{{$lelong->harga_emas_asas}}</td>
<td>{{$lelong->jbg}}</td>
<td>{{$lelong->cajlelong}}</td>
<td><span class="badge badge-pill badge-warning">LELONG SEDANG DIJANLANKAN</span></td>
<td><span class="badge badge-pill badge-warning">LELONGAN SEDANG BERLANGSUNG</span></td>
</tr>
@endforeach
</tbody>
resources/views/lelong/senaraimarhun.blade.php
+8 -6
View File
@@ -65,6 +65,7 @@
<table class="table text-right table-bordered" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Tindakan</th>
<th>No</th>
<th>No Rujukan</th>
{{-- <th>Nama Pelanggan</th> --}}
@@ -76,7 +77,7 @@
<th>Caj Lelong (RM)</th>
<th>Harga Asas (RM)</th>
<th>Baki Lelong (RM)</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@@ -86,6 +87,9 @@
@endphp
@foreach ($marhuns as $index=> $marhun)
<tr>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
</td>
<td>{{$loop->iteration}}</td>
<td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
{{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
@@ -116,16 +120,15 @@
@endif
</td>
<td class="text-center">
<input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
{{-- <td align = 'right'></td> --}}
<td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
<td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
@@ -137,7 +140,6 @@
@else
({{number_format(-($bakilelong), 2, '.', ',')}})
@endif</b></td>
<td align = 'right'></td>
</tr>
</tfoot>