ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 4c57788f3f214edb5d271fb28aff586d7c919f38..1bd1eadaf35bb9eb639509a9766a18bfe3f3a066 100644 (file)
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -760,7 +760,11 @@ class DataController extends BaseController
                 'payment_method' => $marketplaceOrder->payment_method,
                 'cancel_requested' => $marketplaceOrder->cancel_requested,
                 'raw_data' => $marketplaceOrder->raw_data,
-                'link' => $marketplaceOrder->order_link
+                'link' => $marketplaceOrder->order_link,
+                'comment' => json_encode([
+                    'delivery' => $marketplaceOrder->raw_data['delivery'],
+                    'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule(),
+                ])
             ];
         }
         return $result;
@@ -837,6 +841,10 @@ class DataController extends BaseController
                     'delivery_type' => $delivery_type,
                     'items' => $itemsFiltered,
                     'photo_link' => $photoLink,
+                    'comment_data' => json_encode([
+                        'delivery' => $marketplaceOrder->raw_data['delivery'],
+                        'products_without_guid' => $marketplaceOrder->getProductsWithoutArticule(),
+                    ])
 //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 //                'status_id' => $marketplaceOrder->status_id,
 //                'substatus_id' => $marketplaceOrder->substatus_id,

diff --git a/erp24/records/MarketplaceOrders.php b/erp24/records/MarketplaceOrders.php
index f2b00fd454249498ef63f7b3a80f0cddc2997aa9..799ec050da41f5ce4560a98c4ef9dcf34ef932cb 100644 (file)
--- a/erp24/records/MarketplaceOrders.php
+++ b/erp24/records/MarketplaceOrders.php
@@ -211,4 +211,21 @@ class MarketplaceOrders extends \yii\db\ActiveRecord
 
         return $photo;
     }
+
+    public function getProductsWithoutArticule()
+    {
+        $products = $this->items;
+        $result = [];
+
+        foreach ($products as $product) {
+            $isProductWithGuid = Products1c::findOne(['articule' => $product->offer_id]);
+            if (!$isProductWithGuid) {
+                $result[] = [
+                    'product_id' => $product->offer_name ?? null,
+                    'quantity' => $product->count ?? null,
+                ];
+            }
+        }
+        return $result;
+    }
 }