[ERP-409] data_request

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 05a75bd2ab49bfcecd26f018b4481b4e5ae8a0cf..00f956ffceaa6734caae3914b289ffd832f9cf53 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -134,7 +134,12 @@ class DataController extends BaseController
                         "id" => $createCheck->check_id,
                         "sales_check" => $createCheck->sales_check,
                         "items" => json_decode($createCheck->items, true, 512, JSON_UNESCAPED_UNICODE),
-                        "payments" => json_decode($createCheck->payments, true, 512, JSON_UNESCAPED_UNICODE)
+                        "payments" => json_decode(empty($createCheck->payments) ? '[]' : $createCheck->payments, true, 512, JSON_UNESCAPED_UNICODE),
+                        'order_guid' => $createCheck->order_guid,
+                        'marketplace_order_id' => $createCheck->marketplace_order_id,
+                        'guid' => $createCheck->guid,
+                        'is_marketplace' => $createCheck->is_marketplace,
+                        'marketplace_name' => $createCheck->marketplace_name,
                     ];
                 }
             }

diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php
index 29d333ee40ecafec867c77d95f49147bf466c729..06cdd3853038a76df64b6591b226a3342191234b 100644 (file)
--- a/erp24/media/controllers/NotificationController.php
+++ b/erp24/media/controllers/NotificationController.php
@@ -214,12 +214,12 @@ class NotificationController extends Controller
                     /* @var $marketplaceOrder MarketplaceOrders */
                     if ($newStatusCode == 'DELIVERED' && $newSubstatusCode == 'DELIVERY_SERVICE_DELIVERED' && $marketplaceOrder) {
                         $createChecks = new CreateChecks;
-                        $createChecks->order_guid = $marketplaceOrder->guid;
+                        $createChecks->order_guid = '';
                         $createChecks->marketplace_order_id = $marketplaceOrder->marketplace_order_id;
 
                         $eit = ExportImportTable::find()->select(['export_val'])->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
                         $createChecks->store_id = $eit->export_val ?? '';
-                        $createChecks->date = $marketplaceOrder->delivery_to;
+                        $createChecks->date_up = $marketplaceOrder->delivery_to;
                         $createChecks->check_id = DataHelper::createGuidMy('02');
                         $createChecks->guid = $createChecks->check_id;
                         $createChecks->type = 'Продажа';
@@ -240,7 +240,7 @@ class NotificationController extends Controller
                         $createChecks->comments = '';
                         $createChecks->date = date('Y-m-d H:i:s');
                         $createChecks->is_marketplace = 1;
-                        $createChecks->marketplace_name = 'ЯндексМаркет';
+                        $createChecks->marketplace_name = $marketplaceOrder->marketplace_name;
                         $createChecks->save();
                         if ($createChecks->getErrors()) {
                             Yii::warning("ORDER_ID_: " . Json::encode($createChecks->getErrors()));

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 6afc5b7f5cb079b9c25168051c2e41b55bec02f8..8345c547b72899b3b26a209b7b98a142e6f22686 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1760,12 +1760,12 @@ class MarketplaceService
                         ->one();
                     /* @var $marketplaceOrder MarketplaceOrders */
                     $createChecks = new CreateChecks;
-                    $createChecks->order_guid = $marketplaceOrder->guid;
+                    $createChecks->order_guid = '';
                     $createChecks->marketplace_order_id = $marketplaceOrder->marketplace_order_id;
 
                     $eit = ExportImportTable::find()->select(['export_val'])->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
                     $createChecks->store_id = $eit->export_val ?? '';
-                    $createChecks->date = $marketplaceOrder->delivery_to;
+                    $createChecks->date_up = $marketplaceOrder->delivery_to;
                     $createChecks->check_id = DataHelper::createGuidMy('02');
                     $createChecks->guid = $createChecks->check_id;
                     $createChecks->type = 'Продажа';
@@ -1786,7 +1786,7 @@ class MarketplaceService
                     $createChecks->comments = '';
                     $createChecks->date = date('Y-m-d H:i:s');
                     $createChecks->is_marketplace = 1;
-                    $createChecks->marketplace_name = 'ФлауВау';
+                    $createChecks->marketplace_name = $marketplaceOrder->marketplace_name;
                     $createChecks->save();
                     if ($createChecks->getErrors()) {
                         Yii::warning("ORDER_ID_: " . Json::encode($createChecks->getErrors()));