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

update scan barcode (10/11/22)

Browse Source
This commit is contained in:
Amirah22
2022-11-21 09:45:33 +08:00
parent 337727a25e
commit c11315d004
6 changed files with 152 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+41 -19
View File
@@ -26,6 +26,7 @@ use App\Models\ScanSemak;
use App\Models\TangguhLelong;
use Carbon\Carbon;
use App\Models\ScanJual;
use DateTime;
class MarhunController extends Controller
{
@@ -1599,6 +1600,32 @@ class MarhunController extends Controller
return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar'));
}
public function listScanBarcodeMasuk($lelong_id)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('caw_id', '=', $caw->id)
->select('id')
->get()
->keyBy('id');
$senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->whereNull('scan_masuk')
->get();
$pluckLelongBid = $lelongbid->pluck('id')->toArray();
$pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
$diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
$new_lelong_bid = LelongBid::with('scanSemakSelesai')->whereIn('id', $diff_lelong_bid)->get();
return view('marhun.scanbarcodemasuk', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar'));
}
public function scanKeluarMarhun(Request $request)
{
@@ -1958,21 +1985,15 @@ class MarhunController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
// dd($request->datehingga);
if($request->datemula == null){
$mula_date = '2017-01-01';
}else{
$split_date = explode('-', $request->datemula);
$mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datehingga == null){
$hingga_date = $current->toDateString();
}else{
$split_date = explode('-', $request->datehingga);
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$myDateTime = DateTime::createFromFormat('Y-m-d', $request->datehingga );
$datez = $myDateTime->modify('+1 day')->format('Y-m-d');
$request->datehingga =$datez;
$kodcaw = $auth_user['kodcaw'];
$cawangan = Cawangan::where('caw_code','=',$kodcaw)
@@ -1982,7 +2003,8 @@ class MarhunController extends Controller
{
$scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw)
->join('users','scan_semak.khazanah_id','=','users.id')
->where([['scan_keluar','>=',$request->datemula],['scan_keluar','<=',$request->datehingga]])
->where('scan_keluar','>=', $request->datemula)
->where('scan_keluar','<=', $request->datehingga )
->get();
return view('pdf.laporanscankeluar', compact('scan','auth_user','tarikh_cetak','cawangan'));
@@ -1991,11 +2013,10 @@ class MarhunController extends Controller
else if($request->jenis == 'masuk'){
$scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw)
->join('users','scan_semak.khazanah_id','=','users.id')
->where([['scan_masuk','>=',$request->datemula],['scan_masuk','<=',$request->datehingga]])
->get();
// dd($scan);
$scan=ScanSemak::join('users','scan_semak.khazanah_id','=','users.id')
->where('scan_semak.kodcaw','=',$kodcaw)
->where([['scan_masuk','>=', $request->datemula],['scan_masuk','<=', $request->datehingga ]])
->get();
return view('pdf.laporanscanmasuk', compact('scan','auth_user','tarikh_cetak','cawangan'));
@@ -2012,6 +2033,7 @@ class MarhunController extends Controller
}
}
public function senaraiterimaserah(Request $request){