-1 fix

Alexey Boroda
1 parent 8458d742
Showing 3 changed files with 4 additions and 4 deletions Show diff stats
frontend/controllers/CabinetController.php
frontend/models/IntellectualProperty.php
frontend/views/cabinet/users.php
@@ -213,8 +213,7 @@
                                  ->all();
             } else {
                 $reports = Report::find()
-                                 ->joinWith('intellectualProperty.creativeRoles')
-                                 ->where([ 'creative_role.user_id' => $user->id ])
+                                 ->innerJoinWith('intellectualProperty.creativeRole')
                                  ->all();
             }
  
@@ -97,7 +97,7 @@
         public function getCreativeRole()
         {
             return $this->hasOne(CreativeRole::className(), [ 'intellectual_property_id' => 'id' ])
-                        ->where([ 'user_id' => \Yii::$app->user->id ]);
+                        ->where([ 'creative_role.user_id' => \Yii::$app->user->id ]);
         }
  
         /**
@@ -3,6 +3,7 @@
     use frontend\models\IntellectualProperty;
     use frontend\models\Report;
     use yii\helpers\Html;
+    use yii\helpers\VarDumper;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     use yii\widgets\Pjax;
@@ -58,7 +59,7 @@
                       if ($user->isAdmin()) {
                         $sum = $report->sum;
                       } else {
-                        $sum = $report->sum * $report->intellectualProperty->creativeRoles[0]->part / 100;
+                        $sum = $report->sum * $report->intellectualProperty->creativeRole->part / 100;
                       }
                       $total += $sum*0.8*0.805;
                         ?>