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

update migration for scan_semak

Browse Source
This commit is contained in:
Amir
2022-09-25 09:50:03 +08:00
parent e11c511208
commit 17c44d093a
5 changed files with 142 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+24 -26
View File
@@ -19,10 +19,9 @@ use App\Models\LelongBid;
use App\Models\LelongBidMarhun;
use App\Models\LelKarat;
use App\Models\LelKarat_temp;
use App\Models\Pengesahan;
use App\Models\GadaiMarhun;
use App\Models\ScanMarhun;
use App\Models\ScanSemak;
use App\Models\TangguhLelong;
use Carbon\Carbon;
@@ -1212,20 +1211,21 @@ class MarhunController extends Controller
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$senaraiScanKeluar = ScanMarhun::where('kodcaw', '=', $caw->caw_code)
$senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code)
->where('lelong_id', $lelong_id)
->whereNull('masa_terima')
->whereNull('terima_marhun')
->orderBy('id', 'desc')
->get();
$sedangDinilai = ScanMarhun::where('kodcaw', '=', $caw->caw_code)
->whereNull('masa_serah')
$sedangDinilai = ScanSemak::where('kodcaw', '=', $caw->caw_code)
->whereNotNull('terima_marhun')
->whereNull('serah_marhun')
->where('lelong_id', $lelong_id)
->orderBy('id', 'desc')
->get();
$sudahSerah = ScanMarhun::where('kodcaw', '=', $caw->caw_code)
->whereNotNull('masa_serah')
$sudahSerah = ScanSemak::where('kodcaw', '=', $caw->caw_code)
->whereNotNull('serah_marhun')
->where('lelong_id', $lelong_id)
->orderBy('id', 'desc')
->get();
@@ -1243,9 +1243,9 @@ class MarhunController extends Controller
$current = Carbon::now();
foreach ($request->scanKeluar_id as $index) {
$terimaMarhun = ScanMarhun::where('id', '=', $index)->first();
$terimaMarhun = ScanSemak::where('id', '=', $index)->first();
$terimaMarhun->penilai_id = $user->id;
$terimaMarhun->masa_terima = $current->toTimeString();
$terimaMarhun->terima_marhun = $current->toDateTimeString();
$terimaMarhun->update();
}
return redirect()->route('marhun.terimaserahmarhun', $terimaMarhun->lelong_id)->with('success', 'Terima Marhun Berjaya Direkodkan');
@@ -1257,8 +1257,8 @@ class MarhunController extends Controller
$current = Carbon::now();
foreach ($request->sedangDinilai_id as $index) {
$serahMarhun = ScanMarhun::where('id', '=', $index)->first();
$serahMarhun->masa_serah = $current->toTimeString();
$serahMarhun = ScanSemak::where('id', '=', $index)->first();
$serahMarhun->serah_marhun = $current->toDateTimeString();
$serahMarhun->update();
}
return redirect()->route('marhun.terimaserahmarhun', $serahMarhun->lelong_id)->with('success', 'Serah Marhun Berjaya Direkodkan');
@@ -1274,15 +1274,15 @@ class MarhunController extends Controller
->where('caw_id', '=', $caw->id)
->get();
$senaraiScanKeluar = ScanMarhun::where('lelong_id', '=', $lelong_id)
$senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->whereNull('masa_scanmasuk')
->whereNull('scan_masuk')
->orderBy('id', 'desc')
->get();
$senaraiScanMasuk = ScanMarhun::where('lelong_id', '=', $lelong_id)
$senaraiScanMasuk = ScanSemak::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->whereNotNull('masa_scanmasuk')
->whereNotNull('scan_masuk')
->orderBy('id', 'desc')
->get();
@@ -1295,21 +1295,20 @@ class MarhunController extends Controller
$user = Auth::user();
$current = Carbon::now();
$checkExisting = ScanMarhun::where('norujukan', '=', $request->norujukan_barcode)
->whereNull('masa_scanmasuk')
$checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
->whereNull('scan_masuk')
->get();
if ($checkExisting->isEmpty()) {
$lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
$scanKeluar = new ScanMarhun;
$scanKeluar = new ScanSemak();
$scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
$scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
$scanKeluar->lelongbid_id = $lelongbidItem['id'];
$scanKeluar->norujukan = $lelongbidItem['norujukan'];
$scanKeluar->khazanah_id = $user['id'];
$scanKeluar->tarikh_scankeluar = $current->toDateString();
$scanKeluar->masa_scankeluar = $current->toTimeString();
$scanKeluar->scan_keluar = $current->toDateTimeString();
$scanKeluar->save();
return redirect()->route('marhun.scanbarcode', $request->lelong_id)
@@ -1325,19 +1324,18 @@ class MarhunController extends Controller
$user = Auth::user();
$current = Carbon::now();
$scanMasuk = ScanMarhun::where('norujukan', '=', $request->norujukan_barcode)
->whereNull('masa_scanmasuk')
$scanMasuk = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
->whereNotNull('serah_marhun')
->first();
if ($scanMasuk) {
$scanMasuk->tarikh_scanmasuk = $current->toDateString();
$scanMasuk->masa_scanmasuk = $current->toTimeString();
$scanMasuk->scan_masuk = $current->toDateTimeString();
$scanMasuk->update();
return redirect()->route('marhun.scanbarcode', $request->lelong_id)
->with('success', 'Marhun Berjaya Di Scan Masuk Ke Peti Besi.');
} else {
return redirect()->route('marhun.scanbarcode', $request->lelong_id)
->with('failed', 'Marhun Gagal Di Scan Masuk Ke Peti Besi.');
->with('failed', 'Gagal Scan, Marhun Belum Diserah Oleh Penilai.');
}
}