From: marina <m.zozirova@gmail.com>
Date: Tue, 13 Aug 2024 08:38:15 +0000 (+0300)
Subject: ERP-85 Реализовать обмен данных с 1С Бухгалтерия
X-Git-Tag: 1.4~22^2~33
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=158086347c35b622b9c71f19e1ab98d37d01a3a0;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 96226bd1..667dc153 100644
--- a/erp24/api2/controllers/DataBuhController.php
+++ b/erp24/api2/controllers/DataBuhController.php
@@ -12,7 +12,7 @@ class DataBuhController extends BaseController
 {
     const OUT_DIR =
 //        __DIR__ . "/../json";
-        "/var/www/erp24/api2_buh/json";
+        "/var/www/erp24/api2/json";
 //          "/var/www/www-root/data/www/api.bazacvetov24.ru/data/json";
 
     public function actionRequest() {
@@ -62,7 +62,9 @@ class DataBuhController extends BaseController
 
     public function actionUpload() {
         set_time_limit(600);
+
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
+
         $request = Yii::$app->request->getRawBody();
 
         try {
@@ -70,21 +72,22 @@ class DataBuhController extends BaseController
         } catch (Exception $ex) {
             return $this->asJson(['error' => ['code' => 400, 'message' => 'Json body invalid']]);
         }
-
-        $result['ver'] = $result['ver'] ?? '';
-
-        file_put_contents(self::OUT_DIR . '/a1_request_buh.json', PHP_EOL . date('Y-m-d H:i:s') . ' ' . $result["ver"], FILE_APPEND | LOCK_EX);
-
-        if (empty($result['ver']) || round($result['ver'], 2) < 1.1) {
-            file_put_contents(self::OUT_DIR . '/request_exit_buh.json', PHP_EOL . $result["ver"], FILE_APPEND | LOCK_EX);
-
-            return $this->asJson(["error_id" => 1, "error" => "minimal version is 1.1"]);
-        }
+//        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"])) {
             $requestId = $result["request_id"];
+            $fl = "request_id_" . $result["request_id"];
+        } 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 {