Merge branch 'develop' into feature_smirnov_erp-326_order_to_telegram

# Conflicts:
#	erp24/records/MarketplaceOrders.php

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

diff --cc erp24/services/MarketplaceService.php
Simple merge