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

Merge branch 'main' into afiqhamzah-feat-add-capture-marhun-picture

Browse Source
This commit is contained in:
afiq.hamzah
2022-11-27 15:36:18 +08:00
parent 11236d4208 325bba16ae
commit 7f8f852b9d
82 changed files with 5081 additions and 1291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+128 -21
View File
@@ -22,6 +22,7 @@ use App\Models\LelKarat;
use App\Models\LelKarat_temp;
use App\Models\Pengesahan;
use App\Models\GadaiMarhun;
use App\Models\LelongBidder;
use App\Models\ScanSemak;
use App\Models\TangguhLelong;
use Carbon\Carbon;
@@ -59,10 +60,9 @@ class MarhunController extends Controller
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
->where('caw_id', '=', $caw->id)
->get();
// dd($lelongbid->toArray());
// dd($lelongbid);
$sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak
->where('caw_id', $caw->id)
@@ -127,15 +127,20 @@ class MarhunController extends Controller
->distinct()
->get();
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan
->where('caw_id', '=', $caw->id)
->get();
foreach ($lelongbid as $index1 => $bid) {
$sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->get();
$statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->where('status_ubah', 6)
->first();
// $status = Pengesahan::where('lelongbid_id', $bid['id'])
// ->where('lelong_id', $lelong_id)
// ->first();
$statusSemakMarhun = ScanSemak::where('lelongbid_id', $bid['id'])
->whereNotNull('scan_keluar')
@@ -147,32 +152,47 @@ class MarhunController extends Controller
}
$lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc;
// $lelongbid[$index1]['status'] = $status;
if ($sudahdisahkan) {
$sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id'])
->where('lelong_id', $lelong_id)
->get();
// dump($sudahdisahkan);
// if ($sudahdisahkan) {
foreach ($sudahdisahkan as $sahkan) {
// dd($sahkan);
$lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
$status = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id')
->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id'])
->where('pengesahan.status', '0')
->select('pengesahan.disahkan_oleh',
'pengesahan.disahkan_pada'
'pengesahan.disahkan_pada',
'pengesahan.status'
)
->first();
$lelongbid[$index1]['pengesahan'] = $lelongbidmarhun;
$lelongbid[$index1]['status'] = $status;
// $lelongbid[$index1]['pengesahanbysag'] = $sudahdisahkan;
// dd($lelongbid[$index1]['pengesahan']);
}
} else {
//
}
// } else {
// }
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id'])
->get()
->toArray();
$lelongbid[$index1]['marhun'] = $marhun;
}
return view('marhun.senaraimarhun', compact('lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel'));
// dd($status);
// $index->status = $status;
}
// dd($sudahdisahkan);
return view('marhun.senaraimarhun', compact('sudahdisahkan','lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel'));
}
public function kemaskini(Request $request)
@@ -711,7 +731,7 @@ class MarhunController extends Controller
->where('kodcaw', '=', $user['kodcaw'])
->get()
->toArray();
//dd($lelongs);
dd($lelongs);
$arraycaw = [];
@@ -2040,6 +2060,22 @@ class MarhunController extends Controller
public function listScanBarcodejual($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('status_payment', '=', '1')
// ->where('caw_id', '=', $caw->id)
// ->get();
// $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
// ->where('kodcaw', '=', $caw->caw_code)
// ->where('serahkpdpembida', '=', '1')
// ->orderBy('id', 'desc')
// ->get();
// dd($senaraiScanKeluar);
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
@@ -2047,16 +2083,36 @@ class MarhunController extends Controller
$lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
->where('status_payment', '=', '1')
->where('caw_id', '=', $caw->id)
->select('id')
->get()
->keyBy('id');
foreach ($lelongbid as $index => $value) {
$namabidder = LelongBidder::
where('lelongbid_id', '=', $value['id'])
// ->where('lelongbid.kodcaw', '=', $user->kodcaw)
->where('lelongbidder.status_bidder','=','1')
->select('lelongbidder.lelongbid_id','lelongbidder.nama_bidder')
->get();
// dump($namabidder);
$lelongbid[$index]['nama_bidder'] = $namabidder;
}
// dd($namabidder);
$senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
->where('kodcaw', '=', $caw->caw_code)
->where('serahkpdpembida', '=', '1')
->orderBy('id', 'desc')
// ->whereNull('scan_masuk')
->get();
// dd($senaraiScanKeluar);
return view('marhun.scanbarcodejual', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
$pluckLelongBid = $lelongbid->pluck('id')->toArray();
$pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
$diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
$new_lelong_bid = LelongBid::with('scanSemakSelesaiJual')
->whereIn('id', $diff_lelong_bid)
->get();
// dd($new_lelong_bid);
return view('marhun.scanbarcodejual', compact('namabidder','new_lelong_bid','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
}
public function scanKeluarMarhunjual(Request $request)
{
@@ -2262,6 +2318,57 @@ class MarhunController extends Controller
return $this->marhunPhotoService->show($request->norujukan_sag, $marhun);
}
public function exportmarhundetailspembida($lelong_id)
{
$user = Auth::user();
//dd($user);
$lelongs = LelongBid::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.lelong_id', '=', $lelong_id)
->where('lelongbid.kodcaw', '=', $user->kodcaw)
->where('lelongbidder.status_bidder','=','1')
->where('lelongbid.status_jual', '=', 1)
->where('lelongbid.status_payment', '=', 1)
->select('lelongbid.id','lelongbid.norujukan','lelongbidder.nama_bidder')
->orderBy('lelongbid.norujukan')
->get();
// ->toArray();
// dd($lelongs);
$arraycaw = [];
$total_berat = 0;
$berat = 0;
$total_harga = 0;
$harga = 0;
$total_nmarhun = 0;
$nilai_marhun = 0;
$total_hargaasas = 0;
$hargaasas = 0;
foreach ($lelongs as $index1 => $lelong) {
$marhun = LelongBidMarhun::where('lelongbid_id', '=', $lelong['id'])->get();
$total_berat = $total_berat + $marhun->sum('berat');
$lelongs[$index1]['detailmarhun'] = $marhun;
}
// dd( $total_berat );
array_push($arraycaw, [
'berat' => $berat,
'harga' => $harga,
'n_marhun' => $nilai_marhun,
'hargaasas' => $hargaasas,
]);
$pdf = PDF::loadView('pdf.marhundetailspembida', compact('lelongs', 'arraycaw', 'total_nmarhun', 'total_berat', 'total_harga', 'total_hargaasas'))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Marhun Pembida.pdf');
}
}