From d52bc07c71bd55c6fe95697fbd90c346cb2ec692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 24 May 2023 17:59:50 +0200 Subject: [PATCH] Fix for order display --- app/Models/Shop/Order.php | 2 -- resources/views/pages/orders/parts/display-order.blade.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Models/Shop/Order.php b/app/Models/Shop/Order.php index 5bce628..63630e8 100644 --- a/app/Models/Shop/Order.php +++ b/app/Models/Shop/Order.php @@ -571,8 +571,6 @@ class Order extends Model $transaction = (clone $query)->where('type', TransactionType::debit()) ->where('payment_mode', '!=', PaymentModeEnum::inShop()) ->whereIn('status', [TransactionStatus::failed(), TransactionStatus::canceled()]) - ->first() ?? (clone $query)->where('type', TransactionType::debit()) - ->whereIn('status', [TransactionStatus::failed(), TransactionStatus::canceled()]) ->first(); } diff --git a/resources/views/pages/orders/parts/display-order.blade.php b/resources/views/pages/orders/parts/display-order.blade.php index d0597fa..1d324a9 100644 --- a/resources/views/pages/orders/parts/display-order.blade.php +++ b/resources/views/pages/orders/parts/display-order.blade.php @@ -38,7 +38,7 @@ 'title' => __('Articles payés / remboursés'), 'left' => __('payés'), 'right' => __('remboursés'), - 'items' => $order->getTransactionUsedForPayment()->items, + 'items' => optional($order->getTransactionUsedForPayment())->items, 'sideItems' => $order->transactions() ->where('type', \App\Enums\Order\TransactionType::credit()) ->pluck('items')->map(function ($basketItems) {