From 71837d74632c17c5c644919aa79066e456177943 Mon Sep 17 00:00:00 2001 From: yarik Date: Sat, 31 Dec 2016 13:32:20 +0200 Subject: [PATCH] Sales fix --- frontend/controllers/CabinetController.php | 16 +++++++++++++++- frontend/views/cabinet/_update_form.php | 20 ++++++++++++++++++++ frontend/views/cabinet/index.php | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------- frontend/views/cabinet/sales.php | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------- frontend/views/layouts/cabinet.php | 18 ++++++++++++++++++ 5 files changed, 339 insertions(+), 254 deletions(-) diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php index d35a5f9..f17fe0f 100755 --- a/frontend/controllers/CabinetController.php +++ b/frontend/controllers/CabinetController.php @@ -84,9 +84,23 @@ public function actionSales($id = null) { + /** + * @var User $user + */ + $user = \Yii::$app->user->identity; $newRecord = false; if ($id) { - $property = $this->findProperty($id); + $propertyQuery = IntellectualProperty::find(); + if (!$user->isAdmin()) { + $propertyQuery->joinWith('creativeRoles') + ->where([ 'intellectual_property.user_id' => $user->id ]) + ->orWhere([ 'creative_role.user_id' => $user->id ]); + } + $propertyQuery->andWhere([ 'intellectual_property.id' => $id ]); + $property = $propertyQuery->one(); + if (empty( $property )) { + throw new NotFoundHttpException(); + } } else { $property = new IntellectualProperty( [ diff --git a/frontend/views/cabinet/_update_form.php b/frontend/views/cabinet/_update_form.php index ad440f7..5d4125a 100644 --- a/frontend/views/cabinet/_update_form.php +++ b/frontend/views/cabinet/_update_form.php @@ -2,7 +2,9 @@ /** * @var CreativeRole $model */ + use common\models\User; use frontend\models\CreativeRole; + use yii\helpers\ArrayHelper; use yii\helpers\Html; use yii\widgets\ActiveForm; ?> @@ -30,6 +32,24 @@ field($model, 'title'); ?> + + field($model, 'user_id') + ->dropDownList( + ArrayHelper::getColumn( + User::find() + ->joinWith('userData') + ->indexBy('id') + ->all(), + function ($element) { + /** + * @var User $element + */ + return $element->userData->name . ' ' . $element->userData->surname; + } + ) + ); + ?> field($model, 'part'); diff --git a/frontend/views/cabinet/index.php b/frontend/views/cabinet/index.php index 0dbcf75..212a341 100755 --- a/frontend/views/cabinet/index.php +++ b/frontend/views/cabinet/index.php @@ -1,9 +1,9 @@
- 'int-prop-greed', - ]); - ?> + 'int-prop-greed', + ] + ); + ?> @@ -70,128 +72,131 @@ - - - - - - - - - - - + + + + + + + + + + + + ?>
№
п/п
- isAdmin() || $row->user_id == $user->id) { - echo Html::a($row->title, ['sales', 'id' => $row->id]); - } else { - echo $row->title; - } - ?> - registration_date ?>genre ?> - creativeRole)) { - echo $row->creativeRole->title; - } elseif($user->isAdmin()) { - echo '-'; - } else { - echo 'У Вас немає ролі в даному ОІВ'; - } - ?> - - creativeRole)) { - echo $row->creativeRole->part.'%'; - } else { - echo '-'; - } - ?> - - creativeRole)) { - $sum = 0; - foreach ($row->reports as $report) { - $sum += $report->sum; - } - echo ($sum * $row->creativeRole->part / 100); - unset($sum); - } else { - echo '-'; - } - ?> - - reports as $report) { - $sum += $report->count; - } - echo $sum; - unset($sum); - ?> -
+ title, + [ + 'sales', + 'id' => $row->id, + ] + ); + ?> + registration_date ?>genre ?> + creativeRole )) { + echo $row->creativeRole->title; + } elseif ($user->isAdmin()) { + echo '-'; + } else { + echo 'У Вас немає ролі в даному ОІВ'; + } + ?> + + creativeRole )) { + echo $row->creativeRole->part . '%'; + } else { + echo '-'; + } + ?> + + creativeRole )) { + $sum = 0; + foreach ($row->reports as $report) { + $sum += $report->sum; + } + echo( $sum * $row->creativeRole->part / 100 ); + unset( $sum ); + } else { + echo '-'; + } + ?> + + reports as $report) { + $sum += $report->count; + } + echo $sum; + unset( $sum ); + ?> +
- +