ERP-329 Новый интерфейс для работы с заказами мп и амо

diff --git a/erp24/composer.json b/erp24/composer.json
index 02825c64541a8462f937c85d4526eb109a6bc5b5..5640f82facbbb7b55a6c00b329dbf3edf25668ec 100644 (file)
--- 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 42dd143e657bbc9c25eb83ffd7f10810fbc81846..2fc8f12811edd687ba79e73132102363288aab99 100755 (executable)
--- 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 21ad21a16c5301d084aacd5b2b07fd2b1802cde9..f0b7e246ba56ab567ba7c797041609fa79cb1266 100644 (file)
--- 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 d72019a41e0e119368b85d7f3e98da58d190b687..50d8502b5d7925b4332f9b7297d37dc283d51ec6 100644 (file)
--- 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;
 
 ?>
 <div class="autopolnogramma p-3">
@@ -90,5 +91,18 @@ use yii_app\records\StoreType;
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="col-md-5">
+
+            <?php Bandoneon::begin() ?>
+            <?php
+            foreach ($groups as $group) {
+                echo "<h4>$group->name</h4>";
+                echo "<div 'class' => 'group-{$group->id}></div>";
+            } ?>
+            <?php Bandoneon::end() ?>
+
+        </div>
+    </div>
 
 </div>
\ No newline at end of file