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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-04-03 13:23:32 +08:00
parent 7614969354 691a32a94d
commit e19b839ab5
14 changed files with 308 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+35 -29
View File
@@ -32,17 +32,13 @@ class AccountController extends Controller
public function listbayaranonline($lelong_id){
// $listwinner = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id')
// ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id')
// ->where('lelongbidder.status_bidder', 1)
// ->where('lelongbid.lelong_id', $lelong_id)
// ->select('payment.user_id'
// )
// ->groupBy('payment.user_id')
// ->get();
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', 'payment.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('payment.status_payment_opt',2)
->whereNull('payment.disahkan_pada')
->select('.lelongbidder.user_id'
)
->groupBy('lelongbidder.user_id')
@@ -105,13 +101,20 @@ class AccountController extends Controller
->where('payment.status_payment_opt', 2)
->get()->toArray();
$total_payment = 0;
foreach($senaraisag as $index1=>$sagbid){
$saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->select(
'lelongbidder.payment_id as payment_id'
)
->groupBy('lelongbidder.payment_id')
->get();
// $payments = Payment::whereIn($saggroupbyid)->get()
$total_payment = Payment::whereIn('id',$saggroupbyid)->get()->sum('total_payment');
if($sagbid['total_payment']){
$total_payment = $total_payment +$sagbid['total_payment'];
}
}
return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment'));
}
@@ -124,6 +127,7 @@ class AccountController extends Controller
$user = Auth::user();
$senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('lelongbid.lelong_id', $request->lelong_id)
@@ -139,32 +143,34 @@ class AccountController extends Controller
->get();
$total_payment = 0;
foreach($senaraisag as $sag)
$paymentid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbidder.user_id', $request->user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->select(
'lelongbidder.payment_id as payment_id'
)
->groupBy('lelongbidder.payment_id')
->get();
foreach($paymentid as $dataid)
{
$payment = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
->where('payment.lelong_id', $request->lelong_id)
->where('payment.user_id', $request->user_id)
// ->where('lelongbidder.lelongbid_id', $sag->lelongbid_id)
->first();
// dd($payment);
$payment = Payment::where('id', $dataid->payment_id)->first();
$payment->disahkan_oleh = $user->id;
$payment->disahkan_pada = $currentdate;
$payment->save();
$total_payment = $total_payment + $payment->total_payment;
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->save();
}
foreach($senaraisag as $sag)
{
$eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
$eachbid->status_payment = 1;
$eachbid->status_jual = 1;
$eachbid->t_jual = $currentdate;
$eachbid->save();
}
$senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
app/Http/Controllers/ApiController.php
+19 -8
View File
@@ -61,9 +61,9 @@ class ApiController extends Controller
}else{
$this->api_key = 'f3e82fe1-a422-4660-97f0-65cc59ff6c47';
$this->XSignature_Key = 'S-alZUbzmD2_TF3vmrRqgehQ';
$this->collection_id = 'drxdyor4';
}
}
public function biditem()
@@ -126,6 +126,10 @@ class ApiController extends Controller
}
}
public function testbillplz()
{
return view('pembayaran.testbillplz');
}
public function feepayment(Request $request)
{
@@ -152,7 +156,7 @@ class ApiController extends Controller
$month = $current->month;
$year = $current->format('y');
$total_bayaran = 1000;
$total_bayaran = 1100;
$collection_id = $this->collection_id;
$response = $bill->create(
@@ -190,7 +194,11 @@ class ApiController extends Controller
$resit->save();
return redirect($billcode['url'] . '?auto_submit=true');
// return redirect($billcode['url'] . '?auto_submit=true');
return response()->json([
'success' => true,
'message' => $billcode['url'],
], 401);
// return view('pembayaran.result.berjaya',compact('arraybayaran'));
}
@@ -225,7 +233,7 @@ class ApiController extends Controller
$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->remark = 'BAYARAN ONLINE';
$payment->save();
event(new PaymentNotify('PAID',$resit->user_id,$payment->id));
@@ -280,7 +288,7 @@ class ApiController extends Controller
$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->remark = 'BAYARAN ONLINE';
$payment->save();
event(new PaymentNotify('PAID',$resit->user_id,$payment->id));
@@ -330,7 +338,7 @@ class ApiController extends Controller
$month = $current->month;
$year = $current->format('y');
$total_bayaran = ($request->total)*100;
$total_bayaran = ($request->total)*100+100;
$collection_id = $this->collection_id;
$response = $bill->create(
@@ -368,8 +376,11 @@ class ApiController extends Controller
$resit->save();
return redirect($billcode['url'] . '?auto_submit=true');
// return redirect($billcode['url'] . '?auto_submit=true');
return response()->json([
'success' => true,
'message' => $billcode['url'],
], 401);
// return view('pembayaran.result.berjaya',compact('arraybayaran'));
}
app/Http/Controllers/AuthMobile/AuthController.php
+1
View File
@@ -14,6 +14,7 @@ use Illuminate\Support\Facades\Validator;
class AuthController extends Controller
{
public function register(Request $request) {
// dd($request->all);
$validator = Validator::make($request->all(), [
'name' => 'required|string',
'username' => 'required|string|unique:users',
app/Http/Controllers/MarhunController.php
+2 -1
View File
@@ -197,13 +197,14 @@ class MarhunController extends Controller
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->lelongbidmarhun_id = $lelongbidmarhun->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 2;
$karat->save();
return redirect()->route('marhun.show',$lelongbid->id)
return redirect()->route('marhun.show',[$lelongbid->id,$lelongbid->lelong_id])
->with('success','Marhun Berjaya Ditambah');
}
app/Http/Controllers/Mobile/LelongMobileController.php
+34 -5
View File
@@ -14,6 +14,7 @@ use App\Models\Payment;
use App\Models\Cart;
use Carbon\Carbon;
use App\Models\Cawangan;
use App\Models\Resit;
class LelongMobileController extends Controller
{
@@ -72,8 +73,12 @@ class LelongMobileController extends Controller
public function bidderSelectBidItem(Request $request){
$feepayment = Payment::where('lelong_id', '=', $request->lelong_id)->first();
$feepayment = Payment::join('resit', 'payment.resit_id','=','resit.id')
->where('payment.user_id',$request->user_id)
->where('payment.lelong_id', '=', $request->lelong_id)
->where('resit.resit_type',1)
->where('resit.status','PAID')->first();
// dd($feepayment);
if($feepayment != null){
$user = User::where('id', '=', $request->user_id)
@@ -90,7 +95,7 @@ class LelongMobileController extends Controller
'carts.hargabida',
'carts.id as cart_id')
->get();
// dd($carts);
// dd($selectBid[0]->hargabida);
$currentdate = Carbon::now()->toDateTimeString();
@@ -227,7 +232,8 @@ class LelongMobileController extends Controller
foreach($lelongbid as $bid)
{
$lelongbidder = LelongBidder::where('lelongbid_id',$bid->id)->first();
$lelongbidder = LelongBidder::where('lelongbid_id',$bid->id)
->where('user_id',$request->user_id)->first();
$lelongbidder->status_payment =1;
$lelongbidder->payment_id = $request->paymentid;
$lelongbidder->save();
@@ -237,7 +243,28 @@ class LelongMobileController extends Controller
$lelongbid->t_jual = $currentdate;
$lelongbid->hargajual = $lelongbidder->hargabida;
$lelongbid->save();
}
// $alllelongbidder = LelongBidder::join('lelongbid','lelongbidder.lelongbid_id','lelongbid.id')
// ->where('lelongbidder.user_id',$request->user_id)
// ->where('lelongbid.lelong_id',$request->lelong_id)
// ->where('lelongbidder.status_bidder',1)
// ->select('lelongbidder.hargabida')
// ->get();
// $resit = Resit::where('lelong_id',$request->lelong_id)
// ->where('user_id',$request->user_id)
// ->where('resit_type',2)
// ->first();
// if($resit->total_payment > $alllelongbidder->SUM('hargabida'))
// {
// $resit->status = 'PAID';
// $resit->paid_at = $currentdate;
// $resit->save();
// }
$response = [
'success' => "success",
'message' => "Bidaan berjaya dibayar"
@@ -264,7 +291,9 @@ class LelongMobileController extends Controller
{
// dd($lelong['id']);
$datalelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.lelong_id',$lelong['id'])->get();
->where('lelongbid.lelong_id',$lelong['id'])
->where('user_id',$user_id)
->where('status_bidder',1)->get();
$payment = Payment::join('resit', 'payment.resit_id', '=', 'resit.id')
->where('payment.lelong_id',$lelong['id'])
app/Http/Controllers/PaymentController.php
+1
View File
@@ -170,6 +170,7 @@ class PaymentController extends Controller
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->where('user_id',$request->user_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->payment_id = $payment->id;
composer.json
+2 -2
View File
@@ -8,9 +8,9 @@
"php": "^7.3|^8.0",
"barryvdh/laravel-dompdf": "^0.9.0",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"guzzlehttp/guzzle": "^7.4",
"intervention/image": "^2.7",
"jomweb/billplz": "4.1",
"jomweb/billplz": "^4.4",
"laravel/framework": "^8.65",
"laravel/sanctum": "^2.13",
"laravel/tinker": "^2.5",
composer.lock
Generated
+119 -108
View File
@@ -190,16 +190,16 @@
},
{
"name": "clue/stream-filter",
"version": "v1.5.0",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/clue/stream-filter.git",
"reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320"
"reference": "d6169430c7731d8509da7aecd0af756a5747b78e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/clue/stream-filter/zipball/aeb7d8ea49c7963d3b581378955dbf5bc49aa320",
"reference": "aeb7d8ea49c7963d3b581378955dbf5bc49aa320",
"url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e",
"reference": "d6169430c7731d8509da7aecd0af756a5747b78e",
"shasum": ""
},
"require": {
@@ -210,12 +210,12 @@
},
"type": "library",
"autoload": {
"psr-4": {
"Clue\\StreamFilter\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"Clue\\StreamFilter\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -240,7 +240,7 @@
],
"support": {
"issues": "https://github.com/clue/stream-filter/issues",
"source": "https://github.com/clue/stream-filter/tree/v1.5.0"
"source": "https://github.com/clue/stream-filter/tree/v1.6.0"
},
"funding": [
{
@@ -252,7 +252,7 @@
"type": "github"
}
],
"time": "2020-10-02T12:38:20+00:00"
"time": "2022-02-21T13:15:14+00:00"
},
{
"name": "dflydev/dot-access-data",
@@ -836,16 +836,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.4.0",
"version": "7.4.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94"
"reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94",
"reference": "868b3571a039f0ebc11ac8f344f4080babe2cb94",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"reference": "ac1ec1cd9b5624694c3a40be801d94137afb12b4",
"shasum": ""
},
"require": {
@@ -854,7 +854,7 @@
"guzzlehttp/psr7": "^1.8.3 || ^2.1",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2"
"symfony/deprecation-contracts": "^2.2 || ^3.0"
},
"provide": {
"psr/http-client-implementation": "1.0"
@@ -878,12 +878,12 @@
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"GuzzleHttp\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -940,7 +940,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.4.0"
"source": "https://github.com/guzzle/guzzle/tree/7.4.2"
},
"funding": [
{
@@ -956,7 +956,7 @@
"type": "tidelift"
}
],
"time": "2021-10-18T09:52:00+00:00"
"time": "2022-03-20T14:16:28+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -985,12 +985,12 @@
}
},
"autoload": {
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1044,16 +1044,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "2.1.0",
"version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72"
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
"reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2",
"reference": "c94a94f120803a18554c1805ef2e539f8285f9a2",
"shasum": ""
},
"require": {
@@ -1077,7 +1077,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "2.2-dev"
}
},
"autoload": {
@@ -1139,7 +1139,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.1.0"
"source": "https://github.com/guzzle/psr7/tree/2.2.1"
},
"funding": [
{
@@ -1155,7 +1155,7 @@
"type": "tidelift"
}
],
"time": "2021-10-06T17:43:30+00:00"
"time": "2022-03-20T21:55:58+00:00"
},
{
"name": "http-interop/http-factory-guzzle",
@@ -1350,34 +1350,35 @@
},
{
"name": "jomweb/billplz",
"version": "v4.1.0",
"version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/jomweb/billplz.git",
"reference": "6449dcbb1b89fd9d98c1d68235b3801b1dc4ee25"
"reference": "7b8fdde601155106df007edbcf2d36bf77822aae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jomweb/billplz/zipball/6449dcbb1b89fd9d98c1d68235b3801b1dc4ee25",
"reference": "6449dcbb1b89fd9d98c1d68235b3801b1dc4ee25",
"url": "https://api.github.com/repos/jomweb/billplz/zipball/7b8fdde601155106df007edbcf2d36bf77822aae",
"reference": "7b8fdde601155106df007edbcf2d36bf77822aae",
"shasum": ""
},
"require": {
"jomweb/ringgit": "^2.1",
"laravie/codex": "^5.1",
"laravie/codex-filter": "^1.0",
"php": ">=7.2",
"jomweb/ringgit": "^2.3.1",
"laravie/codex": "^5.3.3",
"laravie/codex-filter": "^1.2.2",
"php": "^7.2 || ^8.0",
"php-http/multipart-stream-builder": "^1.0"
},
"require-dev": {
"mockery/mockery": "^1.3.1",
"php-http/curl-client": "^2.0",
"phpunit/phpunit": "^8.4 || ^9.0"
"mockery/mockery": "~1.3.1 || ^1.4.4",
"php-http/guzzle7-adapter": "^1.0",
"phpstan/phpstan": "^1.0",
"phpunit/phpunit": "^8.5.21 || ^9.5.10 || ^10.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.1-dev"
"dev-master": "4.x-dev"
}
},
"autoload": {
@@ -1398,9 +1399,19 @@
"description": "PHP Agnostic library for working with BillPlz API",
"support": {
"issues": "https://github.com/jomweb/billplz/issues",
"source": "https://github.com/jomweb/billplz/tree/4.x"
"source": "https://github.com/jomweb/billplz/tree/v4.4.0"
},
"time": "2020-02-17T14:15:32+00:00"
"funding": [
{
"url": "https://paypal.me/crynobone",
"type": "custom"
},
{
"url": "https://liberapay.com/crynobone",
"type": "liberapay"
}
],
"time": "2022-02-08T03:36:54+00:00"
},
{
"name": "jomweb/ringgit",
@@ -1822,40 +1833,40 @@
},
{
"name": "laravie/codex",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/laravie/codex.git",
"reference": "07fbd9ffd09303b4964d305ad0c2bc738327def7"
"reference": "5434e8e33d008d3cf177dfa27b227d46995f97ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravie/codex/zipball/07fbd9ffd09303b4964d305ad0c2bc738327def7",
"reference": "07fbd9ffd09303b4964d305ad0c2bc738327def7",
"url": "https://api.github.com/repos/laravie/codex/zipball/5434e8e33d008d3cf177dfa27b227d46995f97ec",
"reference": "5434e8e33d008d3cf177dfa27b227d46995f97ec",
"shasum": ""
},
"require": {
"laravie/codex-common": "^1.4.3",
"laravie/codex-common": "^1.5.1",
"php": "^7.2 || ^8.0"
},
"require-dev": {
"guzzlehttp/guzzle": "^7.0.1",
"laravie/codex-filter": "^1.2.1",
"laravie/codex-filter": "^1.2.2",
"mockery/mockery": "^1.3.1",
"php-http/guzzle7-adapter": "^1.0",
"php-http/multipart-stream-builder": "^1.0",
"phpstan/phpstan": "^0.12.90",
"phpunit/phpunit": "^8.4 || ^9.3.3"
"phpstan/phpstan": "^1.0",
"phpunit/phpunit": "^8.5.21 || ^9.5.10"
},
"suggest": {
"laravie/codex-filter": "Content filtering for Laravie Codex (^1.0)",
"laravie/codex-filter": "Content filtering for Laravie Codex (^1.2.2)",
"php-http/multipart-stream-builder": "Allow to send multipart form request (^1.0)",
"phpunit/phpunit": "Allow to use Codex Faker request during testing (^8.4 || ^9.0)"
"phpunit/phpunit": "Allow to use Codex Faker request during testing (^8.5.21 || ^9.5.10)"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.x-dev"
"dev-master": "6.x-dev"
}
},
"autoload": {
@@ -1876,7 +1887,7 @@
"description": "PHP library for building API Client SDK for PHP",
"support": {
"issues": "https://github.com/laravie/codex/issues",
"source": "https://github.com/laravie/codex/tree/v5.3.2"
"source": "https://github.com/laravie/codex/tree/v5.3.3"
},
"funding": [
{
@@ -1888,20 +1899,20 @@
"type": "liberapay"
}
],
"time": "2021-08-01T14:35:33+00:00"
"time": "2022-02-08T03:05:53+00:00"
},
{
"name": "laravie/codex-common",
"version": "v1.5.0",
"version": "v1.5.1",
"source": {
"type": "git",
"url": "https://github.com/laravie/codex-common.git",
"reference": "c843dcc1aefd326251d3415f3d74db1da2213e3e"
"reference": "5eaa8bfc457b5c0a07c4663d7c2828244c9058a6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravie/codex-common/zipball/c843dcc1aefd326251d3415f3d74db1da2213e3e",
"reference": "c843dcc1aefd326251d3415f3d74db1da2213e3e",
"url": "https://api.github.com/repos/laravie/codex-common/zipball/5eaa8bfc457b5c0a07c4663d7c2828244c9058a6",
"reference": "5eaa8bfc457b5c0a07c4663d7c2828244c9058a6",
"shasum": ""
},
"require": {
@@ -1923,9 +1934,9 @@
"autoload": {
"psr-4": {
"Laravie\\Codex\\Common\\": "src/Common/",
"Laravie\\Codex\\Testing\\": "src/Testing/",
"Laravie\\Codex\\Contracts\\": "src/Contracts/",
"Laravie\\Codex\\Exceptions\\": "src/Exceptions/",
"Laravie\\Codex\\Testing\\": "src/Testing/"
"Laravie\\Codex\\Exceptions\\": "src/Exceptions/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1941,7 +1952,7 @@
"description": "Common PHP library for building API Client SDK for PHP",
"support": {
"issues": "https://github.com/laravie/codex-common/issues",
"source": "https://github.com/laravie/codex-common/tree/v1.5.0"
"source": "https://github.com/laravie/codex-common/tree/v1.5.1"
},
"funding": [
{
@@ -1953,32 +1964,32 @@
"type": "liberapay"
}
],
"time": "2022-01-06T03:05:05+00:00"
"time": "2022-02-08T02:29:24+00:00"
},
{
"name": "laravie/codex-filter",
"version": "v1.2.1",
"version": "v1.2.2",
"source": {
"type": "git",
"url": "https://github.com/laravie/codex-filter.git",
"reference": "a902b7ce2faef50ca97508569900a96488a35a9e"
"reference": "0ff6a2556cb71e8080f1b92b82aa54630424d57b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravie/codex-filter/zipball/a902b7ce2faef50ca97508569900a96488a35a9e",
"reference": "a902b7ce2faef50ca97508569900a96488a35a9e",
"url": "https://api.github.com/repos/laravie/codex-filter/zipball/0ff6a2556cb71e8080f1b92b82aa54630424d57b",
"reference": "0ff6a2556cb71e8080f1b92b82aa54630424d57b",
"shasum": ""
},
"require": {
"igorw/get-in": "^1.0",
"laravie/codex-common": "^1.4",
"laravie/codex-common": "^1.5.1",
"php": "^7.2 || ^8.0"
},
"require-dev": {
"mockery/mockery": "^1.3.1",
"php-http/guzzle7-adapter": "^0.1",
"phpstan/phpstan": "0.12.x-dev",
"phpunit/phpunit": "^8.4 || ^9.3.3"
"mockery/mockery": "~1.3.1 || ^1.4.4",
"php-http/guzzle7-adapter": "^1.0",
"phpstan/phpstan": "^1.0",
"phpunit/phpunit": "^8.5.21 || ^9.5.10"
},
"type": "library",
"extra": {
@@ -2004,7 +2015,7 @@
"description": "Content filtering for Laravie Codex",
"support": {
"issues": "https://github.com/laravie/codex-filter/issues",
"source": "https://github.com/laravie/codex-filter/tree/v1.2.1"
"source": "https://github.com/laravie/codex-filter/tree/v1.2.2"
},
"funding": [
{
@@ -2016,7 +2027,7 @@
"type": "liberapay"
}
],
"time": "2021-08-01T13:57:49+00:00"
"time": "2022-02-08T02:38:37+00:00"
},
{
"name": "league/commonmark",
@@ -3338,16 +3349,16 @@
},
{
"name": "php-http/httplug",
"version": "2.2.0",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/httplug.git",
"reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9"
"reference": "f640739f80dfa1152533976e3c112477f69274eb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/httplug/zipball/191a0a1b41ed026b717421931f8d3bd2514ffbf9",
"reference": "191a0a1b41ed026b717421931f8d3bd2514ffbf9",
"url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb",
"reference": "f640739f80dfa1152533976e3c112477f69274eb",
"shasum": ""
},
"require": {
@@ -3394,22 +3405,22 @@
],
"support": {
"issues": "https://github.com/php-http/httplug/issues",
"source": "https://github.com/php-http/httplug/tree/master"
"source": "https://github.com/php-http/httplug/tree/2.3.0"
},
"time": "2020-07-13T15:43:23+00:00"
"time": "2022-02-21T09:52:22+00:00"
},
{
"name": "php-http/message",
"version": "1.12.0",
"version": "1.13.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/message.git",
"reference": "39eb7548be982a81085fe5a6e2a44268cd586291"
"reference": "7886e647a30a966a1a8d1dad1845b71ca8678361"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/message/zipball/39eb7548be982a81085fe5a6e2a44268cd586291",
"reference": "39eb7548be982a81085fe5a6e2a44268cd586291",
"url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361",
"reference": "7886e647a30a966a1a8d1dad1845b71ca8678361",
"shasum": ""
},
"require": {
@@ -3426,7 +3437,7 @@
"ext-zlib": "*",
"guzzlehttp/psr7": "^1.0",
"laminas/laminas-diactoros": "^2.0",
"phpspec/phpspec": "^5.1 || ^6.3",
"phpspec/phpspec": "^5.1 || ^6.3 || ^7.1",
"slim/slim": "^3.0"
},
"suggest": {
@@ -3442,12 +3453,12 @@
}
},
"autoload": {
"psr-4": {
"Http\\Message\\": "src/"
},
"files": [
"src/filters.php"
]
],
"psr-4": {
"Http\\Message\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3468,9 +3479,9 @@
],
"support": {
"issues": "https://github.com/php-http/message/issues",
"source": "https://github.com/php-http/message/tree/1.12.0"
"source": "https://github.com/php-http/message/tree/1.13.0"
},
"time": "2021-08-29T09:13:12+00:00"
"time": "2022-02-11T13:41:14+00:00"
},
{
"name": "php-http/message-factory",
@@ -4803,16 +4814,16 @@
},
{
"name": "symfony/deprecation-contracts",
"version": "v2.4.0",
"version": "v2.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
"reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
"reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
"shasum": ""
},
"require": {
@@ -4821,7 +4832,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "2.4-dev"
"dev-main": "2.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -4850,7 +4861,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
},
"funding": [
{
@@ -4866,7 +4877,7 @@
"type": "tidelift"
}
],
"time": "2021-03-23T23:28:01+00:00"
"time": "2021-07-12T14:48:14+00:00"
},
{
"name": "symfony/error-handler",
@@ -5510,16 +5521,16 @@
},
{
"name": "symfony/options-resolver",
"version": "v5.4.0",
"version": "v5.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "b0fb78576487af19c500aaddb269fd36701d4847"
"reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847",
"reference": "b0fb78576487af19c500aaddb269fd36701d4847",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8",
"reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8",
"shasum": ""
},
"require": {
@@ -5559,7 +5570,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v5.4.0"
"source": "https://github.com/symfony/options-resolver/tree/v5.4.3"
},
"funding": [
{
@@ -5575,7 +5586,7 @@
"type": "tidelift"
}
],
"time": "2021-11-23T10:19:22+00:00"
"time": "2022-01-02T09:53:40+00:00"
},
{
"name": "symfony/polyfill-ctype",
resources/views/excel/listnotis_excel.blade.php
+1 -1
View File
@@ -77,7 +77,7 @@
<td align="left">{{ $loop->iteration }} </td>
<td align="left">{{ $pay['nama']}}</td>
<td align="left">{{ $pay['norujukan']}}</td>
<td align="left">{{ $pay['telefon']}}</td>
<td align="left">6{{ $pay['telefon']}}</td>
<td align="left">{{ $pay['jbg']}}</td>
<td align="left">{{ $pay['nokp']}}</td>
<td align="left">{{ $pay['pinjaman']}}</td>
resources/views/includes/sidebar.blade.php
+3
View File
@@ -33,6 +33,9 @@
<li class="{{ (request()->is('sistem/database') || request()->is('sistem/database/*')) ? 'active' : '' }}">
<a href="{{url('sistem/database')}}">Pengurusan Database</a>
</li>
<li class="{{ (request()->is('payment/testbillplz') || request()->is('payment/testbillplz/*')) ? 'active' : '' }}">
<a href="{{url('payment/testbillplz')}}">Testing billplz</a>
</li>
{{-- <li>
<a href="#">Portfolio</a>
</li>
resources/views/pembayaran/kaunterpembayaran.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@
<th>No Telefon</th>
<th>Bilangan Surat</th>
<th>Jumlah Bidaan(RM)</th>
<th>Jumlah Pembayaran(RM)</th>
<th>Amaun Telah Dibayar(RM)</th>
<th>Penyata Bayaran</th>
<th class="text-center">Action</th>
</tr>
resources/views/pembayaran/testbillplz.blade.php
+74
View File
@@ -0,0 +1,74 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form action="{{ route('payment.feepayment') }}" method="POST" id="formpayment">
@csrf
<div class="form-row">
<div class="form-group col-md-6">
<label for="name">Nama</label>
<input type="text" class="form-control" name="name" id="name">
</div>
<div class="form-group col-md-6">
<label for="user_id">User ID</label>
<input type="text" class="form-control" name="user_id" id="user_id">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="notel">Number Phone</label>
<input type="text" class="form-control" name="notel" id="notel">
</div>
<div class="form-group col-md-6">
<label for="email">E-mel</label>
<input type="text" class="form-control" name="email" id="email">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="lelong_id">Lelong ID</label>
<input type="text" class="form-control" name="lelong_id" id="lelong_id">
</div>
</div>
<div class="text-right pt-4">
{{-- <input type="hidden" name="userid" value="{{$user->id}}"> --}}
{{-- <a href="{{url('pengguna/listpengguna')}}" class="btn btn-primary">Kembali</a> --}}
<button type="button" class="btn btn-warning" onclick="confirm()">Simpan</button>
</div>
</form>
{{-- <button class="btn btn-primary" onclick="confirm()">Simpan</button> --}}
</div>
</div>
</div>
<script>
function confirm() {
$.confirm({
title: 'Confirmation',
content: 'Anda pasti?',
type: 'orange',
typeAnimated: true,
buttons: {
Simpan: {
btnClass: 'btn-warning',
action: function () {
$("#formpayment").submit();
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
}
}
});
}
</script>
@endsection
routes/api.php
+1 -4
View File
@@ -32,13 +32,10 @@ Route::post('/password/email', [ForgotPasswordController::class, 'sendResetLinkE
// Route::get('/callback', [ApiController::class, 'feepayment']);
Route::post('/feepayment', [ApiController::class, 'feepayment'])->name('feepayment');
Route::get('/pembayaran/response', [ApiController::class, 'response'])->name('pay.paymentStatus');
Route::get('/pembayaran/backend', [ApiController::class, 'callback'])->name('pay.callback');
Route::post('/bidpayment', [ApiController::class, 'bidpayment'])->name('bidpayment');
Route::get('/pembayaran/bidresponse', [ApiController::class, 'bidresponse'])->name('pay.bidpaymentStatus');
Route::get('/pembayaran/bidbackend', [ApiController::class, 'bidbackend'])->name('pay.bidcallback');
//Protected routes
Route::group(['middleware' => ['auth:sanctum']], function () {
routes/web.php
+12
View File
@@ -28,6 +28,13 @@ Auth::routes();
Route::get('/home','HomeController@index')->name('home');
Route::get('/about','HomeController@about')->name('about');
Route::get('/pembayaran/response','ApiController@response')->name('pay.paymentStatus');
Route::get('/pembayaran/backend','ApiController@callback')->name('pay.callback');
Route::get('/pembayaran/bidresponse', 'ApiController@bidresponse')->name('pay.bidpaymentStatus');
Route::get('/pembayaran/bidbackend', 'ApiController@bidbackend')->name('pay.bidcallback');
//Pengurusan Pengguna
@@ -76,6 +83,11 @@ Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], functio
Route::post('/export',['as'=>'sistem.export','uses'=>'DatabaseController@export']);
});
Route::group(['middleware','prefix'=>'payment'], function () {
Route::get('/testbillplz',['as'=>'payment.testbillplz','uses'=>'ApiController@testbillplz']);
Route::post('/payment',['as'=>'payment.feepayment','uses'=>'ApiController@feepayment']);
});
Route::group(['prefix'=>'lelong'], function () {
Route::group(['middleware' => ['permission:pendaftaranbatch']], function () {
Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']);