Добавлены планы по маркетплейсам

diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php
index b3350bbeaf6166fc347946fcaf5215a08f46719e..0538f7ddb650d29c450564ac28b87618e4e185c6 100644 (file)
--- a/erp24/controllers/CategoryPlanController.php
+++ b/erp24/controllers/CategoryPlanController.php
@@ -212,6 +212,13 @@ class CategoryPlanController extends Controller {
                 Yii::$app->session->setFlash('error', 'Не установлен план для магазина');
             }
 
+            if (!empty($salesWriteOffsPlan->online_sales_marketplace_plan)) {
+                $onlineMarketPlannedSales = self::calculatePlannedSales($tableOnline, $salesWriteOffsPlan->online_sales_marketplace_plan);
+            } else {
+                $onlineMarketPlannedSales = [];
+                Yii::$app->session->setFlash('error', 'Не установлен план для магазина');
+            }
+
 
             $eit = ExportImportTable::find()->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $model->store_id])->one();
             $store_id = $eit->export_val ?? '';
@@ -269,7 +276,7 @@ class CategoryPlanController extends Controller {
                     $categoryPlanNew->category = $type;
                     $categoryPlanNew->offline = $offlinePlannedSales[$model->store_id][$type] ?? 0;
                     $categoryPlanNew->internet_shop = $onlinePlannedSales[$model->store_id][$type] ?? 0;
-                    $categoryPlanNew->marketplace = 0;
+                    $categoryPlanNew->marketplace = $onlineMarketPlannedSales[$model->store_id][$type] ?? 0;
                     $categoryPlanNew->write_offs = $plannedWriteOffs[$model->store_id][$type] ?? 0;
                     $categoryPlanNew->created_at = date('Y-m-d HH:i:s');
                     $categoryPlanNew->updated_at = date('Y-m-d HH:i:s');

diff --git a/erp24/views/category-plan/index.php b/erp24/views/category-plan/index.php
index 3aeb55ef4f54cc567a9db8a73210667b4dc2289f..727e375eb9e73b278923dd732134848937fdc00f 100644 (file)
--- a/erp24/views/category-plan/index.php
+++ b/erp24/views/category-plan/index.php
@@ -208,7 +208,7 @@ input[readonly] {
                 <table id="categoryPlan" style="width:100%">
                     <?php
                     $offline_sale = $salesWriteOffsPlan->offline_sales_plan;
-                    $online_sale = $salesWriteOffsPlan->online_sales_shop_plan;
+                    $online_sale = $salesWriteOffsPlan->online_sales_shop_plan + $salesWriteOffsPlan->online_sales_marketplace_plan;
                     $write_offs = $salesWriteOffsPlan->write_offs_plan;
                     ?>
                     <thead>
@@ -230,11 +230,11 @@ input[readonly] {
                             <td data-p1-<?= $type ?> data-offline="<?= $offline_sale ?>" data-offline-type="<?= $type ?>"><?= Html::textInput('p1', number_format($p1, 2, '.', ''), ['type' => 'number', 'style' => 'max-width: 80px;', 'readonly' => !$isEditable, 'onchange' => 'editProcent(this);']) ?>%</td>
                             <td data-offline-type="<?= $type ?>"><?= Html::textInput('offline', number_format($categoryPlan[$type]['offline'], 0, '.', ''), ['type' => 'number', 'readonly' => true, ]) ?></td>
                             <?php
-                            $data2 = $categoryPlan[$type]['internet_shop'];
+                            $data2 = $categoryPlan[$type]['internet_shop'] + $categoryPlan[$type]['marketplace'];
                             $p2 = $online_sale <= 0 ? 0 : round( $data2 / $online_sale, 4) * 100;
                             ?>
                             <td data-p2-<?= $type ?> data-online="<?= $online_sale ?>" data-online-type="<?= $type ?>"><?= Html::textInput('p2', number_format($p2, 2, '.', ''), ['type' => 'number', 'style' => 'max-width: 80px;', 'readonly' => !$isEditable, 'onchange' => 'editProcent(this);']) ?>%</td>
-                            <td data-online-type="<?= $type ?>"><?= Html::textInput('internet_shop', number_format($categoryPlan[$type]['internet_shop'], 0, '.', ''), ['type' => 'number', 'readonly' => true, ]) ?></td>
+                            <td data-online-type="<?= $type ?>"><?= Html::textInput('internet_shop', number_format($data2, 0, '.', ''), ['type' => 'number', 'readonly' => true, ]) ?></td>
                             <?php //<td></td><td></td> ?>
                             <?php
                             $data4 = $categoryPlan[$type]['write_offs'];