stitza/d2d.emegrendeles.hu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EV3-420 "sztornó" megrendelés

Browse Source
This commit is contained in:
E98Developer 2026-06-05 15:19:52 +02:00
parent b74f777cbc
commit cf0e1dfee9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/OrderController.php
View File

@ -890,6 +890,16 @@ public function getOrderData(?int $orderId = null, ?Order $Order = null): array
$orderData['changedItems'] = $this->getChangedItems($Order); $orderData['changedItems'] = $this->getChangedItems($Order);
} }
if ($Order->orderFlag == 'storno' && $Order->rel_id) {
$originalOrder = OrderArchive::find($Order->rel_id);
if (! $originalOrder) {
$originalOrder = Order::find($Order->rel_id);
}
if ($originalOrder) {
$orderData['originalHumanId'] = $originalOrder->humanId;
}
}
if ($Order->orderType == 'weekly') { if ($Order->orderType == 'weekly') {
$orderData['items'] = $this->getOrderItemsFromOrderData(null, $Order); $orderData['items'] = $this->getOrderItemsFromOrderData(null, $Order);
if (is_array($orderData['items']['weekDayItems'])) { if (is_array($orderData['items']['weekDayItems'])) {

2
resources/views/modules/order/invoice.blade.php
View File

@ -13,7 +13,7 @@
<th colspan="9"> <th colspan="9">
<table style="width: 100%;" class="invoiceHeadTable"> <table style="width: 100%;" class="invoiceHeadTable">
<tr class="orderIdRow"> <tr class="orderIdRow">
<td colspan="2" >{{$humanId}}</td> <td colspan="2" >{{$humanId}}@if($orderFlag == 'storno' && !empty($originalHumanId)), a {{$originalHumanId}} stornója @endif</td>
</tr> </tr>
<tr> <tr>
<td style="width: 50%"> <td style="width: 50%">