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) {