Commit ff33498e211a617f7cbd80be65b8b003e40661cb
1 parent
2fd0fce6
VItaliy 04.12.2015
Showing
4 changed files
with
13 additions
and
12 deletions
Show diff stats
frontend/models/AccountsForm.php
| @@ -47,9 +47,10 @@ use Yii; | @@ -47,9 +47,10 @@ use Yii; | ||
| 47 | * @property string $firm_site | 47 | * @property string $firm_site |
| 48 | * @property string $company | 48 | * @property string $company |
| 49 | */ | 49 | */ |
| 50 | -class AccountsForm extends Model | 50 | +class AccountsForm extends Accounts |
| 51 | { | 51 | { |
| 52 | 52 | ||
| 53 | + | ||
| 53 | public $re_pass; | 54 | public $re_pass; |
| 54 | public $surname; | 55 | public $surname; |
| 55 | public $country_region; | 56 | public $country_region; |
| @@ -67,7 +68,7 @@ class AccountsForm extends Model | @@ -67,7 +68,7 @@ class AccountsForm extends Model | ||
| 67 | { | 68 | { |
| 68 | return [ | 69 | return [ |
| 69 | [['if_manager', 'margin_id', 'country', 'city', 'rating', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'], | 70 | [['if_manager', 'margin_id', 'country', 'city', 'rating', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'], |
| 70 | - [['company','email', 'pass', 'name','surname', 'phones',], 'required'], | 71 | + [['company','email', 'pass', 'name','surname', 'phones'], 'required'], |
| 71 | [['comment'], 'string'], | 72 | [['comment'], 'string'], |
| 72 | [['balance'], 'number'], | 73 | [['balance'], 'number'], |
| 73 | [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150], | 74 | [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150], |
frontend/models/PasswordResetRequestForm.php
| @@ -53,7 +53,7 @@ class PasswordResetRequestForm extends Model | @@ -53,7 +53,7 @@ class PasswordResetRequestForm extends Model | ||
| 53 | $form ['email'] = $user->email; | 53 | $form ['email'] = $user->email; |
| 54 | $form ['name'] = $user->name; | 54 | $form ['name'] = $user->name; |
| 55 | $form ['pass'] = $user->pass; | 55 | $form ['pass'] = $user->pass; |
| 56 | - die(var_dump(Emails::get('remide',$form,$form ['email']))); | 56 | + |
| 57 | return Emails::get('remide',$form,$form ['email']); | 57 | return Emails::get('remide',$form,$form ['email']); |
| 58 | 58 | ||
| 59 | } | 59 | } |
frontend/web/css/main.css
| @@ -395,7 +395,7 @@ div.required:after { content: " *"; | @@ -395,7 +395,7 @@ div.required:after { content: " *"; | ||
| 395 | width: 434px!important; | 395 | width: 434px!important; |
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | -.field-accounts-company{ | 398 | +.field-accountsform-company{ |
| 399 | display: none; | 399 | display: none; |
| 400 | } | 400 | } |
| 401 | 401 |
frontend/web/js/main.js
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | * Created by vitaliy on 23.11.15. | 2 | * Created by vitaliy on 23.11.15. |
| 3 | */ | 3 | */ |
| 4 | $(document).ready(function(){ | 4 | $(document).ready(function(){ |
| 5 | - $('#accounts-country').change(function(){ | 5 | + $('#accountsform-country').change(function(){ |
| 6 | var region_id = $(this).val(); | 6 | var region_id = $(this).val(); |
| 7 | if(region_id){ | 7 | if(region_id){ |
| 8 | $.get( "/ajax/get-city", {region_id:region_id}, function( data ) { | 8 | $.get( "/ajax/get-city", {region_id:region_id}, function( data ) { |
| @@ -18,9 +18,9 @@ $(document).ready(function(){ | @@ -18,9 +18,9 @@ $(document).ready(function(){ | ||
| 18 | $(this).addClass('active_button'); | 18 | $(this).addClass('active_button'); |
| 19 | $('#person').removeClass('active_button'); | 19 | $('#person').removeClass('active_button'); |
| 20 | 20 | ||
| 21 | - $('#accounts-company').attr('type', 'text').attr('placeholder', 'Компания').val(''); | ||
| 22 | - $('.field-accounts-company').css('display','block'); | ||
| 23 | - $('#accounts-is_firm').val('1'); | 21 | + $('#accountsform-company').attr('type', 'text').attr('placeholder', 'Компания').val(''); |
| 22 | + $('.field-accountsform-company').css('display','block'); | ||
| 23 | + $('#accountsform-is_firm').val('1'); | ||
| 24 | 24 | ||
| 25 | }); | 25 | }); |
| 26 | 26 | ||
| @@ -28,11 +28,11 @@ $(document).ready(function(){ | @@ -28,11 +28,11 @@ $(document).ready(function(){ | ||
| 28 | $('#company').removeClass('active_button'); | 28 | $('#company').removeClass('active_button'); |
| 29 | $(this).addClass('active_button'); | 29 | $(this).addClass('active_button'); |
| 30 | 30 | ||
| 31 | - $('.field-accounts-company').css('display','none'); | ||
| 32 | - $('#accounts-company').attr('type', 'hidden').val('Частное лицо'); | ||
| 33 | - $('#accounts-is_firm').val('0'); | 31 | + $('.field-accountsform-company').css('display','none'); |
| 32 | + $('#accountsform-company').attr('type', 'hidden').val('Частное лицо'); | ||
| 33 | + $('#accountsform-is_firm').val('0'); | ||
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | }); | 36 | }); |
| 37 | 37 | ||
| 38 | -}); | ||
| 39 | \ No newline at end of file | 38 | \ No newline at end of file |
| 39 | +}); |