Bugfix/list clickup issue (#5)

Reviewed-on: #5
Co-authored-by: ISMAIL MASSERAN <ismail@koppkb.com>
Co-committed-by: ISMAIL MASSERAN <ismail@koppkb.com>
This commit was merged in pull request #5.
This commit is contained in:
2026-10-19 13:30:36 +08:00
committed by ismailmasseran
parent b1d393b1a1
commit e29a5891c8
196 changed files with 18243 additions and 19520 deletions
+227 -262
View File
@@ -1,31 +1,20 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Support\Facades\Http;
use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
use App\Models\User;
use PDF;
use App\Models\Cawangan;
use App\Models\LelongBidder;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\Invoice;
use App\Models\Lelong;
use App\Models\LelongBid;
use App\Models\LelongBidder;
use App\Models\LelongBidMarhun;
use App\Models\Payment;
use App\Models\Resit;
use App\Models\Invoice;
use App\Models\FileResit;
use App\Models\LelongBidMarhun;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
use PDF;
class SerahanController extends Controller
{
@@ -44,382 +33,358 @@ class SerahanController extends Controller
*
* @return \Illuminate\Contracts\Support\Renderable
*/
public function laporanserahan()
{
// $user = Auth::user();
// $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
// ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
// ->where('cawangan.caw_code','=',$user->kodcaw)
// ->get();
// return view('serahan.laporanserahan',compact('lelongid'));
$arrayinfo = [];
$user = Auth::user();
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
->where('lelong.sts_lelong', 3)
->where('cawangan.caw_code', $user->kodcaw)
->groupBy('lelong_id')
->get()
->toArray();
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->where('cawangan.caw_code',$user->kodcaw)
$lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->select('lelong.fasa', 'lelong_id', 'tarikh_lelong', 'lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong')
->where('lelong.sts_lelong', 3)
->where('cawangan.caw_code', $user->kodcaw)
->groupBy('lelong_id')
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
foreach ($lelong as $info) {
$detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->where('lelong_id', $info['lelong_id'])
->where('cawangan.caw_code', $user->kodcaw)
->get()
->toArray();
array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]);
// dd($detailsinfo);
}
return view('serahan.laporanserahan',compact('lelong', 'arrayinfo'));
return view('serahan.laporanserahan', compact('lelong', 'arrayinfo'));
}
public function pembayaran($lelong_id){
public function pembayaran($lelong_id)
{
$lelong_id = $lelong_id;
$user = Auth::user();
$payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.user_id')
->groupBy('lelongbidder.user_id')
->get()->toArray();
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.user_id')
->groupBy('lelongbidder.user_id')
->get()->toArray();
foreach($payment as $index1=>$winner){
foreach ($payment as $index1 => $winner) {
$userdetails = User::where('id', $winner['user_id'])->first();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment','lelongbidder.payment_id','=','payment.id')
->where('lelongbid.kodcaw',$user->kodcaw)
->where('lelongbidder.user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbidder.user_id', $winner['user_id'])
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
$payment[$index1]['details'] = $userdetails;
$payment[$index1]['resit'] = $SAGWin[$index1]['resit_id'];
$payment[$index1]['total_surat'] = sizeof($SAGWin);
$payment[$index1]['total_surat'] = count($SAGWin);
$payment[$index1]['totalBid'] = $SAGWin->sum('hargabida');
}
// dd($SAGWin);
return view('serahan.pembayaran',compact('payment','lelong_id'));
return view('serahan.pembayaran', compact('payment', 'lelong_id'));
}
public function penyatabayaran($user_id, $lelong_id)
{
{
$total_berat = 0;
$user = Auth::user();
$user = Auth::user();
// dd($user_id);
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first()->toArray();
$userdetails = User::where('id','=',$user_id)
->first();
$lelong = Lelong::where('id',$lelong_id)
->first();
$invois = Invoice::where('lelong_id',$lelong_id)
->where('user_id','=',$user_id)
->first();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first()->toArray();
$userdetails = User::where('id', '=', $user_id)
->first();
$lelong = Lelong::where('id', $lelong_id)
->first();
$invois = Invoice::where('lelong_id', $lelong_id)
->where('user_id', '=', $user_id)
->first();
// dd($invois);
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw','=',$user->kodcaw)
->select('lelongbid.norujukan','lelongbid.id','lelongbid.hargajual')
->get();
->where('user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', '=', $user->kodcaw)
->select('lelongbid.norujukan', 'lelongbid.id', 'lelongbid.hargajual')
->get();
foreach($SAGWin as $index1=>$lelong2){
foreach ($SAGWin as $index1 => $lelong2) {
// dd($SAGWin);
$marhun= LelongBidMarhun::join('jenisemas','jenisemas.marhun','=','lelongbidmarhun.marhun')
->where('lelongbid_id','=',$lelong2['id'])
$marhun = LelongBidMarhun::join('jenisemas', 'jenisemas.marhun', '=', 'lelongbidmarhun.marhun')
->where('lelongbid_id', '=', $lelong2['id'])
// ->where('kodcaw','=',$user['kodcaw'])
->get();
->get();
$total_berat = $total_berat + ($marhun->sum('berat'));
$SAGWin[$index1]['detailmarhun']=$marhun;
$SAGWin[$index1]['detailmarhun'] = $marhun;
}
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
->where('lelongbid.kodcaw','=',$user->kodcaw)
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
->where('lelongbid.kodcaw', '=', $user->kodcaw)
->where('user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($senaraisag);
$caw['total_berat'] = $senaraisag->sum('berat');
$caw['total_bidaan'] = $senaraisag->sum('hargabida');
$pdf = PDF::loadView('pdf.penyatabayaran',compact('userdetails','SAGWin','caw','user','lelong','invois'))
->setPaper('a4', 'potrait');
$pdf = PDF::loadView('pdf.penyatabayaran', compact('userdetails', 'SAGWin', 'caw', 'user', 'lelong', 'invois'))
->setPaper('a4', 'potrait');
return $pdf->download('Penyata Bayaran.pdf');
}
public function resit($user_id, $lelong_id){
public function resit($user_id, $lelong_id)
{
$user = Auth::user();
$SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->select(
'users.id',
'users.name',
'users.nokp',
'users.alamat'
)
->first();
$arraydetails = [];
$brgdetails= LelongBidder::join('payment','lelongbidder.payment_id','=','payment.id')
->join('lelongbid','lelongbidder.lelongbid_id','=','lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->select('resit_id','payment.lelong_id','payment.user_id','payment.status','status_payment_opt','lelongbidder.status_payment')
->where('payment.status', 2)
->where('payment.user_id',$user_id)
->where('lelongbid.kodcaw',$user->kodcaw)
->where('status_payment_opt', 2)
->orWhere('status_payment_opt', 3)
->distinct()
->orderBy('resit_id')
->get()
->toArray();
// dd($brgdetails);
// dd($user->kodcaw);
foreach($brgdetails as $brg)
{
$details = Payment::join('lelongbid','payment.norujukan','=','lelongbid.norujukan')
->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->join('resit','payment.resit_id','=','resit.id')
->where('resit_id', $brg['resit_id'])
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', $user->kodcaw)
// ->where('payment.kodcaw', $user->kodcaw)
->where('payment.status',2)
->select(
'users.id',
'users.name',
'users.nokp',
'users.alamat'
)
->first();
$arraydetails = [];
$brgdetails = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->select('resit_id', 'payment.lelong_id', 'payment.user_id', 'payment.status', 'status_payment_opt', 'lelongbidder.status_payment')
->where('payment.status', 2)
->where('payment.user_id', $user_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->where('status_payment_opt', 2)
->orWhere('status_payment_opt', 3)
->distinct()
->orderBy('resit_id')
->get()
->toArray();
array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
// dd($brgdetails);
// dd($user->kodcaw);
foreach ($brgdetails as $brg) {
$details = Payment::join('lelongbid', 'payment.norujukan', '=', 'lelongbid.norujukan')
->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
->join('resit', 'payment.resit_id', '=', 'resit.id')
->where('resit_id', $brg['resit_id'])
->where('lelongbidder.status_bidder', 1)
->where('users.id', $user_id)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', $user->kodcaw)
// ->where('payment.kodcaw', $user->kodcaw)
->where('payment.status', 2)
->distinct()
->orderBy('resit_id')
->get()
->toArray();
array_push($arraydetails, ['brg' => $brg, 'detailsbrg' => $details]);
}
// dd($arraydetails);
return view('serahan.resit',compact('SAGBidItem', 'arraydetails', 'lelong_id','user_id','brgdetails'));
return view('serahan.resit', compact('SAGBidItem', 'arraydetails', 'lelong_id', 'user_id', 'brgdetails'));
}
public function resitpembayaran($user_id, $resit_id, $lelong_id)
{
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first()->toArray();
$userdetails = User::where('id','=',$user_id)
->first();
$lelong = Lelong::where('id',$lelong_id)
->first();
{
$invois = Resit::where('id',$resit_id)
$user = Auth::user();
->get();
// dd($invois);
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first()->toArray();
$userdetails = User::where('id', '=', $user_id)
->first();
$lelong = Lelong::where('id', $lelong_id)
->first();
$invois = Resit::where('id', $resit_id)
->get();
// dd($invois);
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment','lelongbid.norujukan','=','payment.norujukan')
->join('resit','payment.resit_id','=','resit.id')
->where('lelongbidder.user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw',$user->kodcaw)
->where('payment.resit_id',$resit_id)
->get();
->join('payment', 'lelongbid.norujukan', '=', 'payment.norujukan')
->join('resit', 'payment.resit_id', '=', 'resit.id')
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->where('payment.resit_id', $resit_id)
->get();
// dd($SAGWin);
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
// ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
->join('payment','lelongbid.norujukan','=','payment.norujukan')
->where('lelongbid.kodcaw',$user->kodcaw)
->where('lelongbidder.user_id',$user_id)
->where('payment.resit_id',$resit_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
->join('payment', 'lelongbid.norujukan', '=', 'payment.norujukan')
->where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbidder.user_id', $user_id)
->where('payment.resit_id', $resit_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($senaraisag);
$caw['total_berat'] = $senaraisag->sum('berat');
$caw['total_bidaan'] = $senaraisag->sum('hargabida');
$pdf = PDF::loadView('pdf.resitpembayaran', compact('userdetails', 'SAGWin', 'caw', 'user', 'lelong', 'invois'))
->setPaper('a4', 'potrait');
$pdf = PDF::loadView('pdf.resitpembayaran',compact('userdetails','SAGWin','caw','user','lelong','invois'))
->setPaper('a4', 'potrait');
return $pdf->download('Resit Bayaran.pdf');
}
public function slipserahan($user_id, $lelong_id)
{
{
$total_berat = 0;
$berat = 0;
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first()->toArray();
$userdetails = User::where('id','=',$user_id)
->first();
$lelong = Lelong::where('id',$lelong_id)
->first();
$user = Auth::user();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first()->toArray();
$userdetails = User::where('id', '=', $user_id)
->first();
$lelong = Lelong::where('id', $lelong_id)
->first();
// dd($lelong);
$invois = Invoice::where('user_id',$user_id)
->where('lelong_id',$lelong_id)
->get();
// dd($invois);
$invois = Invoice::where('user_id', $user_id)
->where('lelong_id', $lelong_id)
->get();
// dd($invois);
$khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'khazanah'
$khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/'.$user->kodcaw, [
'role_harian' => 'khazanah',
])->json();
// dd($roles_harian_khazanah);
$SAGWin = LelongBid::join('scan_semak','lelongbid.norujukan','=','scan_semak.norujukan')
->where('lelongbid.nopembeli',$user_id)
->where('lelongbid.status_payment', 1)
->where('scan_semak.serahkpdpembida', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw',$user->kodcaw)
->select('lelongbid.id','lelongbid.norujukan','lelongbid.hargajual')
->orderBy('lelongbid.id')
$SAGWin = LelongBid::join('scan_semak', 'lelongbid.norujukan', '=', 'scan_semak.norujukan')
->where('lelongbid.nopembeli', $user_id)
->where('lelongbid.status_payment', 1)
->where('scan_semak.serahkpdpembida', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', $user->kodcaw)
->select('lelongbid.id', 'lelongbid.norujukan', 'lelongbid.hargajual')
->orderBy('lelongbid.id')
// ->where('payment.resit_id',$resit_id)
->get();
->get();
// dd($SAGWin);
if($SAGWin->isNotEmpty()){
foreach($SAGWin as $index1=>$lelong2){
if ($SAGWin->isNotEmpty()) {
foreach ($SAGWin as $index1 => $lelong2) {
// dd($SAGWin);
$marhun= LelongBidMarhun::join('jenisemas','jenisemas.marhun','=','lelongbidmarhun.marhun')
->where('lelongbid_id','=',$lelong2['id'])
$marhun = LelongBidMarhun::join('jenisemas', 'jenisemas.marhun', '=', 'lelongbidmarhun.marhun')
->where('lelongbid_id', '=', $lelong2['id'])
// ->where('kodcaw','=',$user['kodcaw'])
->get();
->get();
$total_berat = $total_berat + ($marhun->sum('berat'));
// $total_harga = $total_harga + ($marhun->sum('harga'));
// $total_nmarhun = $total_nmarhun + ($marhun->sum('n_marhun'));
// $total_hargaasas = $total_hargaasas + ($marhun->sum('hargaasas'));
$SAGWin[$index1]['detailmarhun']=$marhun;
$SAGWin[$index1]['detailmarhun'] = $marhun;
}
$senaraisag = LelongBid::where('lelongbid.kodcaw',$user->kodcaw)
->where('lelongbid.nopembeli',$user_id)
->where('lelongbid.status_payment', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($senaraisag);
$caw['total_berat'] = $senaraisag->sum('berat');
$caw['total_bidaan'] = $senaraisag->sum('hargajual');
$senaraisag = LelongBid::where('lelongbid.kodcaw', $user->kodcaw)
->where('lelongbid.nopembeli', $user_id)
->where('lelongbid.status_payment', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
// dd($senaraisag);
$caw['total_berat'] = $senaraisag->sum('berat');
$caw['total_bidaan'] = $senaraisag->sum('hargajual');
$pdf = PDF::loadView('pdf.slipserahan', compact('userdetails', 'SAGWin', 'caw', 'user', 'lelong', 'invois', 'total_berat', 'khazanah'))
->setPaper('a4', 'potrait');
$pdf = PDF::loadView('pdf.slipserahan',compact('userdetails','SAGWin','caw','user','lelong','invois','total_berat','khazanah'))
->setPaper('a4', 'potrait');
return $pdf->download('Slip Serahan.pdf');
}
elseif($SAGWin->isEmpty()){
return redirect()->route('pembayaran.kaunterpembayaran',$lelong_id)
->with('failed','Maaf, Tidak Boleh Dijana kerana SAG Belum Di Scan Keluar/Belum Bayar Penuh');
return $pdf->download('Slip Serahan.pdf');
} elseif ($SAGWin->isEmpty()) {
return redirect()->route('pembayaran.kaunterpembayaran', $lelong_id)
->with('failed', 'Maaf, Tidak Boleh Dijana kerana SAG Belum Di Scan Keluar/Belum Bayar Penuh');
}
}
public function senaraibid($user_id, $lelong_id)
{
{
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)->first()->toArray();
$userdetails = User::where('id','=',$user_id)
->first();
$lelong = Lelong::where('id',$lelong_id)
->first();
$user = Auth::user();
$invois = Payment::join('resit','payment.resit_id','=','resit.id')
->where('payment.id',$lelong_id)
->first();
$caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first()->toArray();
$userdetails = User::where('id', '=', $user_id)
->first();
$lelong = Lelong::where('id', $lelong_id)
->first();
$invois = Payment::join('resit', 'payment.resit_id', '=', 'resit.id')
->where('payment.id', $lelong_id)
->first();
$SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
->where('user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.kodcaw',$caw['caw_code'])
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
->where('lelongbid.kodcaw', $caw['caw_code'])
->where('user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
$caw['total_hargaasas'] = $senaraisag->sum('hargaasas');
$caw['total_bidaan'] = $senaraisag->sum('hargabida');
$pdf = PDF::loadView('pdf.senaraibid',compact('userdetails','SAGWin','caw','user','lelong','invois'))
->setPaper('a4', 'potrait');
$pdf = PDF::loadView('pdf.senaraibid', compact('userdetails', 'SAGWin', 'caw', 'user', 'lelong', 'invois'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Bidaan.pdf');
}
}