From 6fb3095483ffd1d4381d372e81644eee80be0ca0 Mon Sep 17 00:00:00 2001 From: marina Date: Tue, 18 Mar 2025 14:04:57 +0300 Subject: [PATCH] =?utf8?q?ERP-329=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20?= =?utf8?q?=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=20=D0=B4?= =?utf8?q?=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20?= =?utf8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0=D0=BC=D0=B8=20=D0=BC=D0=BF?= =?utf8?q?=20=D0=B8=20=D0=B0=D0=BC=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/composer.json | 3 ++- erp24/controllers/ShipmentController.php | 8 +++++++- erp24/records/Products1c.php | 1 + erp24/views/shipment/auto-polnogramma.php | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/erp24/composer.json b/erp24/composer.json index 02825c64..5640f82f 100644 --- a/erp24/composer.json +++ b/erp24/composer.json @@ -39,7 +39,8 @@ "vlucas/phpdotenv": "^5.6", "softark/yii2-dual-listbox": "^1.0", "kartik-v/yii2-widget-depdrop": "dev-master", - "kartik-v/yii2-export": "@dev" + "kartik-v/yii2-export": "@dev", + "sjaakp/yii2-bandoneon": "*" }, "require-dev": { "yiisoft/yii2-debug": "~2.1.0", diff --git a/erp24/controllers/ShipmentController.php b/erp24/controllers/ShipmentController.php index 42dd143e..2fc8f128 100755 --- a/erp24/controllers/ShipmentController.php +++ b/erp24/controllers/ShipmentController.php @@ -3,6 +3,7 @@ namespace app\controllers; use yii\web\Controller; +use yii_app\records\Products1c; class ShipmentController extends Controller { @@ -37,5 +38,10 @@ class ShipmentController extends Controller public function actionConfigSort() { return $this->render('config-sort'); } public function actionFields() { return $this->render('fields'); } public function actionStatusesEdit() { return $this->render('statuses-edit'); } - public function actionAutoPolnogramma() { return $this->render('auto-polnogramma'); } + public function actionAutoPolnogramma() { + + return $this->render('auto-polnogramma', [ + 'groups' => Products1c::findAll(['tip' => Products1c::TYPE_PRODUCTS_GROUP]) + ]); + } } \ No newline at end of file diff --git a/erp24/records/Products1c.php b/erp24/records/Products1c.php index 21ad21a1..f0b7e246 100644 --- a/erp24/records/Products1c.php +++ b/erp24/records/Products1c.php @@ -23,6 +23,7 @@ class Products1c extends \yii\db\ActiveRecord const PRODUCT1C_FIELDS = ['id', 'parent_id', 'tip', 'type', 'code', 'name', 'articule', 'view', 'components', 'AdditionCharacteristics']; public const TYPE_PRODUCTS = 'products'; + public const TYPE_PRODUCTS_GROUP = 'products_group'; public const IS_VISIBLE = 1; /** diff --git a/erp24/views/shipment/auto-polnogramma.php b/erp24/views/shipment/auto-polnogramma.php index d72019a4..50d8502b 100644 --- a/erp24/views/shipment/auto-polnogramma.php +++ b/erp24/views/shipment/auto-polnogramma.php @@ -8,6 +8,7 @@ use yii_app\records\AdminGroup; use yii_app\records\StoreCityList; use yii_app\records\StoreDynamic; use yii_app\records\StoreType; +use sjaakp\bandoneon\Bandoneon; ?>
@@ -90,5 +91,18 @@ use yii_app\records\StoreType;
+
+
+ + + $group->name"; + echo "
'group-{$group->id}>
"; + } ?> + + +
+
\ No newline at end of file -- 2.39.5