Обновить README.md

README.md

@@ -1,6 +1,7 @@
 # Viber chat-robot
 
-Sending requests from [mirzaev/spetsresurs-google_sheets-parser](https://git.mirzaev.sexy/mirzaev/spetsresurs-google_sheets-parser) to [mirzaev/arangodb](https://git.mirzaev.sexy/mirzaev/arangodb) and vice versa
+Sending requests from [mirzaev/spetsresurs-google_sheets-parser](https://git.mirzaev.sexy/mirzaev/spetsresurs-google_sheets-parser) to [mirzaev/arangodb](https://git.mirzaev.sexy/mirzaev/arangodb) and vice versa for [mirzaev/ebala](https://git.mirzaev.sexy/mirzaev/ebala)</br>
-
+</br>
-~~😼 Developed in 1 day for 100000 rubles ($1200)~~ shit happens
+~~😼 Developed in 1 day for 100000 rubles ($1200)~~ shit happens</br>
+**DEVELOPMENT COMPLETED. PROJECT CLOSED.**
 

mirzaev/spetsresurs/viber/registry/requests/system/public/robot.php

@@ -13,7 +13,6 @@ use ArangoDBClient\Document as _document,
 // Фреймворк для Viber API
 use Viber\Bot,
 	Viber\Api\Sender,
-	Viber\Api\Event,
 	Viber\Api\Keyboard,
 	Viber\Api\Keyboard\Button,
 	Viber\Api\Message\Contact,
@@ -184,7 +183,9 @@ function requests(int $amount = 5, int $page = 1): Cursor
 		$arangodb->session,
 		[
 			'query' => sprintf(
-				"FOR d IN works FILTER 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
 			),
@@ -284,7 +285,7 @@ try {
 				$count = $requests->getCount();
 
 				// Проверка существования избытка
-				$excess = $count === 6;
+				$excess = $count % 6 === 0;
 
 				// Обрезка заявок до размера страницы
 				$requests = array_slice($requests->getAll(), 0, 5);
@@ -340,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")
 						);
 
 						// Запись выбора заявки в клавиатуру