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

Merge branch 'amir_dev_2' into 'main'

Browse Source 
Fix scan_marhun

See merge request online-sistem1/lelong!231
This commit is contained in:
Nur Izzati Zulkifli
2022-10-18 01:10:00 +00:00
parent 302bb3ae5b 9547e967e3
commit c979c0dcd6
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CartController.php
+1 -1
View File
@@ -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;
app/Http/Controllers/MarhunController.php
+3 -10
View File
@@ -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());