diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php index 42673f8..4974417 100644 --- a/frontend/controllers/CabinetController.php +++ b/frontend/controllers/CabinetController.php @@ -8,7 +8,7 @@ use yii\filters\VerbFilter; use yii\web\Controller; use yii\web\NotFoundHttpException; - + /** * Cabinet controller */ @@ -24,10 +24,10 @@ { return [ 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::className(), 'actions' => [ - 'personal' => ['post'], - 'passport' => ['post'], + 'personal' => [ 'post' ], + 'passport' => [ 'post' ], ], ], ]; @@ -45,42 +45,58 @@ * @var User $user */ $user = \Yii::$app->user->identity; - if(!$userData = $user->userData) { + if (!$userData = $user->userData) { $userData = new UserData(); } - if(!$userPassport = $user->userPassport) { + if (!$userPassport = $user->userPassport) { $userPassport = new UserPassport(); } - $table = IntellectualProperty::find()->where([ - 'user_id' => \Yii::$app->user->identity->id, - ])->all(); + $table = IntellectualProperty::find() + ->where( + [ + 'user_id' => \Yii::$app->user->identity->id, + ] + ) + ->all(); - return $this->render('index', [ - 'userData' => $userData, - 'userPassport' => $userPassport, - 'table' => $table, - ]); + return $this->render( + 'index', + [ + 'userData' => $userData, + 'userPassport' => $userPassport, + 'table' => $table, + ] + ); } public function actionSales($id = null) { - if($id) { + $newRecord = false; + if ($id) { $property = $this->findProperty($id); } else { $property = new IntellectualProperty(); + $newRecord = true; } - if($property->load(\Yii::$app->request->post()) && $property->save()) { - $response = \Yii::$app->response; - $response->format = $response::FORMAT_JSON; - return [ - 'success' => true, - 'message' => 'Данные успешно сохранены', - ]; + if ($property->load(\Yii::$app->request->post()) && $property->save()) { + if($newRecord) { + return $this->redirect(['cabinet/sales', 'id' => $property->id]); + } else { + $response = \Yii::$app->response; + $response->format = $response::FORMAT_JSON; + return [ + 'success' => true, + 'message' => 'Данные успешно сохранены', + ]; + } } - return $this->render('sales', [ - 'property' => $property, - ]); + return $this->render( + 'sales', + [ + 'property' => $property, + ] + ); } public function actionPersonal() @@ -92,23 +108,23 @@ * @var User $user */ $user = \Yii::$app->user->identity; - if(!$userData = $user->userData) { + if (!$userData = $user->userData) { $userData = new UserData(); $userData->user_id = $user->id; } - if($userData->load($request->post()) && $userData->save()) { + if ($userData->load($request->post()) && $userData->save()) { return [ 'success' => true, 'message' => 'Данные успешно сохранены', ]; } else { return [ - 'error' => true, + 'error' => true, 'message' => 'Ошибка сохранения данных', ]; } } - + public function actionPassport() { $request = \Yii::$app->request; @@ -118,23 +134,23 @@ * @var User $user */ $user = \Yii::$app->user->identity; - if(!$userPassport = $user->userPassport) { + if (!$userPassport = $user->userPassport) { $userPassport = new UserPassport(); $userPassport->user_id = $user->id; } - if($userPassport->load($request->post()) && $userPassport->save()) { + if ($userPassport->load($request->post()) && $userPassport->save()) { return [ 'success' => true, 'message' => 'Данные успешно сохранены', ]; } else { return [ - 'error' => true, + 'error' => true, 'message' => 'Ошибка сохранения данных', ]; } } - + public function actionAddIntProp() { $request = \Yii::$app->request; @@ -145,14 +161,14 @@ $intProperty->user_id = \Yii::$app->user->identity->id; - if($intProperty->load($request->post()) && $intProperty->save()) { + if ($intProperty->load($request->post()) && $intProperty->save()) { return [ 'success' => true, 'message' => 'Данные успешно сохранены', ]; } else { return [ - 'error' => true, + 'error' => true, 'message' => 'Ошибка сохранения данных', ]; } @@ -161,7 +177,7 @@ public function findProperty($id) { $model = IntellectualProperty::findOne($id); - if(empty($model)) { + if (empty( $model )) { throw new NotFoundHttpException(); } return $model; diff --git a/frontend/models/IntellectualProperty.php b/frontend/models/IntellectualProperty.php index 0d652a1..9597c86 100644 --- a/frontend/models/IntellectualProperty.php +++ b/frontend/models/IntellectualProperty.php @@ -84,10 +84,10 @@ 'registration_date' => 'Дата реєстрації', 'contract' => 'Договір', 'type' => 'Тип', - 'author_role' => 'Роль автора', - 'percent' => 'Процент долі автора', - 'calculated' => 'Нараховано', - 'play_count' => 'К-ть відтворень', + 'author_role' => 'Роль автора', + 'percent' => 'Процент долі автора', + 'calculated' => 'Нараховано', + 'play_count' => 'К-ть відтворень', ]; } diff --git a/frontend/views/cabinet/sales.php b/frontend/views/cabinet/sales.php index cde7eb5..11dcf4c 100644 --- a/frontend/views/cabinet/sales.php +++ b/frontend/views/cabinet/sales.php @@ -1,5 +1,6 @@