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

Merge branch 'atie' into 'main'

Browse Source 
update table 9K dlm senarai lelong operasi dan pc

See merge request online-sistem1/lelong!430
This commit is contained in:
Nur Izzati Zulkifli
2023-03-30 07:04:19 +00:00
parent 7d70f8d712 779e4b8771
commit 91cd4b3693
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+10 -3
View File
@@ -4241,7 +4241,7 @@ class LelongController extends Controller
$total18K = 0;
$total14Kp = 0;
$total14K = 0;
$total9K = 0;
$keuntungan = 0;
$total_bakiupah = 0;
$total_nilaimarhun = 0;
@@ -4316,6 +4316,8 @@ class LelongController extends Controller
$total14Kp += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "14.0K") {
$total14K += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "9.0K") {
$total9K += $lel_bid_marhun->berat;
}
}
}
@@ -4417,6 +4419,7 @@ class LelongController extends Controller
'total18K',
'total14Kp',
'total14K',
'total9K',
'kali',
'tarikh_lelong',
'jbg',
@@ -4476,8 +4479,8 @@ class LelongController extends Controller
// 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');
$laporan->tarikh_lelong = DateTime::createFromFormat('Y-m-d', $laporan['tarikh_lelong']);
$laporan->tarikh_lelong = $laporan->tarikh_lelong->format('d-m-Y');
if ($laporan->sts_lelong == 0) {
array_push($arraydetails0, $laporan);
@@ -5563,6 +5566,8 @@ class LelongController extends Controller
$total14Kp += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "14.0K") {
$total14K += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "9.0K") {
$total9K += $lel_bid_marhun->berat;
}
}
}
@@ -6432,6 +6437,8 @@ class LelongController extends Controller
$total14Kp += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "14.0K") {
$total14K += $lel_bid_marhun->berat;
} else if ($lel_bid_marhun->karat == "9.0K") {
$total9K += $lel_bid_marhun->berat;
}
}
}
resources/views/lelong/showlelong.blade.php
+2 -1
View File
@@ -226,7 +226,7 @@
</div>
<h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
<div style="overflow-x: auto;">
<table width="50%" class="table table-bordered text-center" id="jumlahberat">
<table width="100%" class="table table-bordered text-center" id="jumlahberat">
<thead class="bg-light">
<!-- <tr class="text-center">
<th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
@@ -252,6 +252,7 @@
<td>{{number_format($total18K, 2, '.', ',')}}</td>
<td>{{number_format($total14Kp, 2, '.', ',')}}</td>
<td>{{number_format($total14K, 2, '.', ',')}}</td>
<td>{{number_format($total9K, 2, '.', ',')}}</td>
</tr>
</tbody>
resources/views/lelong/showlelongallsim.blade.php
+2 -1
View File
@@ -235,7 +235,7 @@
</table> --}}
<h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
<div style="overflow-x: auto;">
<table width="50%" class="table table-bordered text-center" id="jumlahberat">
<table width="100%" class="table table-bordered text-center" id="jumlahberat">
<thead class="bg-light">
<tr>
<th>MUTU</th>
@@ -257,6 +257,7 @@
<td>{{number_format($total18K, 2, '.', ',')}}</td>
<td>{{number_format($total14Kp, 2, '.', ',')}}</td>
<td>{{number_format($total14K, 2, '.', ',')}}</td>
<td>{{number_format($total9K, 2, '.', ',')}}</td>
</tr>
</tbody>
resources/views/lelong/showlelongpc.blade.php
+1
View File
@@ -252,6 +252,7 @@
<td>{{number_format($total18K, 2, '.', ',')}}</td>
<td>{{number_format($total14Kp, 2, '.', ',')}}</td>
<td>{{number_format($total14K, 2, '.', ',')}}</td>
<td>{{number_format($total9K, 2, '.', ',')}}</td>
</tr>
</tbody>
resources/views/lelong/showlelongpcdone.blade.php
+1
View File
@@ -250,6 +250,7 @@
<td>{{$total18K}}</td>
<td>{{$total14Kp}}</td>
<td>{{$total14K}}</td>
<td>{{$total9K}}</td>
</tr>
</tbody>