cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-30 09:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug after fpx top up, redirect to not found page

Browse Source
This commit is contained in:
edmondlang
2023-03-11 18:48:15 +08:00
parent 6275304ff8
commit c99076ece1
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+2 -2
View File
@@ -107,9 +107,9 @@ class CallbackBillplzLogic
$token = Auth::fromUser(User::find(1));
$request->headers->set('Authorization', 'Bearer '.$token);
$marking = $transaction->owner instanceof Booking ? $transaction->booking->marking : $transaction->owner->owner->bookings()->orderBy('id', 'DESC')->first()->marking;
$marking = $transaction->owner instanceof Booking ? $transaction->booking->marking : (count($transaction->owner->owner->bookings()->get())? $transaction->owner->owner->bookings()->orderBy('id', 'DESC')->first()->marking: null);
return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking, 'transaction' => $transaction, 'status' => $status]);
return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking ?? null, 'transaction' => $transaction, 'status' => $status]);
}
}
app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php
+3
View File
@@ -27,6 +27,9 @@ class UpdateWalletTransactionProcessor
/** @var UpdatesTransactionStatus */
private $updatesTransactionStatus;
/** @var UpdatesWallet */
private $updatesWallet;
public function __construct(UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWallet $updatesWallet, FetchesTransaction $fetchesTransaction)
{
$this->fetchesTransaction = $fetchesTransaction;
resources/views/pages/payments_redirect.blade.php
+15 -9
View File
@@ -43,9 +43,11 @@
<div class="btn btn-sm all-caps btn-outline-success b-rad-none">Transaction History</div>
</a>
@endif
<a href="{{route('booking.details', $marking)}}">
<div class="btn btn-sm all-caps btn-success b-rad-none" >{{$transaction->owner instanceof \App\Models\Booking ? 'Back to': 'Last'}} Booking</div>
</a>
@if($marking)
<a href="{{route('booking.details', $marking)}}">
<div class="btn btn-sm all-caps btn-success b-rad-none" >{{$transaction->owner instanceof \App\Models\Booking ? 'Back to': 'Last'}} Booking</div>
</a>
@endif
</div>
</div>
</div>
@@ -64,9 +66,11 @@
<a href="{{route('dashboard')}}">
<div class="btn btn-sm all-caps btn-outline-success b-rad-none">Dashboard</div>
</a>
<a href="{{route('booking.details', $marking)}}">
<div class="btn btn-sm all-caps btn-success b-rad-none" >{{$transaction->owner instanceof \App\Models\Booking ? 'Back to': 'Last'}} Booking</div>
</a>
@if($marking)
<a href="{{route('booking.details', $marking)}}">
<div class="btn btn-sm all-caps btn-success b-rad-none" >{{$transaction->owner instanceof \App\Models\Booking ? 'Back to': 'Last'}} Booking</div>
</a>
@endif
</div>
</div>
</div>
@@ -82,9 +86,11 @@
</div>
<div class="row m-b-20">
<div class="col">
<a href="{{route('booking.details', $marking)}}">
<div class="btn btn-sm all-caps btn-outline-success b-rad-none" >{{$transaction->owner instanceof \App\Models\Booking ? 'Back to': 'Last'}} Booking</div>
</a>
@if($marking)
<a href="{{route('booking.details', $marking)}}">
<div class="btn btn-sm all-caps btn-outline-success b-rad-none" >{{$transaction->owner instanceof \App\Models\Booking ? 'Back to': 'Last'}} Booking</div>
</a>
@endif
<a href="{{route('billplz.bill', $transaction->payment_reference)}}">
<div class="btn btn-sm all-caps btn-success b-rad-none">Retry Payment</div>
</a>