From 0126e9e832172e330e085d05f754189f5f25cfc9 Mon Sep 17 00:00:00 2001 From: fomichev Date: Thu, 21 Nov 2024 11:13:52 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=89?= =?utf8?q?=D0=B5=D0=B3=D0=BE=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20?= =?utf8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=80=D0=BE=D0=B2=20=D0=B2=20=D0=B3?= =?utf8?q?=D1=80=D1=83=D0=BF=D0=BF=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/controllers/ProductsController.php | 78 ++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/erp24/controllers/ProductsController.php b/erp24/controllers/ProductsController.php index 417f4cad..bcef9dc9 100755 --- a/erp24/controllers/ProductsController.php +++ b/erp24/controllers/ProductsController.php @@ -5,6 +5,7 @@ namespace app\controllers; use Yii; use yii\helpers\Html; use yii\web\Controller; +use yii_app\records\ExportImportTable; use yii_app\records\Prices; use yii_app\records\Products1c; use yii_app\records\Products1cOptions; @@ -129,8 +130,10 @@ class ProductsController extends Controller $data = Products1c::find() ->alias('p') - ->select(['p.id', 'p.name', 'e.entity_id', 'p.view']) - ->leftJoin('export_import_table e', "e.export_iD = p.id AND e.export_val = '1' AND e.entity = 'products'") + ->select(['p.id', 'p.name', 'alias.entity_id', 'p.view']) + ->leftJoin(['alias' => ExportImportTable::find() + ->select(['export_id', 'export_val', 'entity', 'entity_id' ])], + "alias.export_id::text = p.id AND alias.export_val = '1' AND alias.entity = 'products'") ->where(['p.tip' => 'products', 'p.parent_id' => $parent_id]) ->orderBy(['p.name' => SORT_ASC]) ->asArray() @@ -163,13 +166,80 @@ class ProductsController extends Controller ->select(['product_id', 'color', 'name']) ->orderBy(['posit' => SORT_DESC]) ->all(); - + $dataResponse = ''; $products_varieties = []; foreach ($varietiesData as $variety) { $products_varieties[$variety->product_id][$variety->color][] = $variety->name; } + $dataResponse .= ''; + foreach ($data as $row) { + + $dataResponse .= "скрыто"; + } + + $dataResponse .= '
+ поставщика '.($providers[$row['id']]??'').'
'; + + if(!empty($colorsProducts[$row["id"]])) { + $s=0; + foreach($colorsProducts[$row["id"]] as $color) { + $color=trim($color); + if(!empty($color)) { + $s++; + $dataResponse .= "
$color"; + + if(!empty($products_varieties[$row["id"]][$color])) { + $dataResponse .= "сорта "; + foreach($products_varieties[$row["id"]][$color] as $varieties => $nameV) { + + $dataResponse .= ' '.$nameV.' '; + } + } + } + } + + if($s>0) { + $dataResponse .= "+ добавить сорта"; + } + } + $dataResponse .= " GUID ".$row["id"]."
"; + + + if(!empty($row["entity_id"])) { + + } + + } + $dataResponse .= '
"; + + if(!empty($prices[$row['id']]) and empty($row["entity_id"])) + $dataResponse .= '
внести цена '.$prices[$row['id']].'
'; + else { + $dataResponse .= '
внести цена '.($prices[$row['id']]??'').'
'; + } + + $dataResponse .= "
".$row["entity_id"].""; + + if(!empty($row["entity_id"])) { + $dataResponse .= '
удалить продукт
+
+ удалить только связь
'; + } + + $dataResponse .= "
'; + + + } + + return $dataResponse; /* return $this->renderPartial('ajax-products-in-group', [ 'data' => $data, 'prices' => $prices, @@ -177,7 +247,7 @@ class ProductsController extends Controller 'colorsProducts' => $colorsProducts, 'products_varieties' => $products_varieties, ]);*/ - } + } // Возвращаем пустой ответ, если запрос не AJAX или parent_id пустой -- 2.39.5