diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c6eaeee3..8349da4e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -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); + } } } diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 7203341a..8ff53b23 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -132,7 +132,7 @@ {{$lelong->harga_emas_asas}} {{$lelong->jbg}} {{$lelong->cajlelong}} - LELONG SEDANG DIJANLANKAN + LELONGAN SEDANG BERLANGSUNG @endforeach diff --git a/resources/views/lelong/senarailelongpc.blade.php b/resources/views/lelong/senarailelongpc.blade.php index 8ad868ce..f1b27484 100644 --- a/resources/views/lelong/senarailelongpc.blade.php +++ b/resources/views/lelong/senarailelongpc.blade.php @@ -130,7 +130,7 @@ {{$lelong->harga_emas_asas}} {{$lelong->jbg}} {{$lelong->cajlelong}} - LELONG SEDANG DIJANLANKAN + LELONGAN SEDANG BERLANGSUNG @endforeach diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index aaad5b81..c551f282 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -65,6 +65,7 @@ + {{-- --}} @@ -76,7 +77,7 @@ - + @@ -86,6 +87,9 @@ @endphp @foreach ($marhuns as $index=> $marhun) + {{-- --}} @@ -116,16 +120,15 @@ @endif - + @endforeach - + {{-- --}} + @@ -137,7 +140,6 @@ @else ({{number_format(-($bakilelong), 2, '.', ',')}}) @endif -
Tindakan No No RujukanNama PelangganCaj Lelong (RM) Harga Asas (RM) Baki Lelong (RM)Tindakan
+ + {{$loop->iteration}} {{ $marhun['norujukan']}}{{ $marhun['nama']['nama']}} - -
JUMLAH KESELURUHANJUMLAH KESELURUHAN {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }} {{ number_format($total_pinjaman, 2, '.', ',') }}