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

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 52727058b238438c14d3a323965a3e3b71ceca8c..9f06a1f7505afe45df7e978ae4959acb3fe8ecbb 100644 (file)
--- 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) {