From: marina <m.zozirova@gmail.com>
Date: Wed, 14 Aug 2024 22:29:26 +0000 (+0300)
Subject: ERP-85 Реализовать обмен данных с 1С Бухгалтерия
X-Git-Tag: 1.4~22^2~28
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=b89eb7b0ed2e824d1cc3ac9ab2ef1d7297f8063b;p=erp24_rep%2Fyii-erp24%2F.git

ERP-85 Реализовать обмен данных с 1С Бухгалтерия
поправлено сохранение при получении
---

diff --git a/erp24/api2/controllers/DataBuhController.php b/erp24/api2/controllers/DataBuhController.php
index fb141f9c..6ac6b6a6 100644
--- a/erp24/api2/controllers/DataBuhController.php
+++ b/erp24/api2/controllers/DataBuhController.php
@@ -15,7 +15,8 @@ class DataBuhController extends BaseController
         "/var/www/erp24/api2/json_buh";
 //          "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json";
 
-    public function actionRequest() {
+    public function actionRequest()
+    {
         \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
         \Yii::$app->response->headers->set('firm', 'IP_Belov');
 
@@ -61,7 +62,8 @@ class DataBuhController extends BaseController
     }
 
 
-    public function actionUpload() {
+    public function actionUpload()
+    {
         set_time_limit(600);
 
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
@@ -73,11 +75,6 @@ class DataBuhController extends BaseController
         } catch (Exception $ex) {
             return $this->asJson(['error' => ['code' => 400, 'message' => 'Json body invalid']]);
         }
-//        if (empty($result)) {
-//            file_put_contents(self::OUT_DIR . '/error_buh_upload.txt',
-//                PHP_EOL . 'result empty', FILE_APPEND);
-//            return $this->asJson(['error' => ['code' => 400, 'message' => 'result empty']]);
-//        }
 
         $requestId = '';
         if (!empty($result["request_id"])) {
@@ -86,9 +83,6 @@ class DataBuhController extends BaseController
         } else {
             $fl = time();
         }
-//        InfoLogService::setInfoLog(__FILE__, __LINE__, 'upload_' . $fl . '.json' , 'info_id_25_1');
-//
-//        file_put_contents(self::OUT_DIR . '/upload_' . $fl . '.json', PHP_EOL . $request);
 
         try {
 
@@ -97,11 +91,8 @@ class DataBuhController extends BaseController
             $apiCronTest->date_up = date("Y-m-d H:i:s");
             $apiCronTest->status = 2;
             $apiCronTest->json_post = $request;
-            $apiCronTest->request_id = $requestId;
-            $validate = $apiCronTest->validate();
-            if ($validate) {
-                $apiCronTest->save();
-            }
+            $apiCronTest->request_id = strval($requestId);
+            $apiCronTest->save();
 
         } catch (Exception $e) {
             file_put_contents(self::OUT_DIR . '/error_buh_upload.txt', PHP_EOL . 'result empty', FILE_APPEND);