From 8496c06a75978916ac648a9a18ffeecdb321710a Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Thu, 19 Dec 2024 13:30:12 +0300 Subject: [PATCH] [ERP-261] name -> number_1c + held --- erp24/api2/controllers/DataController.php | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index c6273662..36a578d6 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -1192,25 +1192,24 @@ class DataController extends BaseController { } } } - if (!empty($waybillIncoming)) { - /** @var WaybillIncoming $waybillIncoming */ - $waybillIncoming->status = WriteOffsErp::STATUS_ERROR_1С; - $waybillIncoming->error_text = $errorText; - $waybillIncoming->save(); - if ($waybillIncoming->getErrors()) { - LogService::apiErrorLog( - json_encode( - ["error_id" => 11.5, "error" => $waybillIncoming->getErrors()], - JSON_UNESCAPED_UNICODE - ) - ); - } + + /** @var WaybillIncoming $waybillIncoming */ + $waybillIncoming->status = WriteOffsErp::STATUS_ERROR_1С; + $waybillIncoming->error_text = $errorText; + $waybillIncoming->save(); + if ($waybillIncoming->getErrors()) { + LogService::apiErrorLog( + json_encode( + ["error_id" => 11.5, "error" => $waybillIncoming->getErrors()], + JSON_UNESCAPED_UNICODE + ) + ); } } else { - if (!empty($waybillIncoming)) { + if (isset($arr["held"]) && $arr["held"]) { /** @var WaybillIncoming $waybillIncoming */ $waybillIncoming->status = WriteOffsErp::STATUS_CREATED_1С; - $waybillIncoming->number_1c = $arr["number"] ?? ''; + $waybillIncoming->number_1c = $arr["name"] ?? ''; $waybillIncoming->save(); if ($waybillIncoming->getErrors()) { LogService::apiErrorLog( -- 2.39.5