Commit 23ef7292eecf9e1329940dc6c35c1ff657f6a198
1 parent
cd14a13d
14.09.16
Showing
7 changed files
with
10 additions
and
58 deletions
Show diff stats
frontend/controllers/IamController.php
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace frontend\controllers; | 3 | namespace frontend\controllers; |
| 4 | 4 | ||
| 5 | +use common\models\Customer; | ||
| 5 | use common\models\ShareSearch; | 6 | use common\models\ShareSearch; |
| 6 | use Yii; | 7 | use Yii; |
| 7 | use yii\web\Controller; | 8 | use yii\web\Controller; |
| @@ -54,7 +55,7 @@ class IamController extends Controller | @@ -54,7 +55,7 @@ class IamController extends Controller | ||
| 54 | { | 55 | { |
| 55 | 56 | ||
| 56 | 57 | ||
| 57 | - $model = User::findOne(Yii::$app->user->id); | 58 | + $model = Customer::findOne(Yii::$app->user->id); |
| 58 | 59 | ||
| 59 | $model->scenario = 'edit_'.Yii::$app->user->identity->role; | 60 | $model->scenario = 'edit_'.Yii::$app->user->identity->role; |
| 60 | 61 |
frontend/views/iam/1person.php
| @@ -10,14 +10,7 @@ $this->title = 'Профиль'; | @@ -10,14 +10,7 @@ $this->title = 'Профиль'; | ||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | ?> | 12 | ?> |
| 13 | -<nav class="bread-crumbs"> | ||
| 14 | - <?= Breadcrumbs::widget([ | ||
| 15 | - 'links' => [ | ||
| 16 | - ['label'=>'Мой кабинет'], | ||
| 17 | - ], | ||
| 18 | - ]) ?> | ||
| 19 | - <div class="both"></div> | ||
| 20 | -</nav> | 13 | + |
| 21 | 14 | ||
| 22 | <div class="layout"> | 15 | <div class="layout"> |
| 23 | <div class="leftbar"> | 16 | <div class="leftbar"> |
frontend/views/iam/edit_customer.php
| @@ -39,7 +39,7 @@ $('#user-phone').mask('(000) 000-0000'); | @@ -39,7 +39,7 @@ $('#user-phone').mask('(000) 000-0000'); | ||
| 39 | 39 | ||
| 40 | <label class="control-label">Дата рождения</label> | 40 | <label class="control-label">Дата рождения</label> |
| 41 | <div class="form-inline"> | 41 | <div class="form-inline"> |
| 42 | - <?php$day = []; | 42 | + <?php $day = []; |
| 43 | for($i=1;$i<=31;$i++){ | 43 | for($i=1;$i<=31;$i++){ |
| 44 | $day[$i] = $i; | 44 | $day[$i] = $i; |
| 45 | } | 45 | } |
| @@ -52,7 +52,7 @@ $('#user-phone').mask('(000) 000-0000'); | @@ -52,7 +52,7 @@ $('#user-phone').mask('(000) 000-0000'); | ||
| 52 | ?> | 52 | ?> |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | - <?php$year = []; | 55 | + <?php $year = []; |
| 56 | for($i=date('Y');$i>=1920;$i--){ | 56 | for($i=date('Y');$i>=1920;$i--){ |
| 57 | $year[$i] = $i; | 57 | $year[$i] = $i; |
| 58 | } | 58 | } |
frontend/views/iam/edit_person.php
| @@ -18,12 +18,7 @@ $this->registerJs(" | @@ -18,12 +18,7 @@ $this->registerJs(" | ||
| 18 | $('#user-phone').mask('(000) 000-0000'); | 18 | $('#user-phone').mask('(000) 000-0000'); |
| 19 | ", View::POS_READY, 'mask'); | 19 | ", View::POS_READY, 'mask'); |
| 20 | ?> | 20 | ?> |
| 21 | -<nav class="bread-crumbs"> | ||
| 22 | - <?= Breadcrumbs::widget([ | ||
| 23 | - 'links' => ['Мой кабинет'], | ||
| 24 | - ]) ?> | ||
| 25 | - <div class="both"></div> | ||
| 26 | -</nav> | 21 | + |
| 27 | <div class="lay_title"> | 22 | <div class="lay_title"> |
| 28 | <h1 class="uppercase center">Редактировать личные данные</h1> | 23 | <h1 class="uppercase center">Редактировать личные данные</h1> |
| 29 | </div> | 24 | </div> |
| @@ -56,29 +51,7 @@ $('#user-phone').mask('(000) 000-0000'); | @@ -56,29 +51,7 @@ $('#user-phone').mask('(000) 000-0000'); | ||
| 56 | <?= $form->field($model, 'surname') ?> | 51 | <?= $form->field($model, 'surname') ?> |
| 57 | 52 | ||
| 58 | <label class="control-label">Дата рождения</label> | 53 | <label class="control-label">Дата рождения</label> |
| 59 | - <div class="form-inline"> | ||
| 60 | - <?php$day = []; | ||
| 61 | - for($i=1;$i<=31;$i++){ | ||
| 62 | - $day[$i] = $i; | ||
| 63 | - } | ||
| 64 | - | ||
| 65 | - echo $form->field($model, 'birth_day')->dropDownList($day,['prompt'=>'День'])->label(false); | ||
| 66 | - ?> | ||
| 67 | - | ||
| 68 | - <?php | ||
| 69 | - echo $form->field($model, 'birth_mouth')->dropDownList(['1'=>'Январь','2'=>'Февраль','3'=>'Март','4'=>'Апрель','5'=>'Май','6'=>'Июнь','7'=>'Июль','8'=>'Август','9'=>'Сентябрь','10'=>'Октябрь','11'=>'Ноябрь','12'=>'Декабрь'],['prompt'=>'Месяц'])->label(false); | ||
| 70 | - ?> | ||
| 71 | - | ||
| 72 | - | ||
| 73 | - <?php$year = []; | ||
| 74 | - for($i=date('Y');$i>=1920;$i--){ | ||
| 75 | - $year[$i] = $i; | ||
| 76 | - } | ||
| 77 | - | ||
| 78 | - echo $form->field($model, 'birth_year')->dropDownList($year,['prompt'=>'Год'])->label(false); | ||
| 79 | - ?> | ||
| 80 | - <div class="both"></div> | ||
| 81 | - </div><div class="both"></div> | 54 | + <div class="both"></div> |
| 82 | <?= $form->field($model, 'phone') ?> | 55 | <?= $form->field($model, 'phone') ?> |
| 83 | 56 | ||
| 84 | <?=$form->field($model, 'sex')->dropDownList(['мужской' => 'мужской', 'женский' => 'женский'],['prompt'=>'...']); ?> | 57 | <?=$form->field($model, 'sex')->dropDownList(['мужской' => 'мужской', 'женский' => 'женский'],['prompt'=>'...']); ?> |
frontend/views/iam/myorders.php
| @@ -19,12 +19,7 @@ $this->registerJs(" | @@ -19,12 +19,7 @@ $this->registerJs(" | ||
| 19 | 19 | ||
| 20 | ", View::POS_READY, 'orders_view'); | 20 | ", View::POS_READY, 'orders_view'); |
| 21 | ?> | 21 | ?> |
| 22 | - <nav class="bread-crumbs"> | ||
| 23 | - <?= Breadcrumbs::widget([ | ||
| 24 | - 'links' => ['Мой кабинет'], | ||
| 25 | - ]) ?> | ||
| 26 | - <div class="both"></div> | ||
| 27 | - </nav> | 22 | + |
| 28 | <div class="lay_title"> | 23 | <div class="lay_title"> |
| 29 | <h1 class="uppercase center">Мои заказы</h1> | 24 | <h1 class="uppercase center">Мои заказы</h1> |
| 30 | </div> | 25 | </div> |
frontend/views/iam/person.php
| @@ -9,12 +9,7 @@ use yii\widgets\Breadcrumbs; | @@ -9,12 +9,7 @@ use yii\widgets\Breadcrumbs; | ||
| 9 | $this->title = 'Профиль'; | 9 | $this->title = 'Профиль'; |
| 10 | ?> | 10 | ?> |
| 11 | 11 | ||
| 12 | - <nav class="bread-crumbs"> | ||
| 13 | - <?= Breadcrumbs::widget([ | ||
| 14 | - 'links' => ['Мой кабинет'], | ||
| 15 | - ]) ?> | ||
| 16 | - <div class="both"></div> | ||
| 17 | - </nav> | 12 | + |
| 18 | <div class="lay_title"> | 13 | <div class="lay_title"> |
| 19 | <h1 class="uppercase center">Личные данные</h1> | 14 | <h1 class="uppercase center">Личные данные</h1> |
| 20 | </div> | 15 | </div> |
frontend/views/iam/share.php
| @@ -18,12 +18,7 @@ $this->registerJs(" | @@ -18,12 +18,7 @@ $this->registerJs(" | ||
| 18 | 18 | ||
| 19 | ", View::POS_READY, 'orders_view'); | 19 | ", View::POS_READY, 'orders_view'); |
| 20 | ?> | 20 | ?> |
| 21 | -<nav class="bread-crumbs"> | ||
| 22 | - <?= Breadcrumbs::widget([ | ||
| 23 | - 'links' => ['Мой кабинет'], | ||
| 24 | - ]) ?> | ||
| 25 | - <div class="both"></div> | ||
| 26 | -</nav> | 21 | + |
| 27 | <div class="lay_title"> | 22 | <div class="lay_title"> |
| 28 | <h1 class="uppercase center">Мои закладки</h1> | 23 | <h1 class="uppercase center">Мои закладки</h1> |
| 29 | </div> | 24 | </div> |