]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
Merge branch 'feature_fomichev_erp-474_change_articule_in_feed_and_in_process_orders...
authorAleksey Filippov <aleksey.filippov@erp-flowers.ru>
Tue, 14 Oct 2025 07:04:22 +0000 (07:04 +0000)
committerAleksey Filippov <aleksey.filippov@erp-flowers.ru>
Tue, 14 Oct 2025 07:04:22 +0000 (07:04 +0000)
[ERP-474] Добавление разделителя в артикул на FW

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

1  2 
erp24/services/MarketplaceService.php

index 8af66854b57da1c48a3482d65d0bbc396b311694,7242be80b9b2e86496a644bc69e6ac4c12c39228..72cfb7835d29a506372ce542e791eb6b8a5ce2cf
@@@ -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();