forge-joniko/ldc-boutique-cnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for order display

Browse source
This commit is contained in:
Jérémy Munsch 2023-05-24 17:59:50 +02:00
parent 916620bdb6
commit d52bc07c71
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Shop/Order.php
View file

@ -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();
}

2
resources/views/pages/orders/parts/display-order.blade.php
View file

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