Порядок фото во view и убрал видео в фиде

diff --git a/erp24/controllers/MatrixErpController.php b/erp24/controllers/MatrixErpController.php
index c82762b1853d0a54e7b72398f5a43ccdfd03166a..b22bd971bcbac9e14a153bf002051664c7d93eef 100644 (file)
--- a/erp24/controllers/MatrixErpController.php
+++ b/erp24/controllers/MatrixErpController.php
@@ -189,7 +189,7 @@ class MatrixErpController extends Controller
     {
         $model = $this->findModel($id);
         $modelProperty = MatrixErpProperty::find()->where(['guid' => $model->guid])->one();
-        $matrixErpMedia = MatrixErpMedia::find()->where(['guid' => $model->guid])->with('file')->all();
+        $matrixErpMedia = MatrixErpMedia::find()->where(['guid' => $model->guid])->with('file')->orderBy(['foto_order' => SORT_ASC])->all();
         if (empty($modelProperty)) {
             $modelProperty = new MatrixErpProperty();
             $modelProperty->guid = $model->guid;

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 34c00bac032b9577cdb5918bbb42fd0281ebada6..d6b882da03476200f8d02aba5f638c671ab05beb 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -662,6 +662,7 @@ class MarketplaceService
         $urls = [];
         $data = MatrixErpMedia::find()
             ->where(['guid' => $guid])
+            ->andWhere(['name' => 'foto'])
             ->all();
         foreach ($data as $media) {
             if (!empty($media->file)) {