diff --git a/mirzaev/skillparts/system/controllers/OrderController.php b/mirzaev/skillparts/system/controllers/OrderController.php index cb6dd3c..08f3188 100644 --- a/mirzaev/skillparts/system/controllers/OrderController.php +++ b/mirzaev/skillparts/system/controllers/OrderController.php @@ -66,11 +66,21 @@ class OrderController extends Controller // Инициализация cookie $cookies = yii::$app->response->cookies; - // Инициализация данных из HTTP-заголовка referrer - $referrer = trim(parse_url(yii::$app->request->referrer, PHP_URL_PATH) . '?' . parse_url(yii::$app->request->referrer, PHP_URL_QUERY), '/'); + if (isset(yii::$app->request->referrer)) { + // Найден HTTP-заголовок REFERRER - $redirect = match(yii::$app->request->pathInfo) { - 'order/write' => $referrer, + // Инициализация адреса переадресации из HTTP-заголовка referrer + $redirect = $referrer = trim(parse_url(yii::$app->request->referrer, PHP_URL_PATH) . '?' . parse_url(yii::$app->request->referrer, PHP_URL_QUERY), '/'); + } else { + // Не найден HTTP-заголовок REFERRER + + // Инициализация адреса переадресации из текущего URI + $redirect = yii::$app->request->pathInfo; + } + + // Реинициализация с фильтрацией + $redirect = match (yii::$app->request->pathInfo) { + 'order/write' => $redirect, 'order/delete', 'order/amount-update', 'order/request' => 'cart', 'order/accept', 'order/supply-read', 'order/supply-write-stts', 'order/supply-edit-time', 'order/supply-edit-cost', 'order/supply-edit-comm' => 'orders', default => yii::$app->request->pathInfo diff --git a/mirzaev/skillparts/system/views/orders/index.php b/mirzaev/skillparts/system/views/orders/index.php index 8d2ad64..96ea108 100644 --- a/mirzaev/skillparts/system/views/orders/index.php +++ b/mirzaev/skillparts/system/views/orders/index.php @@ -189,14 +189,14 @@ if (
- - + +

-

- - + +
diff --git a/mirzaev/skillparts/system/web/css/pages/orders.css b/mirzaev/skillparts/system/web/css/pages/orders.css index 5336141..46aa900 100644 --- a/mirzaev/skillparts/system/web/css/pages/orders.css +++ b/mirzaev/skillparts/system/web/css/pages/orders.css @@ -42,11 +42,17 @@ } #page_orders article input[type="date"] { - left: 5%; - margin-right: -5%; - clip-path: inset(0 16% 0 2%); - position: relative; + margin-right: -10%; font-size: 1rem; outline: none; border: none; } + +#page_orders article input[type="date"]+i { + z-index: 1; + pointer-events: none; + background: #fff; + -webkit-box-shadow: 0px 0px 0px 10px rgb(255 255 255); + -moz-box-shadow: 0px 0px 0px 10px rgba(255, 255, 255, 1); + box-shadow: 0px 0px 0px 7px rgb(255 255 255); +}