Добавление артикула

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index c4917790f0ced2a5429b44dac9b1b9da4baa7b89..e0f644bf3a123889c6ab82710612d97259adaedd 100644 (file)
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -890,17 +890,20 @@ class MarketplaceOrdersController extends Controller
         $flattenSkus = [];
         foreach ($skus as $campaignId => $sku) {
             foreach ($sku as $item) {
+                $product = Products1c::find()->where(['id' => $item['sku']])->one();
+                $articule = $product ? $product->articule : '';
                 $flattenSkus[] = [
                     "guid" => $item['sku'],
                     "count" => $item['items'][0]['count'],
                     "campaignId" => $campaignId,
+                    "articule" => $articule,
                 ];
             }
         }
         $dataProvider = new ArrayDataProvider([
             'allModels' => $flattenSkus,
             'sort' => [
-                'attributes' => ['guid', 'count', 'campaignId'],
+                'attributes' => ['guid', 'count', 'campaignId', 'articule'],
             ],
             'pagination' => [
                 'pageSize' => 200,

diff --git a/erp24/views/marketplace-orders/yandex-stocks.php b/erp24/views/marketplace-orders/yandex-stocks.php
index c91d794336f4ebfca9a9c9147368534466c64e0f..90100cf1975f5de860d0c82aa2a2a784a1c47396 100644 (file)
--- a/erp24/views/marketplace-orders/yandex-stocks.php
+++ b/erp24/views/marketplace-orders/yandex-stocks.php
@@ -36,6 +36,7 @@ YiiAsset::register($this);
                     return $product->name . " (" . $model['guid'] . ")";
                 }
             ],
+            'articule',
             'count',
             [
                 'attribute' => 'campaignId',