diff --git a/composer.json b/composer.json index a7dbfb5..69d10fe 100755 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "phpoffice/phpexcel": "^1.8", "bower-asset/amcharts": "@dev", "bower-asset/pnotify": "@dev", - "kartik-v/yii2-widget-colorinput": "*" + "kartik-v/yii2-widget-colorinput": "*", + "kartik-v/yii2-widget-datepicker": "@dev" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/composer.lock b/composer.lock index 0a3b5d6..618ff2c 100755 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "482c96d17c08496f9d67ccef1d071cc3", - "content-hash": "ea8f4f552cdc9b0c7ac2eeb4ae9afa66", + "hash": "b18802ddb055188c55f12e121f5e14cf", + "content-hash": "74adfbddeb0bd9b6f951a699924afa86", "packages": [ { "name": "2amigos/yii2-tinymce-widget", @@ -1388,6 +1388,60 @@ "time": "2016-01-14 11:15:49" }, { + "name": "kartik-v/yii2-widget-datepicker", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/kartik-v/yii2-widget-datepicker.git", + "reference": "9110ecce9deb59dc116fe6c3dd6df5d7eb439a3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/9110ecce9deb59dc116fe6c3dd6df5d7eb439a3c", + "reference": "9110ecce9deb59dc116fe6c3dd6df5d7eb439a3c", + "shasum": "" + }, + "require": { + "kartik-v/yii2-krajee-base": "~1.7" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-4": { + "kartik\\date\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kartik Visweswaran", + "email": "kartikv2@gmail.com", + "homepage": "http://www.krajee.com/" + } + ], + "description": "Enhanced Yii2 wrapper for the bootstrap datepicker plugin (sub repo split from yii2-widgets).", + "homepage": "https://github.com/kartik-v/yii2-widget-datepicker", + "keywords": [ + "date", + "extension", + "form", + "jquery", + "picker", + "plugin", + "select2", + "widget", + "yii2" + ], + "time": "2017-04-01 16:03:50" + }, + { "name": "kartik-v/yii2-widget-fileinput", "version": "v1.0.5", "source": { @@ -4825,7 +4879,8 @@ "bower-asset/amcharts-stock": 20, "kartik-v/yii2-widget-select2": 20, "bower-asset/amcharts": 20, - "bower-asset/pnotify": 20 + "bower-asset/pnotify": 20, + "kartik-v/yii2-widget-datepicker": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/frontend/controllers/AccountController.php b/frontend/controllers/AccountController.php index d8aacea..1a035e5 100644 --- a/frontend/controllers/AccountController.php +++ b/frontend/controllers/AccountController.php @@ -72,9 +72,11 @@ public function actionAccount() { + $user = \Yii::$app->user->identity; return $this->render( 'account', [ + 'userModel' => $user, 'passwordModel' => new PasswordForm(), ] ); @@ -87,7 +89,7 @@ */ $model = new PasswordForm(); $modeluser = \Yii::$app->user->identity; - + if ($model->load(\Yii::$app->request->post())) { if ($model->validate()) { $modeluser->setPassword($model->newpass); @@ -97,6 +99,7 @@ return $this->render( 'account', [ + 'userModel' => $modeluser, 'passwordModel' => $model, ] ); @@ -105,17 +108,42 @@ return $this->render( 'account', [ + 'userModel' => $modeluser, 'passwordModel' => $model, ] ); } - } else { - return $this->render( - 'account', - [ - 'passwordModel' => $model, - ] - ); } + return $this->render( + 'account', + [ + 'userModel' => $modeluser, + 'passwordModel' => $model, + ] + ); + + } + + public function actionChangeData() + { + /** + * @var Customer $model + */ + $model = \Yii::$app->user->identity; + + if ($model->load(\Yii::$app->request->post())) { + // VarDumper::dump($model, 10, 1);die(); + $model->markAttributeDirty('birthday'); + if ($model->save()) { + return $this->redirect([ 'index' ]); + } + } + return $this->render( + 'account', + [ + 'userModel' => $model, + 'passwordModel' => new PasswordForm(), + ] + ); } } \ No newline at end of file diff --git a/frontend/views/account/account.php b/frontend/views/account/account.php index b60d7d5..6262255 100644 --- a/frontend/views/account/account.php +++ b/frontend/views/account/account.php @@ -1,6 +1,8 @@ params[ 'breadcrumbs' ][] = \Yii::t('app', 'Мой аккаунт'); @@ -72,87 +75,79 @@ _________________________________________________________ -->

Персональные данные

- -
-
-
-
- - -
-
-
-
- - -
-
+ + [ 'account/change-data' ], + ] + ) ?> +
+
+ field($userModel, 'name') ?>
- - -
-
-
- - -
-
-
-
- - -
-
+
+ field($userModel, 'address') + ->textInput() ?>
- - -
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
- -
-
- - -
-
-
-
- - -
-
-
- - -
- +
+ + +
+
+ field($userModel, 'city') + ->textInput() ?>
- - +
+ field($userModel, 'gender') + ->dropDownList( + [ + 1 => \Yii::t('app', 'Муж.'), + 2 => \Yii::t('app', 'Жен.'), + ], + [ + 'prompt' => \Yii::t('app', 'Пол'), + ] + ) ?> +
+
+ field($userModel, 'email') + ->textInput() ?> +
+ +
+
+ +
+ field($userModel, 'phone') + ->textInput() ?> + +
+
+ field($userModel, 'birthDate') + ->widget( + DatePicker::className(), + [ + 'options' => [ + 'placeholder' => \Yii::t('app', 'Дата рождения ...'), + ], + 'pluginOptions' => [ + 'autoclose' => true, + 'format' => 'dd.mm.yyyy', + ], + ] + ) ?> +
+
+ Сохранить изменения', + [ + 'class' => 'btn btn-template-main', + ] + ) ?> +
+
+ +
-- libgit2 0.21.4