From: Aleksey Filippov <aleksey.filippov@erp-flowers.ru>
Date: Tue, 14 Oct 2025 07:04:22 +0000 (+0000)
Subject: Merge branch 'feature_fomichev_erp-474_change_articule_in_feed_and_in_process_orders... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=886fb74d56a559524e00fc4b3a57184c7e9e712e;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'feature_fomichev_erp-474_change_articule_in_feed_and_in_process_orders' into 'develop'

[ERP-474] Добавление разделителя в артикул на FW

See merge request gitlab-instance/yii-erp24!992
---

886fb74d56a559524e00fc4b3a57184c7e9e712e
diff --cc erp24/services/MarketplaceService.php
index 8af66854,7242be80..72cfb783
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@@ -1907,13 -1849,9 +1905,13 @@@ class MarketplaceServic
      public static function saveEmailIfNotExists($subject, $subjectPattern, $from, $to, $date, $body)
      {
          if (strpos($from, 'info@flowwow.com') === false) {
-             return;
+             return null;
          }
  
 +        if (TelegramService::isDevEnv() && MarketplaceFlowwowEmails::find()->count() === 0) {
 +            return;
 +        }
 +
          $exists = MarketplaceFlowwowEmails::find()
              ->where(['subject' => $subject, 'from' => $from, 'date' => $date])
              ->exists();