From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 21 Mar 2025 13:03:06 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-326_order_to_telegram
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=1500166455d9bd719c6e212bd9a20a6832cbdfc6;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-326_order_to_telegram

# Conflicts:
#	erp24/records/MarketplaceOrders.php
---

1500166455d9bd719c6e212bd9a20a6832cbdfc6
diff --cc erp24/records/MarketplaceOrders.php
index 27b36090,37edb96c..3e202764
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@@ -33,15 -33,6 +33,10 @@@ use Yii
   */
  class MarketplaceOrders extends \yii\db\ActiveRecord
  {
 +    const STATUS_TELEGRAM_NOT_SENT = 0;
 +    const STATUS_TELEGRAM_PREPARED_TO_SEND = 1;
 +    const STATUS_TELEGRAM_SENT = 2;
 +
-     const STATUSES_1C = [
-         1 => 'Создан в ЕРП'
-     ];
- 
      /**
       * {@inheritdoc}
       */