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

Merge branch 'main' into amir_dev

Browse Source
This commit is contained in:
Amir
2022-08-08 09:42:21 +08:00
parent 4b22b3ab2d d95eea6717
commit c9edf6b597
9 changed files with 99 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+1
View File
@@ -85,6 +85,7 @@ class AccountController extends Controller
->where('payment.status_payment_opt', 2);
})
->get();
// dd($listwinner);
foreach($listwinner as $index1=>$winner){
app/Http/Controllers/NotisController.php
+43 -44
View File
@@ -186,64 +186,63 @@ class NotisController extends Controller
public function listnotis(Request $request){
$lelong_id = $request->lelong_id;
$user = Auth::user();
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();
$lelong_id = $request->lelong_id;
$senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
->where('lelongbid.lelong_id', $lelong_id);
$arraysenarai = $senarai->pluck('norujukan')->toArray();
$datasenarai = $senarai->get();
$gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
->where('gadai.kodcaw','=',$user->kodcaw)
->get()->toArray();
$bayaran=0;
foreach($gadaicaw as $index1=>$pay)
{
$bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
$arraydetails = [];
$caw = Cawangan::where('caw_code','=',$user->kodcaw)
->first();
$lelong_id = $lelong_id;
$marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
->where('lelong_id','=',$lelong_id)
->where('lelongbid.kodcaw','=',$user->kodcaw);
$arraynorujukan = $marhun->pluck('norujukan')->toArray();
$datalelong = $marhun->get();
$marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->select('nokp')
->groupBy('nokp')
->get();
// dd($marhuns);
$arraysag = [];
foreach($marhuns as $index1=>$cal){
$customer = Customer::where('kpbaru','=',$cal['nokp'])
->orWhere('kplama','=',$cal['nokp'])
->get();
$listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
->where('nokp','=',$cal['nokp'])
->get();
// dd($listgadai);
foreach($listsag as $index=>$listing){
$bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
}
$marhuns[$index1]['nama'] = $customer;
$marhuns[$index1]['listsag'] = $listsag;
// dd($marhuns[$index1]['nama']);
}
$gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
->where('gadai.kodcaw','=',$user->kodcaw);
$arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
$datacustomer = $gadaicaw2->get();
// dd($gadaicaw2);
$customer = Customer::query()
->whereIn('kpbaru',$arraycustomer)
->orWhereIn('kplama',$arraycustomer)
->get()->toArray();
// $customer[$index1]['listsag'] = $listsag;
// ->join('customer', function ($join) {
// $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
// })
// ->where('gadai.kodcaw','=',$user->kodcaw)
// ->where('lelongbid.lelong_id', $lelong_id)
// ->get()->toArray();
// $payment[$index1]['payment'] = $payment;
// $payment[$index1]['bayaran_keuntungan'] = $bayaran;
if($request->type == 'excel')
{
return view('excel.listnotis_excel',compact('gadaicaw','caw','lelong_id','bayaran','customer'));
return view('excel.listnotis_excel',compact('marhuns','lelong_id','bayaran','listsag','caw'));
}
else
{
$pdf = PDF::loadView('pdf.listnotis',compact('gadaicaw','caw','lelong_id','bayaran'))
$pdf = PDF::loadView('pdf.listnotis',compact('marhuns','lelong_id','bayaran','listsag','caw'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Notis.pdf');
app/Http/Controllers/PaymentController.php
+3 -2
View File
@@ -99,6 +99,7 @@ class PaymentController extends Controller
$total_payment = $total_payment + $payment->total_payment;
}
}
// dd($total_payment);
$listwinner[$index1]['details'] = $userdetails;
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
@@ -155,12 +156,12 @@ class PaymentController extends Controller
->orWhere('status_payment_opt', 3)
->get();
if($payment)
if($paymentstatus)
{
$total_payment = 0;
foreach($paymentstatus as $index1=>$payemnt)
{
$payment = Payment::where('id', $id->payment_id)
$payment = Payment::where('id', $payemnt->payment_id)
->first();
if($payment){
app/Http/Controllers/ReportController.php
+3 -3
View File
@@ -509,9 +509,9 @@ class ReportController extends Controller
$arraydetails = [];
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('lelong_tebus','lelong.id','=','lelong_tebus.batch_no')
->select('lelong.id','lelong_id','tarikh_lelong','lelong.fasa','lelong_tebus.batch_no')
$lelongid = LelongTebus::join('lelong','lelong_tebus.batch_no','=','lelong.id')
->join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong.id','tarikh_lelong','lelong.fasa','lelong_tebus.batch_no')
->distinct()
->orderBy('batch_no')
->get()
app/Http/Controllers/SerahanController.php
+6
View File
@@ -126,16 +126,19 @@ class SerahanController extends Controller
$invois = Payment::join('resit','payment.resit_id','=','resit.id')
->where('payment.id',$lelong_id)
->where('kodcaw','=',$user->kodcaw)
->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)
->where('lelongbid.kodcaw','=',$user->kodcaw)
->get();
$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)
@@ -167,6 +170,7 @@ class SerahanController extends Controller
$invois = Payment::join('resit','payment.resit_id','=','resit.id')
->where('resit.id',$lelong_id)
->where ('kodcaw',$user->kodcaw)
->get();
// dd($invois);
@@ -175,10 +179,12 @@ class SerahanController extends Controller
->where('user_id',$user_id)
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw',$user->kodcaw)
->get();
$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)