From c1e56f6cab4a084b9cc2d32e88c928a6ea29ccaa Mon Sep 17 00:00:00 2001 From: E98Developer Date: Sun, 31 May 2026 14:10:33 +0200 Subject: [PATCH] =?UTF-8?q?MOD=20EV3-173=20Megrendel=C3=A9sek-sztorn=C3=B3?= =?UTF-8?q?=20megrendel=C3=A9sek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/OrderArchiveController.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/OrderArchiveController.php b/app/Http/Controllers/OrderArchiveController.php index 25d9743..93d3f94 100644 --- a/app/Http/Controllers/OrderArchiveController.php +++ b/app/Http/Controllers/OrderArchiveController.php @@ -136,13 +136,12 @@ public function destroy(int $OrderId): Response|JsonResponse return response()->noContent(); } - private function orderCanEditable($orderData) + private function orderCanEditable($orderData, bool $userIsProfitCenter = false, ?int $userProfitCenterId = null): bool { - if (! auth()->user()->hasRole('profit-center')) { + if (! $userIsProfitCenter) { return false; } - $profitCenterId = auth()->user()->profitCenters->first()->id; - if ($orderData['profit_center_id'] !== $profitCenterId) { + if ($orderData['profit_center_id'] !== $userProfitCenterId) { return false; } if ($orderData['orderType'] !== OrderType::daily) { @@ -202,7 +201,9 @@ public function getDataTableContent(): JsonResponse $retData = $OrderArchive->get()->toArray(); // $retData=$OrderArchive->limit(10)->get()->toArray(); - $retData = array_map(function ($item) { + $userIsProfitCenter = auth()->user()->hasRole('profit-center'); + $userProfitCenterId = $userIsProfitCenter ? auth()->user()->profitCenters->first()->id : null; + $retData = array_map(function ($item) use ($userIsProfitCenter, $userProfitCenterId) { $item['fileUrl'] = false; $item['fileName'] = false; if ($item['attachment']) { @@ -212,7 +213,7 @@ public function getDataTableContent(): JsonResponse if (! $item['deliveryAddressName'] || strlen($item['deliveryAddressName']) < 2) { $item['deliveryAddressName'] = $item['deliveryAddress']; } - $item['canEditable'] = $this->orderCanEditable($item); + $item['canEditable'] = $this->orderCanEditable($item, $userIsProfitCenter, $userProfitCenterId); $item['orderFlag'] = OrderFlag::getDescription($item['orderFlag']); // dd($item);