From: marina <m.zozirova@gmail.com>
Date: Fri, 29 Nov 2024 16:02:52 +0000 (+0300)
Subject: Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2
X-Git-Tag: 1.7~216^2~8
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=66c3c9e14e642b74ba78a3c9a32531d9bbad547c;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_zozirova_erp-243_replacment_actions_2

# Conflicts:
#	erp24/controllers/ShiftTransferController.php
#	erp24/views/shift-transfer/view.php
---

66c3c9e14e642b74ba78a3c9a32531d9bbad547c
diff --cc erp24/controllers/ShiftTransferController.php
index 46ffef33,e475929c..8173f56b
--- a/erp24/controllers/ShiftTransferController.php
+++ b/erp24/controllers/ShiftTransferController.php
@@@ -50,12 -44,11 +50,12 @@@ class ShiftTransferController extends C
              }
          }
          $adminArr = ArrayHelper::merge($adminArr, $adminArrOther);
-         $admins = ArrayHelper::map($adminArr, 'id', 'name', 'groupName');
-         return $admins;
+ 
+         return ArrayHelper::map($adminArr, 'id', 'name', 'groupName');
      }
  
 -    public function actionCreate() {
 +    public function actionCreate()
 +    {
          $shiftTransfer = new ShiftTransfer;
  
          $isCreate = true;
@@@ -84,9 -75,9 +83,9 @@@
              $postShiftTransfer = Yii::$app->request->post('ShiftTransfer');
              $loadDataShiftRemains = ArrayHelper::getValue($postShiftTransfer, 'shiftRemains');
              if (!empty($loadDataShiftRemains)) {
 -                MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains , '',[]);
 +                MultipleModel::loadMultipleFromArray($modelsShiftRemains, $loadDataShiftRemains, '', []);
              }
-             foreach ($modelsShiftRemains as $key => $modelsShiftRemain) {
+             foreach ($modelsShiftRemains as $modelsShiftRemain) {
                  $modelsShiftRemain->shift_transfer_id = $shiftTransfer->id;
                  if ($modelsShiftRemain->validate()) {
                      $modelsShiftRemain->save();
@@@ -105,19 -98,7 +106,10 @@@
              'admins'));
      }
  
-     public function actionGetProductsByGroupLabel()
-     {
-         Yii::$app->response->format = Response::FORMAT_JSON;
 -    public function actionGetProductPriceSelfCostAndRemains() {
 +
-         $productsClass = ProductsClass::find()->select('category_id')
-             ->where(['tip' => Yii::$app->request->post('groupLabel')])->column();
- 
-         return ArrayHelper::map(Products1c::find()->select(['id', 'name'])
-             ->where(['parent_id' => $productsClass])->all(), 'id', 'name');
-     }
 +
 +    public function actionGetProductPriceSelfCostAndRemains()
 +    {
          Yii::$app->response->format = Response::FORMAT_JSON;
  
          $productGuid = Yii::$app->request->post('productGuid');
@@@ -131,21 -115,10 +126,21 @@@
  
          $balance = Balances::find()->select(['quantity'])->where(['store_id' => $storeGuid, 'product_id' => $productGuid])->one();
  
-         return ['price' => $price->price ?? 0, 'selfCost' => $selfCost->price ?? 0, 'quantity' => $balance->quantity ?? 0];
+         return ['groupLabel' => $productClass->tip ?? 'other_items', 'price' => $price->price ?? 0, 'selfCost' => $selfCost->price ?? 0, 'quantity' => $balance->quantity ?? 0];
      }
  
 -    public function actionView($id) {
 +    public function actionView($id)
 +    {
 +        if (Yii::$app->request->post()) {
 +            $action = Yii::$app->request->post('action');
 +
 +            if ($action === 'accept') {
 +                ShiftRemains::updateAll(['type' => ShiftRemains::ARCHIVE_RECORD], ['shift_transfer_id' => $id]);
 +            } elseif ($action === 'save') {
 +                EqualizationRemains::updateData(Yii::$app->request->post()['ShiftTransfer']['equalizationRemains'], $id);
 +            }
 +        }
 +
          $shiftTransfer = ShiftTransfer::findOne($id);
  
          $storeNameById = TaskService::getEntitiesByAlias('store');