[ERP-381] created_by from required to behavior take place

diff --git a/erp24/records/BouquetComposition.php b/erp24/records/BouquetComposition.php
index dc1e1a58b3d177a85336586f21a5da2540bf6c2c..86a2a9f6060af65436fb36e54d6ac74dfa0a684a 100644 (file)
--- a/erp24/records/BouquetComposition.php
+++ b/erp24/records/BouquetComposition.php
@@ -8,6 +8,7 @@ use yii\behaviors\BlameableBehavior;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
 use yii\db\Expression;
+use yii\helpers\Json;
 use yii\web\UploadedFile;
 use yii_app\services\FileService;
 
@@ -437,6 +438,9 @@ class BouquetComposition extends ActiveRecord
         $costModel->price = round($cost);
         $costModel->price_markup = $costModel->selfcost > 0 ? 100 * ($costModel->price / ($costModel->selfcost_markup_price + $costModel->selfcost) - 1) : 0;
         $costModel->save();
+        if ($costModel->getErrors()) {
+            throw new Exception(Json::encode($costModel->getErrors()));
+        }
     }
 
     public function getCostModel($region_id, $data = null, $force = false) {

diff --git a/erp24/records/BouquetCompositionPrice.php b/erp24/records/BouquetCompositionPrice.php
index fed1391520b97a5aa69698c7a84106769632256e..a7f27c6cd1cde6f39df45e2f24f41ec3a5dedb01 100644 (file)
--- a/erp24/records/BouquetCompositionPrice.php
+++ b/erp24/records/BouquetCompositionPrice.php
@@ -56,7 +56,7 @@ class BouquetCompositionPrice extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['bouquet_id', 'region_id', 'selfcost', 'selfcost_markup_price', 'price', 'created_at', 'created_by'], 'required'],
+            [['bouquet_id', 'region_id', 'selfcost', 'selfcost_markup_price', 'price'], 'required'],
             [['bouquet_id', 'region_id', 'created_by', 'updated_by'], 'default', 'value' => null],
             [['bouquet_id', 'region_id', 'created_by', 'updated_by'], 'integer'],
             [['selfcost', 'selfcost_markup', 'selfcost_markup_price', 'price', 'price_markup'], 'number'],