MOD EV3-173 Megrendelések-sztornó megrendelések
This commit is contained in:
parent
959addacc7
commit
c1e56f6cab
@ -136,13 +136,12 @@ public function destroy(int $OrderId): Response|JsonResponse
|
|||||||
return response()->noContent();
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
$profitCenterId = auth()->user()->profitCenters->first()->id;
|
if ($orderData['profit_center_id'] !== $userProfitCenterId) {
|
||||||
if ($orderData['profit_center_id'] !== $profitCenterId) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if ($orderData['orderType'] !== OrderType::daily) {
|
if ($orderData['orderType'] !== OrderType::daily) {
|
||||||
@ -202,7 +201,9 @@ public function getDataTableContent(): JsonResponse
|
|||||||
|
|
||||||
$retData = $OrderArchive->get()->toArray();
|
$retData = $OrderArchive->get()->toArray();
|
||||||
// $retData=$OrderArchive->limit(10)->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['fileUrl'] = false;
|
||||||
$item['fileName'] = false;
|
$item['fileName'] = false;
|
||||||
if ($item['attachment']) {
|
if ($item['attachment']) {
|
||||||
@ -212,7 +213,7 @@ public function getDataTableContent(): JsonResponse
|
|||||||
if (! $item['deliveryAddressName'] || strlen($item['deliveryAddressName']) < 2) {
|
if (! $item['deliveryAddressName'] || strlen($item['deliveryAddressName']) < 2) {
|
||||||
$item['deliveryAddressName'] = $item['deliveryAddress'];
|
$item['deliveryAddressName'] = $item['deliveryAddress'];
|
||||||
}
|
}
|
||||||
$item['canEditable'] = $this->orderCanEditable($item);
|
$item['canEditable'] = $this->orderCanEditable($item, $userIsProfitCenter, $userProfitCenterId);
|
||||||
$item['orderFlag'] = OrderFlag::getDescription($item['orderFlag']);
|
$item['orderFlag'] = OrderFlag::getDescription($item['orderFlag']);
|
||||||
|
|
||||||
// dd($item);
|
// dd($item);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user