new fields

diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php
index 927678084898282e8bc0b0bb5dcc800103005534..20b1152ee34da284e324768e9764d0dc48ce48a5 100644 (file)
--- a/erp24/media/controllers/NotificationController.php
+++ b/erp24/media/controllers/NotificationController.php
@@ -11,15 +11,19 @@ use yii\rest\Controller;
 use yii\web\BadRequestHttpException;
 use yii\web\NotFoundHttpException;
 use yii_app\api3\core\exceptions\ErrorException;
+use yii_app\helpers\DataHelper;
 use yii_app\helpers\File;
 use yii_app\helpers\ImageHelper;
 use yii_app\records\CreateChecks;
+use yii_app\records\ExportImportTable;
 use yii_app\records\Files;
 use yii_app\records\Images;
 use yii_app\records\MarketplaceOrderDelivery;
+use yii_app\records\MarketplaceOrderItems;
 use yii_app\records\MarketplaceOrders;
 use yii_app\records\MatrixErp;
 use yii_app\records\MatrixErpProperty;
+use yii_app\records\Products1c;
 use yii_app\services\FileService;
 use yii_app\services\MarketplaceService;
 
@@ -209,13 +213,26 @@ class NotificationController extends Controller
                     /* @var $marketplaceOrder MarketplaceOrders */
                     if ($newStatusCode == 'DELIVERED' && $newSubstatusCode == 'DELIVERY_SERVICE_DELIVERED' && $marketplaceOrder) {
                         $createChecks = new CreateChecks;
-                        $createChecks->order_id = $marketplaceOrder->marketplace_order_id;
                         $createChecks->order_guid = $marketplaceOrder->guid;
 
-                        $marketplaceOrderDelivery = MarketplaceOrderDelivery::findOne(['order_id' => $marketplaceOrder->id]);
-                        if ($marketplaceOrderDelivery) {
-                            $createChecks->date = $marketplaceOrderDelivery->delivery_start;
+                        $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->check_id = DataHelper::createGuidMy('02');
+                        $createChecks->guid = $createChecks->check_id;
+                        $createChecks->type = 'Продажа';
+                        $items = [];
+                        foreach ($marketplaceOrder->items as $item) {
+                            /* @var $item MarketplaceOrderItems */
+                            $productsId = Products1c::find()->select(['id'])->where(['articule' => $item->offer_id])->one();
+                            $items [] = [
+                                'product_id' => $productsId->id ?? '',
+                                'quantity' => $item->count,
+                                'seller_id' => '',
+                                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
+                            ];
                         }
+                        $createChecks->items = Json::encode($items);
                     }
 
                     if (!$marketplaceOrder) {

diff --git a/erp24/migrations/m250422_130953_add_column_order_guid_to_table_create_checks.php b/erp24/migrations/m250422_130953_add_column_order_guid_to_table_create_checks.php
index 71001444b6493b2f24db93a148dd68337def5ca3..6a4c642cfbabf8cf4c78c4af09ca1a34561596c6 100755 (executable)
--- a/erp24/migrations/m250422_130953_add_column_order_guid_to_table_create_checks.php
+++ b/erp24/migrations/m250422_130953_add_column_order_guid_to_table_create_checks.php
@@ -25,7 +25,6 @@ class m250422_130953_add_column_order_guid_to_table_create_checks extends Migrat
                 $this->string(36)->null()->comment('GUID заказа в МП')
             );
         }
-
     }
 
     /**
@@ -34,7 +33,7 @@ class m250422_130953_add_column_order_guid_to_table_create_checks extends Migrat
     public function safeDown()
     {
         if ($this->db->schema->getTableSchema(self::TABLE_NAME, true)->getColumn('order_guid')) {
-            $this->dropColumn(self::TABLE_NAME, 'order_guid ');
+            $this->dropColumn(self::TABLE_NAME, 'order_guid');
         }
     }
 }

diff --git a/erp24/migrations/m250428_114148_add_column_marketplace_order_id_to_table_create_check.php b/erp24/migrations/m250428_114148_add_column_marketplace_order_id_to_table_create_check.php
new file mode 100755 (executable)
index 0000000..fc545d3
--- /dev/null
+++ b/erp24/migrations/m250428_114148_add_column_marketplace_order_id_to_table_create_check.php
@@ -0,0 +1,41 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m250428_114148_add_column_marketplace_order_id_to_table_create_check
+ */
+class m250428_114148_add_column_marketplace_order_id_to_table_create_check extends Migration
+{
+    const TABLE_NAME = 'erp24.create_checks';
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $table = $this->db->schema->getTableSchema(self::TABLE_NAME);
+        if ($table === null) {
+            return;
+        }
+        if (!$this->db->schema->getTableSchema(self::TABLE_NAME, true)->getColumn('marketplace_order_id')) {
+            $this->addColumn(
+                self::TABLE_NAME,
+                'marketplace_order_id',
+                $this->string(36)->null()->comment('')
+            );
+        }
+
+        $this->alterColumn(self::TABLE_NAME, 'kkm_id', $this->string(36)->null()->comment('kkm_id'));
+        $this->alterColumn(self::TABLE_NAME, 'seller_id', $this->string(36)->null()->comment('seller_id'));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        if ($this->db->schema->getTableSchema(self::TABLE_NAME, true)->getColumn('marketplace_order_id')) {
+            $this->dropColumn(self::TABLE_NAME, 'marketplace_order_id');
+        }
+    }
+}

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index d9c5ff69b7d25c26835093646138469860dd9a5c..e4e438e510a941671efb8a0d8a29e21994b2c975 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -17,6 +17,7 @@ use yii_app\helpers\DataHelper;
 use yii_app\helpers\File;
 use yii_app\records\Balances;
 use yii_app\records\CreateChecks;
+use yii_app\records\ExportImportTable;
 use yii_app\records\Images;
 use yii_app\records\MarketplaceFlowwowEmails;
 use yii_app\records\MarketplaceOrder1cStatuses;
@@ -1717,13 +1718,26 @@ class MarketplaceService
                         ->one();
                     /* @var $marketplaceOrder MarketplaceOrders */
                     $createChecks = new CreateChecks;
-                    $createChecks->order_id = $marketplaceOrder->marketplace_order_id;
                     $createChecks->order_guid = $marketplaceOrder->guid;
 
-                    $marketplaceOrderDelivery = MarketplaceOrderDelivery::findOne(['order_id' => $marketplaceOrder->id]);
-                    if ($marketplaceOrderDelivery) {
-                        $createChecks->date = $marketplaceOrderDelivery->delivery_start;
+                    $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->check_id = DataHelper::createGuidMy('02');
+                    $createChecks->guid = $createChecks->check_id;
+                    $createChecks->type = 'Продажа';
+                    $items = [];
+                    foreach ($marketplaceOrder->items as $item) {
+                        /* @var $item MarketplaceOrderItems */
+                        $productsId = Products1c::find()->select(['id'])->where(['articule' => $item->offer_id])->one();
+                        $items [] = [
+                            'product_id' => $productsId->id ?? '',
+                            'quantity' => $item->count,
+                            'seller_id' => '',
+                            'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
+                        ];
                     }
+                    $createChecks->items = Json::encode($items);
                 }
             }
         }