From 49ed9bf59ec0ce179ec374d1bae85ad54378745a Mon Sep 17 00:00:00 2001
From: Arsen Mirzaev Tatyano-Muradovich <red@hood.su>
Date: Wed, 28 Jul 2021 10:39:50 +1000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BA,=20=D0=B0=20=D1=82=D0=B0=D0=BA=20=D0=B6=D0=B5=20=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D1=81=20=D0=B7=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=BE=D0=BC=20referrer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controllers/OrderController.php     | 18 ++++++++++++++----
 .../skillparts/system/views/orders/index.php   |  8 ++++----
 .../skillparts/system/web/css/pages/orders.css | 14 ++++++++++----
 3 files changed, 28 insertions(+), 12 deletions(-)

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 (
             </small>
             <div class="ml-2 mr-3 d-flex">
                 <div class="form-control form-control-sm form_control_clean px-1 py-0 d-flex">
-                    <input id="orders_period_calendar_from" class="" type="date" value="<?= $from ?? date('Y-m-d', time() - 604800) ?>" onchange="return orders_read('last', moment(this.value, 'YYYY-MM-DD').unix(), moment(document.getElementById('orders_period_calendar_to').value, 'YYYY-MM-DD').unix());" pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}" />
-                    <i class="far fa-calendar-alt my-auto"></i>
+                    <input id="orders_period_calendar_from" class="ml-auto" type="date" value="<?= $from ?? date('Y-m-d', time() - 604800) ?>" onchange="return orders_read('last', moment(this.value, 'YYYY-MM-DD').unix(), moment(document.getElementById('orders_period_calendar_to').value, 'YYYY-MM-DD').unix());" pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}" />
+                    <i class="far fa-calendar-alt my-auto mr-auto"></i>
                 </div>
                 <p class="mx-2 p-0">-</p>
 
                 <div class="form-control form-control-sm form_control_clean px-1 py-0 d-flex">
-                    <input id="orders_period_calendar_to" class="f" type="date" value="<?= $to ?? date('Y-m-d', time()) ?>" onchange="return orders_read('last', moment(document.getElementById('orders_period_calendar_from').value, 'YYYY-MM-DD').unix(), moment(this.value, 'YYYY-MM-DD').unix());" pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}" />
-                    <i class="far fa-calendar-alt my-auto"></i>
+                    <input id="orders_period_calendar_to" class="ml-auto" type="date" value="<?= $to ?? date('Y-m-d', time()) ?>" onchange="return orders_read('last', moment(document.getElementById('orders_period_calendar_from').value, 'YYYY-MM-DD').unix(), moment(this.value, 'YYYY-MM-DD').unix());" pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}" />
+                    <i class="far fa-calendar-alt my-auto mr-auto"></i>
                 </div>
             </div>
         </div>
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);
+}