cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Laravel Vapor - Fix a 504 error at /bookings/urgent page

Browse Source
This commit is contained in:
Dillon Ngo
2024-10-15 15:15:07 +08:00
parent c44017486c
commit 10b0e2340c
2 changed files with 74 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/BookingForTransactionUrgentResource.php
+73
View File
@@ -0,0 +1,73 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class BookingForTransactionUrgentResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
* @throws \Illuminate\Contracts\Container\BindingResolutionException
*/
public function toArray($request)
{
return [
'id' => $this->id,
'company' => new CompanyResource($this->company),
'bank' => new BankResource($this->bank),
'service' => new ServiceTypeResource($this->service),
'marking' => $this->marking,
// 'amount' => $this->fix_amount,
// 'floating_amount' => floatval((App()->make(CalculatesBookingFloatingAmount::class))->execute($this->resource, $this->fix_currency_id)),
// 'paid_amount' => floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($this->resource, $this->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
// // 'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)) + floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($this->resource, $this->fix_currency_id)),
// 'outstanding_amount' => floatval((App()->make(CalculatesBookingOutstanding::class))->execute($this->resource)),
// 'fixed_currency' => new CurrencyResource($this->fixedCurrency),
// 'convertible_currency' => new CurrencyResource($this->convertibleCurrency),
// 'conversion_currency' => new CurrencyResource($this->conversionCurrency),
// 'documents' => [
// 'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()),
// 'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()),
// 'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()),
// 'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()),
// 'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()),
// 'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()),
// ],
// 'order_reference_no' => $this->modelAttributes()->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)->get()->map(function ($attr) {
// return [
// 'id' => $attr->id,
// 'value' => $attr->value
// ];
// }),
// 'status' => $this->status,
// 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
// 'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
// $this->mergeWhen($this->relationLoaded('transactions'), [
// 'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()),
// 'payment_attempts' => TransactionResource::collection(
// $this->transactions()
// ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)
// ->whereDate('expires_on', '>=', Carbon::now())
// ->get()
// ),
// // 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
// 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::EXPIRED)->get()),
// 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
// $query->where(function($query){
// $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED, ApprovalStatus::REFUNDED]);
// })->orWhere(function($query){
// $query->where(function($query){
// $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]);
// })->orWhere(function($query){
// $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
// });
// });
// })->latest()->get())
// ])
];
}
}
app/Http/Resources/TransactionUrgentResource.php
+1 -1
View File
@@ -35,7 +35,7 @@ class TransactionUrgentResource extends JsonResource
return [
'id' => $this->id,
'booking' => new BookingResource($booking),
'booking' => new BookingForTransactionUrgentResource($booking),
// 'type' => (int) $this->type,
// 'bill_no' => $this->bill_no,
// 'payment_reference' => $this->payment_reference,