From bae288dfadda7cb945245bcf1ddfe4c7c4abb730 Mon Sep 17 00:00:00 2001 From: fomichev Date: Fri, 29 Nov 2024 15:40:16 +0300 Subject: [PATCH] =?utf8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80?= =?utf8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 43 +++++++++++++++---- .../Products1cAdditionalCharacteristics.php | 3 +- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index d8b43180..4b9b1dec 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -621,9 +621,12 @@ class DataController extends BaseController { $additionalCharacteristic->value = $characteristic["value_name"]; if (!$additionalCharacteristic->save()) { - LogService::apiErrorLog(json_encode(["error_id" => 8.2, - "error" => $additionalCharacteristic->getErrors()], - JSON_UNESCAPED_UNICODE)); + LogService::apiErrorLog( + json_encode( + ["error_id" => 8.2, "error" => $additionalCharacteristic->getErrors()], + JSON_UNESCAPED_UNICODE + ) + ); } } } @@ -638,7 +641,11 @@ class DataController extends BaseController { $paymentTypes->name = $arr['name']; $paymentTypes->save(); if ($paymentTypes->getErrors()) { - LogService::apiErrorLog(json_encode(["error_id" => 9, "error" => $paymentTypes->getErrors()], JSON_UNESCAPED_UNICODE)); + LogService::apiErrorLog(json_encode( + ["error_id" => 9, + "error" => $paymentTypes->getErrors()], + JSON_UNESCAPED_UNICODE + )); } $products1c7 = Products1c::findOne(['id' => $arr["id"]]) ?? new Products1c(); @@ -648,7 +655,10 @@ class DataController extends BaseController { $products1c7->code = $arr["code"]; $products1c7->save(); if ($products1c7->getErrors()) { - LogService::apiErrorLog(json_encode(["error_id" => 10, "error" => $products1c7->getErrors()], JSON_UNESCAPED_UNICODE)); + LogService::apiErrorLog(json_encode( + ["error_id" => 10, "error" => $products1c7->getErrors()], + JSON_UNESCAPED_UNICODE + )); } } } @@ -656,7 +666,13 @@ class DataController extends BaseController { if (!empty($result['created_write_offs'])) { $productsNames = Products1c::getNamesByTip('products'); - file_put_contents(self::OUT_DIR . '/created_write_offs_upload_' . date("Y_m_d") . '.json', PHP_EOL . json_encode($result["created_write_offs"],JSON_UNESCAPED_UNICODE), FILE_APPEND); + file_put_contents( + self::OUT_DIR . '/created_write_offs_upload_' + . date("Y_m_d") . '.json', + PHP_EOL + . json_encode($result["created_write_offs"],JSON_UNESCAPED_UNICODE), + FILE_APPEND + ); foreach ($result["created_write_offs"] as $arr) { if (!empty($arr["id"])) { $writeOffsErp = WriteOffsErp::find()->where(['guid' => $arr["id"]])->one(); @@ -721,7 +737,12 @@ class DataController extends BaseController { $writeOffsErp->error_text = $errorText; $writeOffsErp->save(); if ($writeOffsErp->getErrors()) { - LogService::apiErrorLog(json_encode(["error_id" => 11, "error" => $writeOffsErp->getErrors()], JSON_UNESCAPED_UNICODE)); + LogService::apiErrorLog( + json_encode( + ["error_id" => 11, "error" => $writeOffsErp->getErrors()], + JSON_UNESCAPED_UNICODE + ) + ); } } else { /** @var WriteOffsErp $writeOffsErp */ @@ -729,7 +750,13 @@ class DataController extends BaseController { $writeOffsErp->number_1c = $arr["number"] ?? ''; $writeOffsErp->save(); if ($writeOffsErp->getErrors()) { - LogService::apiErrorLog(json_encode(["error_id" => 11, "error" => $writeOffsErp->getErrors()], JSON_UNESCAPED_UNICODE)); + LogService::apiErrorLog( + json_encode( + ["error_id" => 11, + "error" => $writeOffsErp->getErrors()], + JSON_UNESCAPED_UNICODE + ) + ); } } diff --git a/erp24/records/Products1cAdditionalCharacteristics.php b/erp24/records/Products1cAdditionalCharacteristics.php index 33555901..2739bdfb 100644 --- a/erp24/records/Products1cAdditionalCharacteristics.php +++ b/erp24/records/Products1cAdditionalCharacteristics.php @@ -39,7 +39,8 @@ class Products1cAdditionalCharacteristics extends \yii\db\ActiveRecord return [ [['product_id', 'property_id', 'value'], 'required'], [['product_id', 'property_id', 'value'], 'string', 'max' => 255], - [['property_id'], 'exist', 'skipOnError' => true, 'targetClass' => Products1cPropType::class, 'targetAttribute' => ['property_id' => 'id']], + [['property_id'], 'exist', 'skipOnError' => true, 'targetClass' => Products1cPropType::class, + 'targetAttribute' => ['property_id' => 'id']], ]; } -- 2.39.5