Commit f7b97c9efdf5aeee868bd84cf5e51c7487470291
1 parent
8a551494
test
Showing
4 changed files
with
99 additions
and
73 deletions
Show diff stats
common/components/UserCheck.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | -namespace common\components; | 3 | + namespace common\components; |
| 4 | + | ||
| 5 | + use common\models\User; | ||
| 6 | + use common\models\UserInfo; | ||
| 7 | + use Yii; | ||
| 8 | + use yii\base\BootstrapInterface; | ||
| 9 | + use yii\db\Expression; | ||
| 10 | + | ||
| 11 | + class UserCheck implements BootstrapInterface | ||
| 12 | + { | ||
| 13 | + | ||
| 14 | + public function bootstrap($app) | ||
| 15 | + { | ||
| 16 | + \Yii::$app->on(\yii\base\Application::EVENT_BEFORE_REQUEST, function($event) { | ||
| 17 | + if(\Yii::$app->user->identity instanceof User) { | ||
| 18 | + $userInfo = \Yii::$app->user->identity->userInfo; | ||
| 19 | + if($userInfo instanceof UserInfo) { | ||
| 20 | + $expression = new Expression('NOW()'); | ||
| 21 | + $userInfo->date_visit = (new \yii\db\Query)->select($expression) | ||
| 22 | + ->scalar(); | ||
| 23 | + $userInfo->save(); | ||
| 24 | + } | ||
| 4 | 25 | ||
| 5 | -use common\models\User; | ||
| 6 | -use common\models\UserInfo; | ||
| 7 | -use Yii; | ||
| 8 | -use yii\base\BootstrapInterface; | ||
| 9 | -use yii\db\Expression; | ||
| 10 | - | ||
| 11 | - | ||
| 12 | -class UserCheck implements BootstrapInterface | ||
| 13 | -{ | ||
| 14 | - public function bootstrap($app){ | ||
| 15 | - \Yii::$app->on(\yii\base\Application::EVENT_BEFORE_REQUEST, function ($event) { | ||
| 16 | - | ||
| 17 | - if(\Yii::$app->user->identity instanceof User){ | ||
| 18 | - $userInfo = \Yii::$app->user->identity->userInfo; | ||
| 19 | - if($userInfo instanceof UserInfo){ | ||
| 20 | - $expression = new Expression('NOW()'); | ||
| 21 | - $userInfo->date_visit = (new \yii\db\Query)->select($expression)->scalar(); | ||
| 22 | - $userInfo->save(); | ||
| 23 | } | 26 | } |
| 24 | 27 | ||
| 28 | + }); | ||
| 29 | + return $app; | ||
| 30 | + } | ||
| 25 | 31 | ||
| 26 | - } | ||
| 27 | - | ||
| 28 | - }); | ||
| 29 | - return $app; | ||
| 30 | - } | ||
| 31 | - | ||
| 32 | -} | ||
| 33 | \ No newline at end of file | 32 | \ No newline at end of file |
| 33 | + } | ||
| 34 | \ No newline at end of file | 34 | \ No newline at end of file |
frontend/assets/AppAsset.php
| 1 | <?php | 1 | <?php |
| 2 | -/** | ||
| 3 | - * @link http://www.yiiframework.com/ | ||
| 4 | - * @copyright Copyright (c) 2008 Yii Software LLC | ||
| 5 | - * @license http://www.yiiframework.com/license/ | ||
| 6 | - */ | ||
| 7 | - | ||
| 8 | -namespace frontend\assets; | ||
| 9 | -use yii\web\AssetBundle; | ||
| 10 | - | ||
| 11 | -/** | ||
| 12 | - * @author Qiang Xue <qiang.xue@gmail.com> | ||
| 13 | - * @since 2.0 | ||
| 14 | - */ | ||
| 15 | -class AppAsset extends AssetBundle | ||
| 16 | -{ | ||
| 17 | - public $basePath = '@webroot'; | ||
| 18 | - public $baseUrl = '@web'; | ||
| 19 | - public $css = [ | ||
| 20 | - '/css/style.css', | ||
| 21 | - '/admin/css/flags32.css', | ||
| 22 | - 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', | ||
| 23 | - '/css/owl.carousel.css' | ||
| 24 | - ]; | ||
| 25 | - public $js = [ | ||
| 26 | - '/js/script.js', | ||
| 27 | - //'http://maps.google.com/maps/api/js?sensor=false', | ||
| 28 | - '/js/markerclusterer.js', | ||
| 29 | - '/js/jquery.scrollbox.min.js', | ||
| 30 | - '/js/slider.js', | ||
| 31 | - '/js/jquery.rating.js', | ||
| 32 | - '/admin/js/option.js', | ||
| 33 | -// '/js/jmousewhell.js', | ||
| 34 | - '/js/autoresize.jquery.js', | ||
| 35 | - '/js/jquery.MultiFile.js', | ||
| 36 | - '/js/myGallery_min.js', | ||
| 37 | - '/js/fieldWidget.js', | ||
| 38 | - '/js/owl.carousel.min.js', | ||
| 39 | - ]; | ||
| 40 | - public $depends = [ | ||
| 41 | - 'yii\web\YiiAsset', | ||
| 42 | - 'yii\web\JqueryAsset', | ||
| 43 | - 'frontend\assets\FancyboxAsset', | ||
| 44 | - ]; | ||
| 45 | - public $jsOptions = array( | ||
| 46 | - 'position' => \yii\web\View::POS_HEAD | ||
| 47 | - ); | ||
| 48 | -} | 2 | + /** |
| 3 | + * @link http://www.yiiframework.com/ | ||
| 4 | + * @copyright Copyright (c) 2008 Yii Software LLC | ||
| 5 | + * @license http://www.yiiframework.com/license/ | ||
| 6 | + */ | ||
| 7 | + | ||
| 8 | + namespace frontend\assets; | ||
| 9 | + | ||
| 10 | + use yii\web\AssetBundle; | ||
| 11 | + | ||
| 12 | + /** | ||
| 13 | + * @author Qiang Xue <qiang.xue@gmail.com> | ||
| 14 | + * @since 2.0 | ||
| 15 | + */ | ||
| 16 | + class AppAsset extends AssetBundle | ||
| 17 | + { | ||
| 18 | + | ||
| 19 | + public $basePath = '@webroot'; | ||
| 20 | + | ||
| 21 | + public $baseUrl = '@web'; | ||
| 22 | + | ||
| 23 | + public $css = [ | ||
| 24 | + '/css/style.css', | ||
| 25 | + '/admin/css/flags32.css', | ||
| 26 | + 'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin', | ||
| 27 | + '/css/owl.carousel.css', | ||
| 28 | + ]; | ||
| 29 | + | ||
| 30 | + public $js = [ | ||
| 31 | + '/js/script.js', | ||
| 32 | + //'http://maps.google.com/maps/api/js?sensor=false', | ||
| 33 | + '/js/markerclusterer.js', | ||
| 34 | + '/js/jquery.scrollbox.min.js', | ||
| 35 | + '/js/slider.js', | ||
| 36 | + '/js/jquery.rating.js', | ||
| 37 | + '/admin/js/option.js', | ||
| 38 | + '/js/forms.js', | ||
| 39 | + // '/js/jmousewhell.js', | ||
| 40 | + '/js/autoresize.jquery.js', | ||
| 41 | + '/js/jquery.MultiFile.js', | ||
| 42 | + '/js/myGallery_min.js', | ||
| 43 | + '/js/fieldWidget.js', | ||
| 44 | + '/js/owl.carousel.min.js', | ||
| 45 | + ]; | ||
| 46 | + | ||
| 47 | + public $depends = [ | ||
| 48 | + 'yii\web\YiiAsset', | ||
| 49 | + 'yii\web\JqueryAsset', | ||
| 50 | + 'frontend\assets\FancyboxAsset', | ||
| 51 | + ]; | ||
| 52 | + | ||
| 53 | + public $jsOptions = array( | ||
| 54 | + 'position' => \yii\web\View::POS_HEAD, | ||
| 55 | + ); | ||
| 56 | + } |
frontend/controllers/CompanyController.php
| @@ -418,6 +418,15 @@ | @@ -418,6 +418,15 @@ | ||
| 418 | if(!empty(\Yii::$app->request->get('type'))) { | 418 | if(!empty(\Yii::$app->request->get('type'))) { |
| 419 | $action->controller->view->params['type'] = \Yii::$app->request->get('type'); | 419 | $action->controller->view->params['type'] = \Yii::$app->request->get('type'); |
| 420 | } | 420 | } |
| 421 | + if(!empty(\Yii::$app->request->get('company_id'))) { | ||
| 422 | + $user = User::findOne(\Yii::$app->request->get('company_id')); | ||
| 423 | + if(!empty($user) && $user->type == 1) { | ||
| 424 | + $queryParams = \Yii::$app->request->queryParams; | ||
| 425 | + unset($queryParams['company_id']); | ||
| 426 | + $queryParams['performer_id'] = $user->id; | ||
| 427 | + return $this->redirect(array_merge(['performer/'.$action->id], $queryParams)); | ||
| 428 | + } | ||
| 429 | + } | ||
| 421 | return parent::beforeAction($action); | 430 | return parent::beforeAction($action); |
| 422 | } | 431 | } |
| 423 | } | 432 | } |
frontend/controllers/PerformerController.php
| @@ -331,6 +331,15 @@ | @@ -331,6 +331,15 @@ | ||
| 331 | if(!empty( \Yii::$app->request->get('type') )) { | 331 | if(!empty( \Yii::$app->request->get('type') )) { |
| 332 | $action->controller->view->params[ 'type' ] = \Yii::$app->request->get('type'); | 332 | $action->controller->view->params[ 'type' ] = \Yii::$app->request->get('type'); |
| 333 | } | 333 | } |
| 334 | + if(!empty(\Yii::$app->request->get('performer_id'))) { | ||
| 335 | + $user = User::findOne(\Yii::$app->request->get('performer_id')); | ||
| 336 | + if(!empty($user) && $user->type == 2) { | ||
| 337 | + $queryParams = \Yii::$app->request->queryParams; | ||
| 338 | + unset($queryParams['performer_id']); | ||
| 339 | + $queryParams['company_id'] = $user->id; | ||
| 340 | + return $this->redirect(array_merge(['company/'.$action->id], $queryParams)); | ||
| 341 | + } | ||
| 342 | + } | ||
| 334 | return parent::beforeAction($action); | 343 | return parent::beforeAction($action); |
| 335 | } | 344 | } |
| 336 | } | 345 | } |