From bb9d14af6f42a157bf8cbbaff6f25b0f66e0a644 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Thu, 24 Feb 2022 09:35:27 +0800 Subject: [PATCH 1/7] Update composer.lock --- composer.lock | 199 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 198 insertions(+), 1 deletion(-) 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", From 6b72f0e66ff1c627c2533a41a31e41480e084efa Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Feb 2022 11:52:40 +0800 Subject: [PATCH 2/7] update lelong --- app/Http/Controllers/LelongController.php | 26 ++++++++ app/Http/Controllers/PaymentController.php | 65 +++++++++---------- ...2022_01_25_010223_create_payment_table.php | 2 +- .../views/lelong/senarailelong.blade.php | 2 +- .../views/pembayaran/SAGBidItem.blade.php | 25 +++++-- .../pembayaran/kaunterpembayaran.blade.php | 8 ++- 6 files changed, 88 insertions(+), 40 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index eda9ba9d..9199a90c 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,24 @@ class LelongController extends Controller $updatebid->nopembeli = $bidder->user_id; $updatebid->status_jual = 1; $updatebid->save(); + + $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 = $bidder->user_id; + $resit->lelongbid_id = $bid->id; + $resit->reference_no = $reference_no; + $resit->billplz_id = ''; + $resit->total_payment = $bidder->hargabida; + $resit->resit_type = 2; // 1 = fee , 2 = bid + $resit->save(); } else { diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index bd2a93f9..25935586 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -41,18 +41,34 @@ class PaymentController extends Controller ) ->groupBy('lelongbidder.user_id') ->get()->toArray(); + // dd($listwinner); foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); + // dd($userdetails); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + // ->join('payment', 'lelongbidder.lelongbid_id', '=', 'payment.lelongbid_id') ->where('user_id', $winner['user_id']) ->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(); + // dd($payment->total_payment); + + 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 +91,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,11 +101,12 @@ 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')); } @@ -98,14 +115,7 @@ class PaymentController extends Controller // 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(); @@ -124,25 +134,11 @@ class PaymentController extends Controller ) ->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 = Resit::where('lelongbid_id', $eachbid->lelongbid_id) + ->first(); $resit->status = 'PAID'; $resit->paid_at = $currentdate; - $resit->save(); + $resit->update(); $payment = Payment::create([ 'user_id' => $request->user_id, @@ -169,11 +165,14 @@ 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(); } 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..379877c0 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,7 @@ 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->string('kodcaw')->nullable(); $table->string('back_acc_pembeli')->nullable(); $table->string('bank_acc_no_pembeli')->nullable(); diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 72a1cb10..39208c74 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) diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 84a05a5e..8445cc62 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -36,18 +36,24 @@ {{ $biditem->norujukan}} {{ $biditem->hargaasas}} {{ $biditem->hargabida}} - + + @if($biditem->status_payment == 0) + + @else + PAID + @endif + @endforeach - Jumlah Bayaran + Jumlah Bayaran RM
- +
@@ -158,7 +164,7 @@
- +
@@ -168,6 +174,7 @@ + +@endsection + diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index e5a016de..b1e341e0 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -20,7 +20,7 @@ Bilangan Surat Jumlah Bidaan(RM) Jumlah Pembayaran(RM) - Resit Bayaran + Penyata Bayaran Action @@ -35,7 +35,7 @@ {{ $winner['totalBid']}} {{ $winner['totalPay']}} - + @if( $winner['totalPay'] < $winner['totalBid'] ) diff --git a/routes/web.php b/routes/web.php index fcaa5030..c5ff7290 100644 --- a/routes/web.php +++ b/routes/web.php @@ -77,6 +77,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:pendaftaranbatch']], function () { Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); + Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); From 2e86b9e746212c68862869ffdfa02d3fb897b515 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:29:34 +0800 Subject: [PATCH 4/7] update latest - jana pemenang - resit --- app/Http/Controllers/LelongController.php | 49 ++++++++++++------- app/Http/Controllers/PaymentController.php | 18 ++++--- app/Models/payment.php | 1 + app/Models/resit.php | 2 +- ...2022_01_25_010223_create_payment_table.php | 6 +-- .../views/lelong/senaraipemenang.blade.php | 10 ++-- 6 files changed, 52 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 78dc1433..401e13a6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -471,22 +471,27 @@ class LelongController extends Controller $updatebid->save(); $previous_siri = Resit::orderBy('id','desc')->first(); - if($previous_siri){ - $nosiri = $previous_siri->id + 1; - }else{ - $nosiri = 1; + $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(); } - - $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri); - - $resit = new Resit; - $resit->user_id = $bidder->user_id; - $resit->lelongbid_id = $bid->id; - $resit->reference_no = $reference_no; - $resit->billplz_id = ''; - $resit->total_payment = $bidder->hargabida; - $resit->resit_type = 2; // 1 = fee , 2 = bid - $resit->save(); } else { @@ -606,12 +611,20 @@ class LelongController extends Controller 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(); + $senaraiwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') - ->join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbid.lelong_id', $lelong_id) ->get(); - - return view('lelong.senaraipemenang',compact('senaraiwinner')); + + return view('lelong.senaraipemenang',compact('senaraiwinner','lelong_id')); } public function senaraimarhun($lelongid, $cawid){ diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index d8da8a02..fbdbc725 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -121,6 +121,10 @@ class PaymentController extends Controller $bid_id = explode(",", $request->eachbid); + $resit = Resit::where('lelong_id', $lelong_id) + ->first(); + + $total_hargabida = 0; foreach($bid_id as $bid){ $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -135,12 +139,7 @@ class PaymentController extends Controller ) ->first(); - $resit = Resit::where('lelongbid_id', $eachbid->lelongbid_id) - ->first(); - $resit->status = 'PAID'; - $resit->paid_at = $currentdate; - $resit->update(); - + $total_hargabida = $total_hargabida + $eachbid->hargabida; $payment = Payment::create([ 'user_id' => $request->user_id, 'lelongbidder_id' => $eachbid->lelongbidder_id, @@ -177,7 +176,12 @@ class PaymentController extends Controller $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/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/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php index 8a3dfc6d..5daf633c 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -64,7 +64,7 @@ class CreatePaymentTable extends Migration 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); @@ -77,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/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index 802d6fb0..920fa94b 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -28,18 +28,18 @@ @foreach($senaraiwinner as $winner) {{ $loop->iteration }} - {{ $winner['details']['name']}} - {{ $winner['details']['nokp']}} - {{ $winner['details']['notelbimbit']}} + {{ $winner['name']}} + {{ $winner['nokp']}} + {{ $winner['notelbimbit']}} {{ $winner['total_surat']}} {{ $winner['totalBid']}} {{ $winner['totalPay']}} - + @if( $winner['totalPay'] < $winner['totalBid'] ) - + @endif From 7b02802448ad094c66fa6465f685b8a1b15a373d Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:30:45 +0800 Subject: [PATCH 5/7] update --- app/Http/Controllers/ApiController.php | 50 ++++++++----------- .../Mobile/LelongMobileController.php | 32 +++++++----- 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index e10603b4..4cff9052 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -189,30 +189,6 @@ class ApiController extends Controller $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,17 @@ class ApiController extends Controller $resit->paid_at = $data['billplz']['paid_at']; $resit->save(); + $payment = new Payment; + $payment->user_id = $resit->user_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 +272,17 @@ 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->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/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index daf427fc..ae0c8efc 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); } From 2b94a7f862e3d6406f758384fe550d7838bd00a5 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:37:36 +0800 Subject: [PATCH 6/7] add senarai pemenang --- app/Http/Controllers/LelongController.php | 32 ++++++++++--- app/Http/Controllers/PaymentController.php | 3 -- .../views/lelong/senaraipemenang.blade.php | 24 +++------- .../views/lelong/senaraisagpemenang.blade.php | 45 +++++++++++++++++++ routes/web.php | 3 +- 5 files changed, 78 insertions(+), 29 deletions(-) create mode 100644 resources/views/lelong/senaraisagpemenang.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 401e13a6..d3aa8cec 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -610,7 +610,7 @@ class LelongController extends Controller } 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) @@ -618,13 +618,33 @@ class LelongController extends Controller ) ->groupBy('lelongbidder.user_id') ->get()->toArray(); + // dd($listwinner); - $senaraiwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') - ->join('users', 'lelongbidder.user_id', '=', 'users.id') - ->where('lelongbid.lelong_id', $lelong_id) - ->get(); + 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('senaraiwinner','lelong_id')); + 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){ diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index fbdbc725..dcdb122d 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -46,9 +46,7 @@ class PaymentController extends Controller foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); - // dd($userdetails); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - // ->join('payment', 'lelongbidder.lelongbid_id', '=', 'payment.lelongbid_id') ->where('user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) @@ -58,7 +56,6 @@ class PaymentController extends Controller foreach($SAGWin as $SAG){ $payment = Payment::where('lelongbid_id', $SAG->lelongbid_id) ->first(); - // dd($payment->total_payment); if($payment){ $total_payment = $total_payment + $payment->total_payment; diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index 920fa94b..59092f71 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -19,28 +19,20 @@ No Telefon Bilangan Surat Jumlah Bidaan(RM) - Jumlah Pembayaran(RM) - Penyata Bayaran Action - @foreach($senaraiwinner as $winner) + @foreach($listwinner as $winner) - {{ $loop->iteration }} - {{ $winner['name']}} - {{ $winner['nokp']}} - {{ $winner['notelbimbit']}} + {{ $loop->iteration }} + {{ $winner['details']['name']}} + {{ $winner['details']['nokp']}} + {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} {{ $winner['totalBid']}} - {{ $winner['totalPay']}} - - - - @if( $winner['totalPay'] < $winner['totalBid'] ) - - @endif + @endforeach @@ -58,10 +50,6 @@ "orderable": false }, { - "targets": 7, - "orderable": false - }, - { "targets": 6, "orderable": false } diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php new file mode 100644 index 00000000..6bb3075b --- /dev/null +++ b/resources/views/lelong/senaraisagpemenang.blade.php @@ -0,0 +1,45 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + + + @foreach($senaraisag as $senaraisag) + + + + + + + + + + @endforeach + +
NoNo RujukanTarikh LelongHarga Asas (RM)Harga Bida (RM)Masa BidaanAction
{{ $loop->iteration }} {{ $senaraisag['norujukan']}}{{ $senaraisag['t_lelong']}}{{ $senaraisag['hargaasas']}}{{ $senaraisag['hargabida']}}{{ $senaraisag['masa_bidaan']}} + +
+
+
+
+ +@endsection diff --git a/routes/web.php b/routes/web.php index c5ff7290..702c5584 100644 --- a/routes/web.php +++ b/routes/web.php @@ -78,14 +78,13 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); + Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); - Route::get('/SAGBidItem', ['as'=>'lelong.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); From 72372c2aaa74d92aac379c6682809920409165eb Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Thu, 24 Feb 2022 16:46:17 +0800 Subject: [PATCH 7/7] update --- app/Http/Controllers/ApiController.php | 4 +- .../Controllers/AuthMobile/AuthController.php | 1 + .../Mobile/LelongMobileController.php | 2 +- app/Http/Controllers/PaymentController.php | 4 +- app/Http/Controllers/PembidaController.php | 2 +- .../views/pembayaran/SAGBidItem.blade.php | 111 +++++++----------- 6 files changed, 48 insertions(+), 76 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 4cff9052..843d3507 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -182,7 +182,7 @@ 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; @@ -220,6 +220,7 @@ class ApiController extends Controller $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 @@ -274,6 +275,7 @@ class ApiController extends Controller $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 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/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index ae0c8efc..937886ac 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -72,7 +72,7 @@ class LelongMobileController extends Controller ->first(); $carts = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id') - join('lelong', 'lelongbid.lelong_id', '=', 'lelong.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', diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index fbdbc725..17e1dc01 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -108,7 +108,7 @@ class PaymentController extends Controller // } - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid')); + return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id')); } public function paymentdenokaunter(Request $request){ @@ -121,7 +121,7 @@ class PaymentController extends Controller $bid_id = explode(",", $request->eachbid); - $resit = Resit::where('lelong_id', $lelong_id) + $resit = Resit::where('lelong_id', $request->lelong_id) ->first(); $total_hargabida = 0; 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/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 8445cc62..6792a501 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -64,6 +64,7 @@
@csrf +
@@ -79,12 +80,12 @@
- +
- +
@@ -108,37 +109,37 @@ RM1 - - - - - RM0.05 - - - RM5 - - - - - RM0.10 - - - RM10 - RM0.20 + RM0.05 + + + RM5 - RM20 + + + RM0.10 + + + RM10 - RM0.50 + RM0.20 + + + RM20 + + + RM0.50 + + RM50 @@ -187,19 +188,13 @@ $('#denominasiHQModal').modal('show'); var total_sum = parseFloat($('#total').val()); $('#amaundiminta').val(parseFloat(total_sum).toFixed(2)); + $('#amaunkiraan').val(parseFloat(0).toFixed(2)); } function sum(val, e){ //e = get all data - if(arraylelongbid.length != 0) - { - $("#btnterima").prop("disabled", false); - } - else - { - $("#btnterima").prop("disabled", true); - } - + console.log(arraylelongbid.length); + let bid_id = $(e).data('bid_id'); - console.log(bid_id); + // console.log(bid_id); if(e.checked==true) //checkbox { arraylelongbid.push(bid_id); @@ -209,37 +204,27 @@ } else{ var index = arraylelongbid.findIndex(function(item) {return item == bid_id}); - console.log(index); + // console.log(index); arraylelongbid.splice(index, 1); var total_sum = parseFloat($('#total').val()); total_sum = total_sum - parseFloat(val); $('#total').val(parseFloat(total_sum).toFixed(2)); } - console.log(arraylelongbid); + // console.log(arraylelongbid); + if(arraylelongbid.length != 0) + { + $("#btnterima").prop("disabled", false); + } + else + { + $("#btnterima").prop("disabled", true); + } } function totalamount(idwang,bilangan) { var amount = 0; - switch (idwang) { - case 'bundle1': - amount += (bilangan * 100); - break; - case 'bundle20': - amount += (bilangan * 1000); - break; - case 'bundle5': - amount += (bilangan * 500); - break; - case 'bundle50': - amount += (bilangan * 5000); - break; - case 'bundle10': - amount += (bilangan * 1000); - break; - case 'bundle100': - amount += (bilangan * 5000); - break; + switch (idwang) { case 'sen1': amount += (bilangan * 0.01); break; @@ -247,8 +232,8 @@ amount += (bilangan * 0.05); break; case 'sen10': - amount += (bilangan * 0.10); - break; + amount += (bilangan * 0.10); + break; case 'sen20': amount += (bilangan * 0.20); break; @@ -306,22 +291,6 @@ amount += arr[1]; }); - // if(id === 'serahan') - // { - // var deno = $(datakeyin).data('deno'); - - // if(valkey > deno) - // { - // $.alert({ - // title: 'Alert!', - // content: 'Simple alert!', - // }); - - // return false; - // } - - // } - if(amount > validate) { $.alert({ @@ -332,7 +301,7 @@ else { - $('#amaunkiraan').val(amount); + $('#amaunkiraan').val(parseFloat(amount).toFixed(2)); }