diff --git a/frontend/models/AccountsForm.php b/frontend/models/AccountsForm.php index a9ec146..81d1661 100644 --- a/frontend/models/AccountsForm.php +++ b/frontend/models/AccountsForm.php @@ -47,9 +47,10 @@ use Yii; * @property string $firm_site * @property string $company */ -class AccountsForm extends Model +class AccountsForm extends Accounts { + public $re_pass; public $surname; public $country_region; @@ -67,7 +68,7 @@ class AccountsForm extends Model { return [ [['if_manager', 'margin_id', 'country', 'city', 'rating', 'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'], - [['company','email', 'pass', 'name','surname', 'phones',], 'required'], + [['company','email', 'pass', 'name','surname', 'phones'], 'required'], [['comment'], 'string'], [['balance'], 'number'], [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150], diff --git a/frontend/models/PasswordResetRequestForm.php b/frontend/models/PasswordResetRequestForm.php index 01a021a..e893e67 100755 --- a/frontend/models/PasswordResetRequestForm.php +++ b/frontend/models/PasswordResetRequestForm.php @@ -53,7 +53,7 @@ class PasswordResetRequestForm extends Model $form ['email'] = $user->email; $form ['name'] = $user->name; $form ['pass'] = $user->pass; - die(var_dump(Emails::get('remide',$form,$form ['email']))); + return Emails::get('remide',$form,$form ['email']); } diff --git a/frontend/web/css/main.css b/frontend/web/css/main.css index 3a2cdd3..0e1d42b 100755 --- a/frontend/web/css/main.css +++ b/frontend/web/css/main.css @@ -395,7 +395,7 @@ div.required:after { content: " *"; width: 434px!important; } -.field-accounts-company{ +.field-accountsform-company{ display: none; } diff --git a/frontend/web/js/main.js b/frontend/web/js/main.js index 4ab9141..237f7aa 100644 --- a/frontend/web/js/main.js +++ b/frontend/web/js/main.js @@ -2,7 +2,7 @@ * Created by vitaliy on 23.11.15. */ $(document).ready(function(){ - $('#accounts-country').change(function(){ + $('#accountsform-country').change(function(){ var region_id = $(this).val(); if(region_id){ $.get( "/ajax/get-city", {region_id:region_id}, function( data ) { @@ -18,9 +18,9 @@ $(document).ready(function(){ $(this).addClass('active_button'); $('#person').removeClass('active_button'); - $('#accounts-company').attr('type', 'text').attr('placeholder', 'Компания').val(''); - $('.field-accounts-company').css('display','block'); - $('#accounts-is_firm').val('1'); + $('#accountsform-company').attr('type', 'text').attr('placeholder', 'Компания').val(''); + $('.field-accountsform-company').css('display','block'); + $('#accountsform-is_firm').val('1'); }); @@ -28,11 +28,11 @@ $(document).ready(function(){ $('#company').removeClass('active_button'); $(this).addClass('active_button'); - $('.field-accounts-company').css('display','none'); - $('#accounts-company').attr('type', 'hidden').val('Частное лицо'); - $('#accounts-is_firm').val('0'); + $('.field-accountsform-company').css('display','none'); + $('#accountsform-company').attr('type', 'hidden').val('Частное лицо'); + $('#accountsform-is_firm').val('0'); }); -}); \ No newline at end of file +}); -- libgit2 0.21.4