Merge branch 'develop' into feature_smirnov_erp-401_delivery_type_and_link

# Conflicts:
#	erp24/api2/controllers/DataController.php

diff --cc erp24/api2/controllers/DataController.php
index 9fe93682940163167d22da1fc5993a1bc4669fd2,42e12a8cc825b7282fd28ef56ca6583ad2118297..c3e4d74e6f455671922960c5c0f4a997406c5bc2
--- 1/erp24/api2/controllers/DataController.php
--- 2/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@@ -768,52 -766,53 +767,56 @@@ class DataController extends BaseContro
              $summ = 0;
              foreach ($items as $item) {
                  $product1c = Products1c::find()->where(['articule' => $item['offer_id']])->one();
-                 $itemsFiltered []= [
-                     'product_id' => $product1c->id ?? '',
-                     'color' => '',
-                     'price' => $item['price'],
-                     'quantity' => $item['count'],
-                     'seller_id' => '',
-                 ];
+                 if (!empty($product1c->id)) {
+                     $itemsFiltered []= [
+                         'product_id' => $product1c->id ?? '',
+                         'color' => '',
+                         'price' => $item['price'],
+                         'quantity' => $item['count'],
+                         'seller_id' => '',
+                     ];
+                 }
                  $summ += $item['price'] * $item['count'];
              }
-             $eit = ExportImportTable::find()->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
-             $store_id = $eit->export_val ?? '';
-             $marketplaceOrderDelivery = MarketplaceOrderDelivery::find()->where(['order_id' => $marketplaceOrder->id])->one();
-             /* @var $marketplaceOrderDelivery MarketplaceOrderDelivery */
-             $delivery_type = $marketplaceOrderDelivery && $marketplaceOrderDelivery->type == 'DELIVERY' ? 1 : 2;
-             $result[] = [
-                 'id' => $marketplaceOrder->guid,
-                 'store_id' => $store_id,
-                 'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id,
-                 'summ' => $summ,
-                 'seller_id' => '',
-                 'status' => 0,
-                 'cancelled' => false,
-                 'marketplace' => $marketplaceOrder->marketplace_id ?? 0,
-                 'marketplace_name' => $marketplaceOrder->marketplace_name ?? 'ЯндексМаркет',
-                 'delivery_type' => $delivery_type,
-                 'items' => $itemsFiltered,
+             if (!empty($itemsFiltered)) {
+                 $eit = ExportImportTable::find()->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
+                 $store_id = $eit->export_val ?? '';
++                $marketplaceOrderDelivery = MarketplaceOrderDelivery::find()->where(['order_id' => $marketplaceOrder->id])->one();
++                /* @var $marketplaceOrderDelivery MarketplaceOrderDelivery */
++                $delivery_type = $marketplaceOrderDelivery && $marketplaceOrderDelivery->type == 'DELIVERY' ? 1 : 2;
+                 $result[] = [
+                     'id' => $marketplaceOrder->guid,
+                     'store_id' => $store_id,
+                     'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id,
+                     'summ' => $summ,
+                     'seller_id' => '',
+                     'status' => 0,
+                     'cancelled' => false,
+                     'marketplace' => $marketplaceOrder->marketplace_id ?? 0,
+                     'marketplace_name' => $marketplaceOrder->marketplace_name ?? 'ЯндексМаркет',
++                    'delivery_type' => $delivery_type,
+                     'items' => $itemsFiltered,
 -    //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 -    //                'status_id' => $marketplaceOrder->status_id,
 -    //                'substatus_id' => $marketplaceOrder->substatus_id,
 -    //                'warehouse_guid' => $marketplaceOrder->warehouse_guid,
 -    //                'creation_date' => $marketplaceOrder->creation_date,
 -    //                'updated_at' => $marketplaceOrder->updated_at,
 -    //                'returned_at' => $marketplaceOrder->returned_at,
 -    //                'return_data' => $marketplaceOrder->return_data,
 -    //                'fake' => $marketplaceOrder->fake,
 -    //                'total' => $marketplaceOrder->total,
 -    //                'delivery_total' => $marketplaceOrder->delivery_total,
 -    //                'buyer_total_before_discount' => $marketplaceOrder->buyer_total_before_discount,
 -    //                'tax_system' => $marketplaceOrder->tax_system,
 -    //                'payment_type' => $marketplaceOrder->payment_type,
 -    //                'payment_method' => $marketplaceOrder->payment_method,
 -    //                'cancel_requested' => $marketplaceOrder->cancel_requested,
 -    //                'raw_data' => $marketplaceOrder->raw_data,
 +//                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
 +//                'status_id' => $marketplaceOrder->status_id,
 +//                'substatus_id' => $marketplaceOrder->substatus_id,
 +//                'warehouse_guid' => $marketplaceOrder->warehouse_guid,
 +//                'creation_date' => $marketplaceOrder->creation_date,
 +//                'updated_at' => $marketplaceOrder->updated_at,
 +//                'returned_at' => $marketplaceOrder->returned_at,
 +//                'return_data' => $marketplaceOrder->return_data,
 +//                'fake' => $marketplaceOrder->fake,
 +//                'total' => $marketplaceOrder->total,
 +//                'delivery_total' => $marketplaceOrder->delivery_total,
 +//                'buyer_total_before_discount' => $marketplaceOrder->buyer_total_before_discount,
 +//                'tax_system' => $marketplaceOrder->tax_system,
 +//                'payment_type' => $marketplaceOrder->payment_type,
 +//                'payment_method' => $marketplaceOrder->payment_method,
 +//                'cancel_requested' => $marketplaceOrder->cancel_requested,
 +//                'raw_data' => $marketplaceOrder->raw_data,
-             ];
-             $marketplaceOrder->status_1c = MarketplaceOrders::STATUSES_1C_SENDED_TO_1C;
-             $marketplaceOrder->save();
+                 ];
 -
+                 $marketplaceOrder->status_1c = MarketplaceOrders::STATUSES_1C_SENDED_TO_1C;
+                 $marketplaceOrder->save();
+             }
          }
          return $result;
      }