[ERP-409] order_guid

diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php
index 10808516b13d8d47d3270988086ea58fb997fb0c..76a105aebf2960a129c822d9d4495dfbab82f9e3 100644 (file)
--- a/erp24/media/controllers/NotificationController.php
+++ b/erp24/media/controllers/NotificationController.php
@@ -208,7 +208,8 @@ 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;
                     }
 
                     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
new file mode 100755 (executable)
index 0000000..7100144
--- /dev/null
+++ b/erp24/migrations/m250422_130953_add_column_order_guid_to_table_create_checks.php
@@ -0,0 +1,40 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m250422_130953_add_column_order_guid_to_table_create_checks
+ */
+class m250422_130953_add_column_order_guid_to_table_create_checks 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('order_guid')) {
+            $this->addColumn(
+                self::TABLE_NAME,
+                'order_guid',
+                $this->string(36)->null()->comment('GUID заказа в МП')
+            );
+        }
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        if ($this->db->schema->getTableSchema(self::TABLE_NAME, true)->getColumn('order_guid')) {
+            $this->dropColumn(self::TABLE_NAME, 'order_guid ');
+        }
+    }
+}

diff --git a/erp24/records/CreateChecks.php b/erp24/records/CreateChecks.php
index 473b014945238016994bc5bfca7fc36ff976aaa5..bc480c4e4e291e15d0421e3a7158fff2dc6058a4 100644 (file)
--- a/erp24/records/CreateChecks.php
+++ b/erp24/records/CreateChecks.php
@@ -27,6 +27,7 @@ use yii_app\api3\core\validators\PhoneValidator;
  * @property string|null $date_up дата обновления из 1с 
  * @property string $comments комментарий к чеку- номер телефона клиента
  * @property string|null $phone Телефон клиента
+ * @property string|null $order_guid GUID заказа в МП
  */
 class CreateChecks extends \yii\db\ActiveRecord
 {
@@ -48,7 +49,7 @@ class CreateChecks extends \yii\db\ActiveRecord
             [['order_id', 'held', 'status'], 'integer'],
             [['type', 'items', 'payments', 'phone'], 'string'],
             [['date', 'delivery_date', 'date_up', 'phone'], 'safe'],
-            [['kkm_id', 'seller_id', 'store_id', 'check_id', 'guid', 'sales_check'], 'string', 'max' => 36],
+            [['kkm_id', 'seller_id', 'store_id', 'check_id', 'guid', 'sales_check', 'order_guid'], 'string', 'max' => 36],
             [['name', 'comments'], 'string', 'max' => 255],
             [['phone'], 'string', 'max' => 20],
             ['phone', PhoneValidator::class],
@@ -80,6 +81,7 @@ class CreateChecks extends \yii\db\ActiveRecord
             'delivery_date' => 'Delivery Date',
             'date_up' => 'Date Up',
             'comments' => 'Comments',
+            'order_guid' => 'Order Guid',
         ];
     }
 }

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 400afdd38f249a071afd6e9c8dda03fe14b2dd6b..55fe562686837b534aa16a66222641021a880b79 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -16,6 +16,7 @@ use yii\web\Response;
 use yii_app\helpers\DataHelper;
 use yii_app\helpers\File;
 use yii_app\records\Balances;
+use yii_app\records\CreateChecks;
 use yii_app\records\Images;
 use yii_app\records\MarketplaceFlowwowEmails;
 use yii_app\records\MarketplaceOrder1cStatuses;
@@ -1660,7 +1661,10 @@ class MarketplaceService
                     $marketplaceOrder = MarketplaceOrders::find()
                         ->where(['marketplace_order_id' => (string)key($order)])
                         ->one();
-
+                    /* @var $marketplaceOrder MarketplaceOrders */
+                    $createChecks = new CreateChecks;
+                    $createChecks->order_id = $marketplaceOrder->marketplace_order_id;
+                    $createChecks->order_guid = $marketplaceOrder->guid;
                 }
             }
         }