Merge branch 'develop' into feature_smirnov_erp-381_edit_price_and_show_nacenka

# Conflicts:
#	erp24/controllers/BouquetController.php

diff --cc erp24/controllers/BouquetController.php
index 84a82d49560741b70da0e199c714a8289bb18b56,ef192fbdf156e4bd0cb1ff6ad8b5273d9f7280db..ac1eb2eadacd76886d4dbf2f0ae455a4688788f1
--- 1/erp24/controllers/BouquetController.php
--- 2/erp24/controllers/BouquetController.php
+++ b/erp24/controllers/BouquetController.php
@@@ -209,4 -207,28 +209,28 @@@ class BouquetController extends Control
  
          return $this->redirect(Yii::$app->request->referrer);
      }
 -}
+ 
+     public function actionGetProductListData()
+     {
+         Yii::$app->response->format = Response::FORMAT_JSON;
+         $request = Yii::$app->request;
+ 
+         $bouquet_id = (int) $request->get('id');
+         $month = (int) $request->get('month');
+         $year = (int) $request->get('year');
+ 
+         $products = BouquetCompositionProducts::find()->where(['bouquet_id' => $bouquet_id])->all();
+ 
+         $data = [];
+ 
+         foreach ($products as $product) {
+             $data[] = [
+                 'product_guid' => $product->product_guid,
+                 'buildPercentage' => $product->getBuildPercentage($year, $month),
+                 'averageNumberOfPieces' => $product->getAverageNumberOfPieces($year, $month),
+             ];
+         }
+ 
+         return $data;
+     }
 +}

diff --cc erp24/records/BouquetComposition.php
Simple merge

diff --cc erp24/views/bouquet/_product_list.php
Simple merge

diff --cc erp24/web/js/bouquet/bouquet.js
Simple merge