diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
index e10603b4..843d3507 100644
--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -182,37 +182,13 @@ class ApiController extends Controller
// dd($response2->toArray());
$resit = new Resit;
$resit->user_id = $request->user_id;
- $resit->lelongbid_id = null;
+ $resit->lelong_id = $request->lelong_id;
$resit->reference_no = $reference_no;
$resit->billplz_id = $billcode['id'];
$resit->resit_type = 1;
$resit->total_payment = 10;
$resit->save();
- // foreach($array_payment as $index1=>$arraypay)
- // {
- // $previous_siri = Http::get(config('api.url') . '/api/online/transaction')->json();
- // if($previous_siri){
- // $nosiri = $previous_siri['nosiri'] + 1;
- // }else{
- // $nosiri = 1;
- // }
-
- // $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
-
- // $new_transaction = Http::post(config('api.url') . '/api/online/transaction',[
- // 'nokp'=> Auth::user()->icno,
- // 'reference_no'=> $reference_no,
- // 'nosiri'=> $nosiri,
- // 'billplz_id' => $billcode['id'],
- // 'norujukan' => $arraypay['norujukan'],
- // 'kodcaw' => $arraypay['kodcaw'],
- // 'total_payment'=> $arraypay['bayaran'],
- // 'customer_name' => Auth::user()->name,
- // ])->json();
-
- // }
-
return redirect($billcode['url'] . '?auto_submit=true');
@@ -242,10 +218,18 @@ class ApiController extends Controller
$resit->paid_at = $data['billplz']['paid_at'];
$resit->save();
+ $payment = new Payment;
+ $payment->user_id = $resit->user_id;
+ $payment->lelong_id = $resit->lelong_id;
+ $payment->total_payment = $resit->total_payment;
+ $payment->resit_id = $resit->id;
+ $payment->status_payment_opt = 2; //bayar secara online 2
+ $payment->status = 1; //fee rm10 - 1
+ $payment->remark = 'Bayaran Online';
+ $payment->save();
+
event(new PaymentNotify('PAID',$resit->user_id));
- // $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[
- // 'billplz_id' => $data['billplz']['id']
- // ])->json();
+
return response()->json([
'success' => true,
'resit' => $resit
@@ -289,10 +273,18 @@ class ApiController extends Controller
$resit->paid_at = $data['paid_at'];
$resit->save();
- // $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[
- // 'billplz_id' => $data['billplz']['id']
- // ])->json();
+ $payment = new Payment;
+ $payment->user_id = $resit->user_id;
+ $payment->lelong_id = $resit->lelong_id;
+ $payment->total_payment = $resit->total_payment;
+ $payment->resit_id = $resit->id;
+ $payment->status_payment_opt = 2; //bayar secara online 2
+ $payment->status = 1; //fee rm10 - 1
+ $payment->remark = 'Bayaran Online';
+ $payment->save();
+
event(new PaymentNotify('PAID',$resit->user_id));
+
return response()->json([
'success' => true,
'resit' => $resit
diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php
index 4ef4bced..6d4ae5ab 100644
--- a/app/Http/Controllers/AuthMobile/AuthController.php
+++ b/app/Http/Controllers/AuthMobile/AuthController.php
@@ -50,6 +50,7 @@ class AuthController extends Controller
$user->notelbimbit = $fields['notelbimbit'];
$user->register_agree = $fields['register_agree'];
$user->t_daftar = $currentdate;
+ $user->status = 'inprogress';
$user->user_type = 2; //type 2 = pembida
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index eda9ba9d..d3aa8cec 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -27,6 +27,7 @@ use App\Models\LelongBidder;
use App\Models\LelongBidMarhun;
use App\Models\LelKarat;
use App\Models\LelKarat_temp;
+use App\Models\Resit;
use Carbon\Carbon;
@@ -436,6 +437,13 @@ class LelongController extends Controller
public function janapemenang($id){
+ $current = Carbon::now();
+ $current = new Carbon();
+
+ $day = $current->day;
+ $month = $current->month;
+ $year = $current->format('y');
+
$lelong = Lelong::where('id','=',$id)->first();
$lelongbid = LelongBid::where('lelong_id','=',$id)->get();
foreach($lelongbid as $bid)
@@ -461,6 +469,29 @@ class LelongController extends Controller
$updatebid->nopembeli = $bidder->user_id;
$updatebid->status_jual = 1;
$updatebid->save();
+
+ $previous_siri = Resit::orderBy('id','desc')->first();
+ $checkdata = Resit::where('user_id', $bidder->user_id)
+ ->where('lelong_id', $id)
+ ->first();
+ if(!$checkdata){
+ if($previous_siri){
+ $nosiri = $previous_siri->id + 1;
+ }else{
+ $nosiri = 1;
+ }
+
+ $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);;
+
+ $resit = new Resit;
+ $resit->user_id = $bidder->user_id;
+ $resit->lelong_id = $id;
+ $resit->reference_no = $reference_no;
+ $resit->billplz_id = '';
+ $resit->total_payment = '';
+ $resit->resit_type = 2; // 1 = fee , 2 = bid
+ $resit->save();
+ }
}
else
{
@@ -578,6 +609,44 @@ class LelongController extends Controller
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
}
+ public function senaraipemenang($lelong_id){
+
+ $listwinner = 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();
+ // dd($listwinner);
+
+ foreach($listwinner as $index1=>$winner){
+
+ $userdetails = User::where('id', $winner['user_id'])->first();
+ $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+ ->where('user_id', $winner['user_id'])
+ ->where('lelongbidder.status_bidder', 1)
+ ->where('lelongbid.lelong_id', $lelong_id)
+ ->get();
+
+ $listwinner[$index1]['details'] = $userdetails;
+ $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+ $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
+ }
+
+ return view('lelong.senaraipemenang',compact('listwinner','lelong_id'));
+ }
+
+ public function senaraisagpemenang($user_id, $lelong_id){
+
+ $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+ ->where('lelongbid.lelong_id', $lelong_id)
+ ->where('lelongbidder.user_id', $user_id)
+ ->get();
+
+ return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id'));
+ }
+
public function senaraimarhun($lelongid, $cawid){
// $marhun = LelongBid::->get();
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index daf427fc..937886ac 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -64,15 +64,17 @@ class LelongMobileController extends Controller
public function bidderSelectBidItem(Request $request){
- $feepayment = Payment::where('status', '=', 1)->first();
+ $feepayment = Payment::where('lelong_id', '=', $request->lelong_id)->first();
if($feepayment != null){
$user = User::where('id', '=', $request->user_id)
->first();
- $selectBid = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id')
- ->where('lelongbid.norujukan', $request->norujukan)
+ $carts = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id')
+ ->join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
+ ->where('lelong.sts_lelong','=',1)
+ ->where('carts.user_id', $user->id)
->select('lelongbid.id as lelongbid_id',
'lelongbid.t_lelong',
'lelongbid.nilaimarhun',
@@ -84,16 +86,20 @@ class LelongMobileController extends Controller
$currentdate = Carbon::now()->toDateTimeString();
- $lelongBidder = new LelongBidder();
- $lelongBidder->nama_bidder = $request->name;
- $lelongBidder->user_id = $user->id;
- $lelongBidder->notelbimbit = $user->notelbimbit;
- $lelongBidder->hargabida = $selectBid[0]->hargabida;
- $lelongBidder->lelongbid_id = $selectBid[0]->lelongbid_id;
- $lelongBidder->nilaimarhun = $selectBid[0]->nilaimarhun;
- $lelongBidder->cajlelong = $selectBid[0]->cajlelong;
- $lelongBidder->masa_bidaan = $currentdate;
- $lelongBidder->save();
+ foreach($carts as $cart)
+ {
+ $lelongBidder = new LelongBidder();
+ $lelongBidder->nama_bidder = $request->name;
+ $lelongBidder->user_id = $user->id;
+ $lelongBidder->notelbimbit = $user->notelbimbit;
+ $lelongBidder->hargabida = $cart->hargabida;
+ $lelongBidder->lelongbid_id = $cart->lelongbid_id;
+ $lelongBidder->nilaimarhun = $cart->nilaimarhun;
+ $lelongBidder->cajlelong = $cart->cajlelong;
+ $lelongBidder->masa_bidaan = $currentdate;
+ $lelongBidder->save();
+
+ }
return response()->json("success", 201);
}
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index bd2a93f9..8ba01372 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -41,6 +41,7 @@ class PaymentController extends Controller
)
->groupBy('lelongbidder.user_id')
->get()->toArray();
+ // dd($listwinner);
foreach($listwinner as $index1=>$winner){
@@ -50,9 +51,21 @@ class PaymentController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
+
+ $total_payment = 0;
+ foreach($SAGWin as $SAG){
+ $payment = Payment::where('lelongbid_id', $SAG->lelongbid_id)
+ ->first();
+
+ if($payment){
+ $total_payment = $total_payment + $payment->total_payment;
+ }
+ }
+
$listwinner[$index1]['details'] = $userdetails;
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
+ $listwinner[$index1]['totalPay'] = $total_payment;
}
@@ -75,7 +88,7 @@ class PaymentController extends Controller
)
->first();
- foreach($SAGBidItem as $eachbid){
+ // foreach($SAGBidItem as $eachbid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
@@ -85,32 +98,30 @@ class PaymentController extends Controller
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
- 'lelongbidder.lelongbid_id'
+ 'lelongbidder.lelongbid_id',
+ 'lelongbidder.status_payment'
)
->get();
- }
+ // }
- return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid'));
+ return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id'));
}
public function paymentdenokaunter(Request $request){
// dd($request->all());
$currentdate = Carbon::now();
- $currentdate = $currentdate->toDateString();
-
- $current = Carbon::now();
- $current = new Carbon();
-
- $day = $current->day;
- $month = $current->month;
- $year = $current->format('y');
+ $currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
+ $resit = Resit::where('lelong_id', $request->lelong_id)
+ ->first();
+
+ $total_hargabida = 0;
foreach($bid_id as $bid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -120,34 +131,17 @@ class PaymentController extends Controller
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
- 'lelongbidder.id as lelongbidder_id'
+ 'lelongbidder.id as lelongbidder_id',
+ 'lelongbid.lelong_id as lelong_id'
)
->first();
- $previous_siri = Resit::orderBy('id','desc')->first();
- if($previous_siri){
- $nosiri = $previous_siri->id + 1;
- }else{
- $nosiri = 1;
- }
-
- $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
-
- $resit = new Resit;
- $resit->user_id = $request->user_id;
- $resit->lelongbid_id = $bid;
- $resit->reference_no = $reference_no;
- $resit->billplz_id = '';
- $resit->total_payment = $request->amaunkiraan;
- $resit->resit_type = 2; // 1 = fee , 2 = bid
- $resit->status = 'PAID';
- $resit->paid_at = $currentdate;
- $resit->save();
-
+ $total_hargabida = $total_hargabida + $eachbid->hargabida;
$payment = Payment::create([
'user_id' => $request->user_id,
'lelongbidder_id' => $eachbid->lelongbidder_id,
'lelongbid_id' => $bid,
+ 'lelong_id' => $eachbid->lelong_id,
'kodcaw' => $user->kodcaw,
'status_payment_opt' => 1,
'status' => 2,
@@ -169,14 +163,22 @@ class PaymentController extends Controller
'disahkan_pada' => $currentdate
]);
- $updatelelbidbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
- ->update(array(
- 'lelongbid.status_jual' => 1,
- 'lelongbid.t_jual' => $currentdate
- ));
+ $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
+ ->first();
+ $updatelelbidbidder->status_payment = 1;
+ $updatelelbidbidder->update();
+
+ $eachbid->status_jual = 1;
+ $eachbid->t_jual = $currentdate;
+ $eachbid->update();
}
-
+ if($request->amaunkiraan == $total_hargabida){
+ $resit->total_payment = $total_hargabida;
+ $resit->status = 'PAID';
+ $resit->paid_at = $currentdate;
+ $resit->update();
+ }
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index b846638b..591f16e5 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -34,7 +34,7 @@ class PembidaController extends Controller
// $alluser = User::all();
$alluser = User::doesntHave('roles')
->where('user_type','=',2)
- ->where('status', '!=', 'rejected')
+ ->where('status', '=', 'inprogress')
->get();
// dd($alluser);
diff --git a/app/Models/payment.php b/app/Models/payment.php
index 08a23d51..5f0f20ea 100644
--- a/app/Models/payment.php
+++ b/app/Models/payment.php
@@ -15,6 +15,7 @@ class payment extends Model
'user_id',
'lelongbidder_id',
'lelongbid_id',
+ 'lelong_id',
'kodcaw',
'back_acc_pembeli',
'bank_acc_no_pembeli',
diff --git a/app/Models/resit.php b/app/Models/resit.php
index 9d59ce59..4573687c 100644
--- a/app/Models/resit.php
+++ b/app/Models/resit.php
@@ -13,7 +13,7 @@ class resit extends Model
protected $fillable = [
'user_id',
- 'lelongbid_id',
+ 'lelong_id',
'reference_no',
'billplz_id',
'total_payment',
diff --git a/composer.lock b/composer.lock
index 47cc424e..3ec90ca5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "c31afdc7c1e50fe368c759133eafd44f",
+ "content-hash": "2e5f0f0a7cad0c224615bb48a86d6a1b",
"packages": [
{
"name": "asm89/stack-cors",
@@ -2909,6 +2909,142 @@
},
"time": "2021-04-09T13:42:10+00:00"
},
+ {
+ "name": "paragonie/random_compat",
+ "version": "v9.99.100",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">= 7"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "type": "library",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "polyfill",
+ "pseudorandom",
+ "random"
+ ],
+ "support": {
+ "email": "info@paragonie.com",
+ "issues": "https://github.com/paragonie/random_compat/issues",
+ "source": "https://github.com/paragonie/random_compat"
+ },
+ "time": "2020-10-15T08:29:30+00:00"
+ },
+ {
+ "name": "paragonie/sodium_compat",
+ "version": "v1.17.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/sodium_compat.git",
+ "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
+ "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
+ "shasum": ""
+ },
+ "require": {
+ "paragonie/random_compat": ">=1",
+ "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+ },
+ "suggest": {
+ "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+ "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "autoload.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com"
+ },
+ {
+ "name": "Frank Denis",
+ "email": "jedisct1@pureftpd.org"
+ }
+ ],
+ "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+ "keywords": [
+ "Authentication",
+ "BLAKE2b",
+ "ChaCha20",
+ "ChaCha20-Poly1305",
+ "Chapoly",
+ "Curve25519",
+ "Ed25519",
+ "EdDSA",
+ "Edwards-curve Digital Signature Algorithm",
+ "Elliptic Curve Diffie-Hellman",
+ "Poly1305",
+ "Pure-PHP cryptography",
+ "RFC 7748",
+ "RFC 8032",
+ "Salpoly",
+ "Salsa20",
+ "X25519",
+ "XChaCha20-Poly1305",
+ "XSalsa20-Poly1305",
+ "Xchacha20",
+ "Xsalsa20",
+ "aead",
+ "cryptography",
+ "ecdh",
+ "elliptic curve",
+ "elliptic curve cryptography",
+ "encryption",
+ "libsodium",
+ "php",
+ "public-key cryptography",
+ "secret-key cryptography",
+ "side-channel resistant"
+ ],
+ "support": {
+ "issues": "https://github.com/paragonie/sodium_compat/issues",
+ "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
+ },
+ "time": "2021-08-10T02:43:50+00:00"
+ },
{
"name": "phenx/php-font-lib",
"version": "0.5.2",
@@ -4012,6 +4148,67 @@
},
"time": "2021-10-10T13:37:39+00:00"
},
+ {
+ "name": "pusher/pusher-php-server",
+ "version": "7.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/pusher/pusher-http-php.git",
+ "reference": "af3eeaefc0c7959f5b3852f0a4dd5547245d33df"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/af3eeaefc0c7959f5b3852f0a4dd5547245d33df",
+ "reference": "af3eeaefc0c7959f5b3852f0a4dd5547245d33df",
+ "shasum": ""
+ },
+ "require": {
+ "ext-curl": "*",
+ "ext-json": "*",
+ "guzzlehttp/guzzle": "^7.2",
+ "paragonie/sodium_compat": "^1.6",
+ "php": "^7.3|^8.0",
+ "psr/log": "^1.0|^2.0|^3.0"
+ },
+ "require-dev": {
+ "overtrue/phplint": "^2.3",
+ "phpunit/phpunit": "^8.5|^9.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Pusher\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Library for interacting with the Pusher REST API",
+ "keywords": [
+ "events",
+ "messaging",
+ "php-pusher-server",
+ "publish",
+ "push",
+ "pusher",
+ "real time",
+ "real-time",
+ "realtime",
+ "rest",
+ "trigger"
+ ],
+ "support": {
+ "issues": "https://github.com/pusher/pusher-http-php/issues",
+ "source": "https://github.com/pusher/pusher-http-php/tree/7.0.2"
+ },
+ "time": "2021-12-07T13:09:00+00:00"
+ },
{
"name": "ralouphie/getallheaders",
"version": "3.0.3",
diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php
index 2808a919..5daf633c 100644
--- a/database/migrations/2022_01_25_010223_create_payment_table.php
+++ b/database/migrations/2022_01_25_010223_create_payment_table.php
@@ -17,7 +17,8 @@ class CreatePaymentTable extends Migration
$table->bigIncrements('id');
$table->unsignedBigInteger('user_id')->unsigned();
$table->unsignedBigInteger('lelongbidder_id')->unsigned()->nullable();
- $table->unsignedBigInteger('lelongbid_id')->unsigned();
+ $table->unsignedBigInteger('lelongbid_id')->unsigned()->nullable();
+ $table->unsignedBigInteger('lelong_id')->unsigned();
$table->string('kodcaw')->nullable();
$table->string('back_acc_pembeli')->nullable();
$table->string('bank_acc_no_pembeli')->nullable();
@@ -54,12 +55,16 @@ class CreatePaymentTable extends Migration
$table->foreign('lelongbidder_id')
->references('id')->on('lelongbidder')
->onDelete('cascade');
+
+ $table->foreign('lelong_id')
+ ->references('id')->on('lelong')
+ ->onDelete('cascade');
});
Schema::create('resit', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedBigInteger('user_id')->unsigned();
- $table->unsignedBigInteger('lelongbid_id')->unsigned()->nullable();
+ $table->unsignedBigInteger('lelong_id')->unsigned();
$table->string('reference_no')->nullable();
$table->string('billplz_id');
$table->decimal('total_payment', $precision = 9, $scale = 2);
@@ -72,8 +77,8 @@ class CreatePaymentTable extends Migration
->references('id')->on('users')
->onDelete('cascade');
- $table->foreign('lelongbid_id')
- ->references('id')->on('lelongbid')
+ $table->foreign('lelong_id')
+ ->references('id')->on('lelong')
->onDelete('cascade');
});
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 72a1cb10..59bad69a 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -37,7 +37,7 @@
@hasrole('jurulelong')
- @if(!$lel->masatamat_lelong)
+ @if($lel->sts_lelong == 0)
@@ -45,7 +45,7 @@
@elseif ($lel->sts_lelong == 2)
@elseif ($lel->sts_lelong == 3)
-
+
@else
@endif
diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php
new file mode 100644
index 00000000..59092f71
--- /dev/null
+++ b/resources/views/lelong/senaraipemenang.blade.php
@@ -0,0 +1,96 @@
+@extends('layouts.app')
+
+@section('content')
+
+
+
+
+ @if ($message = Session::get('success'))
+
+ @endif
+
+
+
+ | No |
+ Nama |
+ No Kad Pengenalan |
+ No Telefon |
+ Bilangan Surat |
+ Jumlah Bidaan(RM) |
+ Action |
+
+
+
+ @foreach($listwinner as $winner)
+
+ | {{ $loop->iteration }} |
+ {{ $winner['details']['name']}} |
+ {{ $winner['details']['nokp']}} |
+ {{ $winner['details']['notelbimbit']}} |
+ {{ $winner['total_surat']}} |
+ {{ $winner['totalBid']}} |
+
+
+ |
+
+ @endforeach
+
+
+
+
+
+
+
+ @if ($message = Session::get('success'))
+
+ @endif
+
+
+
+ | {{ $biditem->norujukan}} |
{{ $biditem->hargaasas}} |
{{ $biditem->hargabida}} |
- |
+
+ @if($biditem->status_payment == 0)
+
+ @else
+ PAID
+ @endif
+ |
@endforeach
- | Jumlah Bayaran |
+ Jumlah Bayaran |
RM |
|
-
+
@@ -58,6 +64,7 @@