Новые стастусы

diff --git a/erp24/api2/controllers/OrdersController.php b/erp24/api2/controllers/OrdersController.php
index 9e7b275ac27099db3493d5770e65fca86d490bd9..658829a244acaa9bf517b1b8edc8f7434f422740 100644 (file)
--- a/erp24/api2/controllers/OrdersController.php
+++ b/erp24/api2/controllers/OrdersController.php
@@ -8,6 +8,7 @@ use Yii;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
 use yii\web\Response;
+use yii_app\records\MarketplaceOrder1cStatuses;
 use yii_app\records\MarketplaceOrders;
 use yii_app\records\MarketplaceOrderStatusTypes;
 use yii_app\services\LogService;
@@ -16,8 +17,8 @@ use yii_app\services\MarketplaceService;
 class OrdersController extends BaseController
 {
     const OUT_DIR =
-        //"/www/api2/json";
-        "/var/www/erp24/api2/json";
+        "/www/api2/json";
+        //"/var/www/erp24/api2/json";
 
     public function actionChangeStatus()
     {
@@ -39,8 +40,18 @@ class OrdersController extends BaseController
             ' ' . date("d.m.Y H:i:s", time()) . ' JSON: ' . $json . '  ',
             FILE_APPEND
         );
-         $orderGuid = $result['order_id'];
-         $orderStatus = $result['status'];
+        $marketplaceGuid = $result['marketplace_id'];
+        $orderGuid = $result['order_id'];
+        $orderStatus = $result['status'];
+
+        $mp_guids = MarketplaceOrder1cStatuses::guid2id();
+        $marketplaceId = $mp_guids[$marketplaceGuid];
+
+        $statusRecord = MarketplaceOrder1cStatuses::find()
+            ->where(['guid' => $marketplaceGuid])
+            ->andWhere(['status' => $orderStatus])
+            ->one();
+        $statusId = (int)$statusRecord->status_id;
 
         $orderStatus1CCodes = MarketplaceOrders::getStatusCodes($orderStatus);
         $statuses = MarketplaceOrderStatusTypes::find()

diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index 3b4f0f8a924943718b38ae211c2aee944a3ae2ae..230608673ae9cc084afa90b687e118fb620a737b 100644 (file)
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -33,31 +33,14 @@ use Yii;
  */
 class MarketplaceOrders extends \yii\db\ActiveRecord
 {
-    const STATUS_CREATED = 1;
-    const STATUS_CONFIRM = 2;
-    const STATUS_CANCELLED = 6;
-    const STATUS_PROCESSING = 7;
-    const STATUS_READY = 9;
-    const STATUS_DELIVERED = 10;
-    const STATUS_ERROR_1C = 8;
-
-    public const STATUSES_LABEL = [
-        self::STATUS_CREATED => "Создан",
-        self::STATUS_CONFIRM => "Одобрен",
-        self::STATUS_CANCELLED => "Отменен 1С",
-        self::STATUS_PROCESSING => "В процессе сборки",
-        self::STATUS_READY => "Готов к отправке",
-        self::STATUS_DELIVERED => "Доставлен",
-        self::STATUS_ERROR_1C => "Ошибка в 1С",
-    ];
 
     public const STATUSES_TO_CODE = [
-        self::STATUS_CREATED => ["PROCESSING", "STARTED"],
-        self::STATUS_CONFIRM => ["PROCESSING", "STARTED"],
-        self::STATUS_CANCELLED => ["CANCELLED", "SHOP_FAILED"],
-        self::STATUS_PROCESSING => ["PROCESSING", "STARTED"],
-        self::STATUS_READY => ["PROCESSING", "READY_TO_SHIP"],
-        self::STATUS_DELIVERED => ["DELIVERED", "DELIVERY_SERVICE_DELIVERED"],
+        'Новый' => ["PROCESSING", "STARTED"],
+        'Правки флориста' => ["PROCESSING", "STARTED"],
+        'В работе' => ["PROCESSING", "STARTED"],
+        'Собрано' => ["PROCESSING", "READY_TO_SHIP"],
+        'Передано курьеру' => ["DELIVERY", "COURIER_RECEIVED"],
+        'Отказ' => ["CANCELLED", "SHOP_FAILED"],
     ];