diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8c0fcbb7..6e486f8a 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -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; } } } diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 12baf7d6..39690371 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -226,7 +226,7 @@
Jumlah Berat Mengikut Mutu (Keseluruhan)
- +