diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index f7552f91..8507df94 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -85,7 +85,7 @@ class CartController extends Controller $cart[$index1]['lelongbidmarhun'] = $marhun; } $groupCawangan[$index]['total_surat'] = $total_surat; - $groupCawangan[$index]['total_berat'] = $total_berat; + $groupCawangan[$index]['total_berat'] = number_format((float)$total_berat, 2, '.', ''); $groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', ''); $groupCawangan[$index]['lelongbid'] = $cart; diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index c1b505a4..9aee651a 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -1626,6 +1626,9 @@ class MarhunController extends Controller $scanMasuk = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) ->whereNotNull('serah_marhun') + ->whereNotNull('terima_marhun') + ->whereNull('scan_masuk') + ->orderBy('id', 'desc') ->first(); if ($scanMasuk) { @@ -1639,16 +1642,6 @@ class MarhunController extends Controller } } - public function senaraiScanKeluar(Request $request) - { - $user = Auth::user(); - $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); - - $senaraiScanKeluar = ScanMarhun::where('lelong_id', '=', $request->lelong_id) - ->where('kodcaw', '=', $caw) - ->get(); - } - public function addPhotoMarhun(Request $request) { $data = base64_encode($request->gambarMarhun->get());