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

Merge branch 'amir_dev' into 'main'

Browse Source 
merge api payment + export data lelong TBC

See merge request online-sistem1/lelong!164
This commit is contained in:
Nur Izzati Zulkifli
2022-08-17 01:20:06 +00:00
parent 4ce24e76e7 f247649c83
commit ea4622d253
8 changed files with 134 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ApiController.php
+38 -15
View File
@@ -482,14 +482,25 @@ class ApiController extends Controller
$index->status = 2; //0-unpaid //1-fee //2-bid
$index->remark = "BERJAYA BAYARAN ONLINE";
$index->update();
$updateTag = LelongBid::where('lelongbid.norujukan', $index->norujukan)->first();
$updateTag->status_payment = 2;
$updateTag->save();
$lelongbidder = $updateTag->lelongbidder;
$lelongbidder->status_payment = 2;
$lelongbidder->save();
// $updateTag = LelongBid::where('lelongbid.norujukan', $index->norujukan)->first();
// $updateTag->status_payment = 2;
// $updateTag->save();
// $lelongbidder = $updateTag->lelongbidder;
// $lelongbidder->status_payment = 2;
// $lelongbidder->payment_id = $index->id;
// $lelongbidder->save();
$updateTagBid = LelongBid::where('norujukan', $index->norujukan)->first();
$updateTagBid->status_payment = 2;
$updateTagBid->save();
$updateTagBidder = LelongBidder::where('lelongbid_id', $updateTagBid->id)
->where('user_id', $resit->user_id)->first();
$updateTagBidder->status_payment = 2;
$updateTagBidder->payment_id = $index->id;
$updateTagBidder->save();
}
event(new PaymentNotify('PAID', $resit->user_id, $payment));
@@ -527,6 +538,7 @@ class ApiController extends Controller
public function bidresponse(Request $request)
{
// dd($request->all());
$http = new HttpMethodsClient(
new GuzzleHttpClient(),
new GuzzleMessageFactory()
@@ -570,19 +582,30 @@ class ApiController extends Controller
->where('user_id', $resit->user_id)
->where('resit_id', $resit->id)
->get();
foreach ($payment as $index) {
$index->status = 2; //0-unpaid //1-fee //2-bid
$index->remark = "BERJAYA BAYARAN ONLINE";
$index->update();
$updateTag = LelongBid::where('lelongbid.norujukan', $index->norujukan)->first();
$updateTag->status_payment = 2;
$updateTag->save();
$lelongbidder = $updateTag->lelongbidder;
$lelongbidder->status_payment = 2;
$lelongbidder->payment_id = $index->id;
$lelongbidder->save();
// $updateTag = LelongBid::where('lelongbid.norujukan', $index->norujukan)->first();
// $updateTag->status_payment = 2;
// $updateTag->save();
// $lelongbidder = $updateTag->lelongbidder;
// $lelongbidder->status_payment = 2;
// $lelongbidder->payment_id = $index->id;
// $lelongbidder->save();
$updateTagBid = LelongBid::where('norujukan', $index->norujukan)->first();
$updateTagBid->status_payment = 2;
$updateTagBid->save();
$updateTagBidder = LelongBidder::where('lelongbid_id', $updateTagBid->id)
->where('user_id', $resit->user_id)->first();
$updateTagBidder->status_payment = 2;
$updateTagBidder->payment_id = $index->id;
$updateTagBidder->save();
}
event(new PaymentNotify('PAID', $resit->user_id, $payment));
app/Http/Controllers/LelongController.php
+33 -1
View File
@@ -85,10 +85,42 @@ class LelongController extends Controller
// dd($arraydetails);
return view('lelong.senarailelong',compact('lelong', 'arraydetails'));
}
public function exportData($lelongid)
{
$lelong = Lelong::where('id', $lelongid)->first();
$lelongbycaw = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
->select('cawangan.caw_name', 'cawangan.caw_code', 'cawangan.id')
->where('lelong.id', $lelongid)
->get();
foreach ($lelongbycaw as $index => $data) {
$lelongbycaw[$index]['lelong'] = $lelong->toArray();
$lelongbid = Lelongbid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelong_id', $lelongid)
->where('lelongbid.caw_id', $data['id'])
->where('status_jual', 1)
->where('lelongbidder.status_bidder', 1)
->where('lelongbidder.status_payment', 1)
->get();
foreach ($lelongbid as $index2 => $value) {
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $value['id'])
->get();
$lelongbid[$index2]['lelongbidmarhun'] = $lelongbidmarhun->toArray();
}
$lelongbycaw[$index]['lelongbid'] = $lelongbid->toArray();
}
return view('lelong.exportData', compact('lelongbycaw', 'lelong'));
}
public function show(Request $request, $id)
{
$lelong_id = $id;