From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 27 Mar 2025 08:36:15 +0000 (+0300)
Subject: Изменение логики забора писем - ищем за день и до завтра
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b8e0c4da2162eaf528e11811121b4744b8a4e64b;p=erp24_rep%2Fyii-erp24%2F.git

Изменение логики забора писем - ищем за день и до завтра
---

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 52727058..9f06a1f7 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1365,14 +1365,23 @@ class MarketplaceService
         imap_timeout(IMAP_CLOSETIMEOUT, 120);
 
         $searchCriteria = '';
-        $searchCriteria = ($useSince ? 'SINCE ' : 'ON ');
+
 
         if (!$date) {
-            $date = date('d-M-Y');
-            $searchCriteria .= '"' . $date . '" ';
+            //$date = date('d-M-Y');
+            $sinceDate = date('d-M-Y',strtotime("-1 day"));
+            $beforeDate = date('d-M-Y',strtotime("+1 day"));
+            $searchCriteria = 'SINCE "' . $sinceDate . '" BEFORE "' . $beforeDate . '"';
         } else {
-            $date = date('d-M-Y', strtotime($date));
-            $searchCriteria .= '"' . $date . '" ';
+            $sinceDate = date('d-M-Y',strtotime("{$date} -1 day"));
+            $beforeDate = date('d-M-Y',strtotime("{$date} +1 day"));
+            if ($useSince) {
+                $searchCriteria = 'SINCE ';
+                $searchCriteria .= '"' . $date . '" ';
+            } else {
+                $searchCriteria = 'SINCE "' . $sinceDate . '" BEFORE "' . $beforeDate . '"';
+            }
+
         }
 
         if ($seen) {