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

Merge branch 'amirah' of https://gitlab.com/azfararsyad/lelong into amirah

Browse Source
This commit is contained in:
Amirah22
2022-02-27 11:55:26 +08:00
parent 2a5335340f 6f38796d12
commit 6539a1592c
16 changed files with 569 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ApiController.php
+23 -31
View File
@@ -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
app/Http/Controllers/AuthMobile/AuthController.php
+1
View File
@@ -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
app/Http/Controllers/LelongController.php
+69
View File
@@ -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();
app/Http/Controllers/Mobile/LelongMobileController.php
+19 -13
View File
@@ -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);
}
app/Http/Controllers/PaymentController.php
+41 -39
View File
@@ -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');
}
app/Http/Controllers/PembidaController.php
+1 -1
View File
@@ -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);
app/Models/payment.php
+1
View File
@@ -15,6 +15,7 @@ class payment extends Model
'user_id',
'lelongbidder_id',
'lelongbid_id',
'lelong_id',
'kodcaw',
'back_acc_pembeli',
'bank_acc_no_pembeli',
app/Models/resit.php
+1 -1
View File
@@ -13,7 +13,7 @@ class resit extends Model
protected $fillable = [
'user_id',
'lelongbid_id',
'lelong_id',
'reference_no',
'billplz_id',
'total_payment',
composer.lock
Generated
+198 -1
View File
@@ -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",
database/migrations/2022_01_25_010223_create_payment_table.php
+9 -4
View File
@@ -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');
});
resources/views/lelong/senarailelong.blade.php
+2 -2
View File
@@ -37,7 +37,7 @@
<td class="text-center">
@hasrole('jurulelong')
@if(!$lel->masatamat_lelong)
@if($lel->sts_lelong == 0)
<a href="{{ route('lelong.refresh',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data"><i class="fas fa-sync-alt"></i></a>
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Start Lelong"><i class="fa fa-play"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Delete"><i class="far fa-trash-alt"></i></a>
@@ -45,7 +45,7 @@
@elseif ($lel->sts_lelong == 2)
<a href="{{ route('lelong.janapemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
@elseif ($lel->sts_lelong == 3)
<a href="{{ route('lelong.janapemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
<a href="{{ route('lelong.senaraipemenang',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
@else
<a class="stoplelong" href="{{ route('lelong.stop',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a>
@endif
resources/views/lelong/senaraipemenang.blade.php
+96
View File
@@ -0,0 +1,96 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="tablekaunter" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Nama</th>
<th>No Kad Pengenalan</th>
<th>No Telefon</th>
<th>Bilangan Surat</th>
<th>Jumlah Bidaan(RM)</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($listwinner as $winner)
<tr>
<td> {{ $loop->iteration }} </td>
<td>{{ $winner['details']['name']}}</td>
<td>{{ $winner['details']['nokp']}}</td>
<td>{{ $winner['details']['notelbimbit']}}</td>
<td>{{ $winner['total_surat']}}</td>
<td>{{ $winner['totalBid']}}</td>
<td>
<a href=" {{ route('lelong.senaraisagpemenang', ['lelong_id'=>$lelong_id, 'user_id'=>$winner['user_id']]) }} "><i class="far fa-edit"></i></a>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<script>
var tablekaunter = $('#tablekaunter').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 6,
"orderable": false
}
],
order: [[1, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
// buttons: [
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Cawangan',
// action: function ( e, dt, node, config ) {
// // alert( 'Button activated' );
// // console.log('hye');
// $('#myModal').modal("show");
// $('#myModal').on('shown.bs.modal', function () {
// $('#rolename').trigger('focus')
// })
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
// ]
});
// $('.addcaw').tooltip();
// $('.export').tooltip();
// // $( '.dt-buttons').addClass('btn-group');
// $( '.addcaw').removeClass('dt-button');
// $( '.export').removeClass('dt-button');
</script>
@endsection
resources/views/lelong/senaraisagpemenang.blade.php
+45
View File
@@ -0,0 +1,45 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<table class="table table-striped table-xl text-center" id="tablekaunter" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Tarikh Lelong</th>
<th>Harga Asas (RM)</th>
<th>Harga Bida (RM)</th>
<th>Masa Bidaan</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($senaraisag as $senaraisag)
<tr>
<td> {{ $loop->iteration }} </td>
<td>{{ $senaraisag['norujukan']}}</td>
<td>{{ $senaraisag['t_lelong']}}</td>
<td>{{ $senaraisag['hargaasas']}}</td>
<td>{{ $senaraisag['hargabida']}}</td>
<td>{{ $senaraisag['masa_bidaan']}}</td>
<td>
<input type="checkbox" aria-label="Checkbox for following text input" >
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endsection
resources/views/pembayaran/SAGBidItem.blade.php
+52 -66
View File
@@ -36,18 +36,24 @@
<td class="text-center">{{ $biditem->norujukan}}</td>
<td class="text-center">{{ $biditem->hargaasas}}</td>
<td class="text-center">{{ $biditem->hargabida}}</td>
<td class="text-center"><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}"></td>
<td class="text-center">
@if($biditem->status_payment == 0)
<input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
@else
<span class="btn btn-danger btn-sm hovernone-danger">PAID</span>
@endif
</td>
</tr>
@endforeach
<tr>
<td colspan="3"><b> Jumlah Bayaran </b></td>
<td colspan="3"><b> Jumlah Bayaran</b></td>
<td class="text-center"><b>RM<input type="text" id="total" value="0" style="border: none;" readonly></b></td>
<td> </td>
</tr>
</tbody>
</table>
<div class="text-right">
<button type="button" class="btn btn-danger" style="width:15%" onclick="functerima()">Terima</button>
<button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Terima</button>
</div>
</div>
</div>
@@ -58,6 +64,7 @@
<form action="{{ route('pembayaran.paymentdenokaunter') }}" method="POST" id="formpaymentdenokaunter">
@csrf
<input type="hidden" name="user_id" value="{{ $SAGBidItem->id }}" />
<input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
<input type="hidden" name="eachbid" id="eachbid" value="" />
<div class="modal-content">
@@ -73,12 +80,12 @@
</div>
<div class="col" style="margin: 11px;">
<label>Amaun Sebenar</label>
<input type="text" class="form-control" id="amaundiminta" placeholder="0.00" readonly>
<input type="text" class="form-control" id="amaundiminta" value="0.00" readonly>
</div>
<div class="col" style="margin: 11px;">
<label>Amaun Kiraan</label>
<input type="text" class="form-control" name="amaunkiraan" id="amaunkiraan" placeholder="0.00" readonly>
<input type="text" class="form-control" name="amaunkiraan" id="amaunkiraan" value="0.00" readonly>
</div>
</div>
</div>
@@ -102,37 +109,37 @@
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly /> </td>
<td>RM1</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly /> </td>
<td>RM5</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly /> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.20</td>
<td>RM0.05</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly /> </td>
<td>RM5</td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly /> </td>
<td> RM20</td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly /> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.50</td>
<td>RM0.20</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly /> </td>
<td> RM20</td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly /> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalsen500" id="totalsen50" class="form-control" value="0.00" readonly /> </td>
<td>RM50</td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" onkeyup="kiraan(this)" /> </td>
<td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly /> </td>
@@ -158,7 +165,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" onclick="funcbatal()">Batal</button>
<button type="button" class="btn btn-success" data-toggle="modal" data-target=".bd-example-modal-sm" onclick="terimadeno()" >Terima</button>
<button type="button" class="btn btn-success" data-toggle="modal" data-target=".bd-example-modal-sm" onclick="terimadeno()" >Terima</button>
</div>
</div>
</form>
@@ -168,6 +175,7 @@
<script>
var arraylelongbid = [];
$("#btnterima").prop("disabled", true);
function terimadeno() {
$('#eachbid').val(arraylelongbid);
$("#formpaymentdenokaunter").submit();
@@ -176,13 +184,17 @@
$('#denominasiHQModal').modal('hide');
}
function functerima(){
$('#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
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);
@@ -192,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;
@@ -230,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;
@@ -289,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({
@@ -315,7 +301,7 @@
else
{
$('#amaunkiraan').val(amount);
$('#amaunkiraan').val(parseFloat(amount).toFixed(2));
}
resources/views/pembayaran/kaunterpembayaran.blade.php
+9 -3
View File
@@ -19,7 +19,8 @@
<th>No Telefon</th>
<th>Bilangan Surat</th>
<th>Jumlah Bidaan(RM)</th>
<th>Resit Bayaran</th>
<th>Jumlah Pembayaran(RM)</th>
<th>Penyata Bayaran</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -32,10 +33,15 @@
<td>{{ $winner['details']['notelbimbit']}}</td>
<td>{{ $winner['total_surat']}}</td>
<td>{{ $winner['totalBid']}}</td>
<td>{{ $winner['totalPay']}}</td>
<td>
<a href=" # " target = "blank" ><i class="fas fa-download"></i></a>
<a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" ><i class="fas fa-download"></i></a>
</td>
<td>
@if( $winner['totalPay'] < $winner['totalBid'] )
<a href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} "><i class="far fa-edit"></i></a>
@endif
</td>
<td><a href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} "><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
routes/web.php
+2 -2
View File
@@ -77,14 +77,14 @@ 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('/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']);