From 34ddf03807731a29316b5d3f5fd751e58d1875a5 Mon Sep 17 00:00:00 2001
From: Arsen Mirzaev Tatyano-Muradovich <arsen@mirzaev.sexy>
Date: Thu, 21 Dec 2023 23:34:27 +0700
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=B0=20=D0=BF=D0=BE=D0=B5=D0=B1=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BC=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                  | 0
 LICENSE                                                     | 0
 README.md                                                   | 0
 composer.json                                               | 0
 composer.lock                                               | 0
 .../spetsresurs/viber/registry/requests/system/emojis.txt   | 0
 .../viber/registry/requests/system/public/install.php       | 0
 .../viber/registry/requests/system/public/robot.php         | 6 ++++--
 .../viber/registry/requests/system/settings/.gitignore      | 0
 .../registry/requests/system/settings/arangodb.php.sample   | 0
 .../viber/registry/requests/system/settings/key.php.sample  | 0
 .../viber/registry/requests/system/settings/url.php.sample  | 0
 12 files changed, 4 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 LICENSE
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 composer.json
 mode change 100644 => 100755 composer.lock
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/emojis.txt
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/public/install.php
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/public/robot.php
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/settings/.gitignore
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/settings/arangodb.php.sample
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/settings/key.php.sample
 mode change 100644 => 100755 mirzaev/spetsresurs/viber/registry/requests/system/settings/url.php.sample

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
diff --git a/composer.lock b/composer.lock
old mode 100644
new mode 100755
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/emojis.txt b/mirzaev/spetsresurs/viber/registry/requests/system/emojis.txt
old mode 100644
new mode 100755
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/public/install.php b/mirzaev/spetsresurs/viber/registry/requests/system/public/install.php
old mode 100644
new mode 100755
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/public/robot.php b/mirzaev/spetsresurs/viber/registry/requests/system/public/robot.php
old mode 100644
new mode 100755
index 7def460..315f24f
--- a/mirzaev/spetsresurs/viber/registry/requests/system/public/robot.php
+++ b/mirzaev/spetsresurs/viber/registry/requests/system/public/robot.php
@@ -183,7 +183,9 @@ function requests(int $amount = 5, int $page = 1): Cursor
 		$arangodb->session,
 		[
 			'query' => sprintf(
-				"FOR d IN works FILTER d.worker == null && d.confirmed != 'да' SORT d.created DESC LIMIT %d, %d RETURN d",
+				"FOR d IN works FILTER d.date >= '%s' && d.date <= '%s' && d.worker == '' && d.confirmed != 'да' SORT d.created DESC LIMIT %d, %d RETURN d",
+				(new DateTime('now'))->setTime(7, 0)->format('d.m.Y'),
+				(new DateTime('tomorrow'))->setTime(7, 0)->format('d.m.Y'),
 				$offset,
 				$amount + $offset
 			),
@@ -339,7 +341,7 @@ try {
 							(new Text())
 								->setSender($botSender)
 								->setReceiver($id)
-								->setText("**#{$request->getKey()}**\n\n" . $request->date['converted'] . " (" . $request->start['converted'] . " - " . $request->end['converted'] . ")\n**Работа:** \"$request->work\"\n\n**Город:** $market->city\n**Адрес:** $market->address")
+								->setText("**#{$request->getKey()}**\n\n" . ($request->date['converted'] ?? $request->date) . " (" . ($request->start['converted'] ?? $request->start) . " - " . ($request->end['converted'] ?? $request->end) . ")\n**Работа:** \"$request->work\"\n\n**Город:** $market->city\n**Адрес:** $market->address")
 						);
 
 						// Запись выбора заявки в клавиатуру
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/settings/.gitignore b/mirzaev/spetsresurs/viber/registry/requests/system/settings/.gitignore
old mode 100644
new mode 100755
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/settings/arangodb.php.sample b/mirzaev/spetsresurs/viber/registry/requests/system/settings/arangodb.php.sample
old mode 100644
new mode 100755
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/settings/key.php.sample b/mirzaev/spetsresurs/viber/registry/requests/system/settings/key.php.sample
old mode 100644
new mode 100755
diff --git a/mirzaev/spetsresurs/viber/registry/requests/system/settings/url.php.sample b/mirzaev/spetsresurs/viber/registry/requests/system/settings/url.php.sample
old mode 100644
new mode 100755