VItaliy 04.12.2015

Administrator
1 parent 878c38e8
Showing 5 changed files with 181 additions and 158 deletions Show diff stats
common/models/Accounts.php
frontend/controllers/SiteController.php
frontend/models/AccountsForm.php
frontend/models/PasswordResetRequestForm.php
frontend/views/layouts/main.php
@@ -51,6 +51,9 @@ use yii\db\ActiveRecord;
 class Accounts extends ActiveRecord implements IdentityInterface
 {
  
+    /**
+     * @var
+     */
     public $re_pass;
     public $surname;
     public $country_region;
@@ -69,6 +72,9 @@ class Accounts extends ActiveRecord implements IdentityInterface
     }
  
  
+    /**
+     * @return bool
+     */
     public function beforeSave()
     {
         $this->dt = time();
@@ -84,7 +90,7 @@ class Accounts extends ActiveRecord implements IdentityInterface
     {
         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', 'phones',], 'required'],
             [['comment'], 'string'],
             [['balance'], 'number'],
             [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150],
@@ -95,9 +101,6 @@ class Accounts extends ActiveRecord implements IdentityInterface
             [['snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'company'], 'string', 'max' => 255],
             [['email'], 'unique'],
             [['email'], 'email'],
-            ['re_pass', 'compare', 'compareAttribute' => 'pass'],
-            ['verifyCode', 'captcha'],
-            ['dt', 'date', 'format' => 'Y.m.d'],
             [['rating','if_manager','set_manager_id','balance'], 'default', 'value' => '0'],
             [['is_active','margin_id','office_id','is_scribe'], 'default', 'value' => '1'],
             [['comment'], 'default', 'value' => 'Новый пользователь'],
@@ -2,6 +2,7 @@
 namespace frontend\controllers;
  
 use common\models\Accounts;
+use frontend\models\AccountsForm;
 use common\models\News;
 use common\models\Slider;
 use common\models\Team;
@@ -338,15 +339,21 @@ class SiteController extends Controller
  
         $this->layout = '/internal';
  
-        $model = new Accounts();
+        $model = new AccountsForm();
  
-        if ($model->load(Yii::$app->request->post()) ) {
+        if ($model->load(Yii::$app->request->post()) && $model->validate() ) {
  
-            $model->generateAuthKey();
  
-            $model->save();
  
-            if (Yii::$app->getUser()->login($model)) {
+            $accounts = new Accounts();
+
+            $accounts->load(Yii::$app->request->post());
+
+            $accounts->generateAuthKey();
+
+            $accounts->save();
+
+            if (Yii::$app->getUser()->login($accounts)) {
  
                 return $this->goHome();
  
@@ -369,13 +376,16 @@ class SiteController extends Controller
         $this->layout = '/internal';
  
         $model = new PasswordResetRequestForm();
+
         if ($model->load(Yii::$app->request->post()) && $model->validate()) {
  
             if ($model->sendEmail()) {
+
                 Yii::$app->session->setFlash('success', 'Для того, чтобы изменить пароль, перейдите по ссылке, которая придет Вам на email');
  
                 return $this->goHome();
             } else {
+                die('here2');
                 Yii::$app->session->setFlash('error', 'Пользователя с таким e-mail в базе не существует');
             }
         }
+<?php
+
+namespace frontend\models;
+
+use common\models\Accounts;
+use yii\base\Model;
+use Yii;
+/**
+ * This is the model class for table "w_accounts".
+ *
+ *
+ * @property integer $id
+ * @property integer $if_manager
+ * @property string $email
+ * @property string $auth_key
+ * @property string $pass
+ * @property integer $margin_id
+ * @property string $name
+ * @property string $phones
+ * @property integer $country
+ * @property integer $city
+ * @property string $address
+ * @property string $comment
+ * @property integer $rating
+ * @property string $dt
+ * @property integer $is_active
+ * @property integer $is_firm
+ * @property string $last_loginin
+ * @property string $firm_inn
+ * @property string $firm_bank
+ * @property double $balance
+ * @property integer $office_id
+ * @property integer $is_scribe
+ * @property integer $set_manager_id
+ * @property string $phones2
+ * @property string $phones3
+ * @property integer $car
+ * @property integer $mod
+ * @property string $snumb
+ * @property integer $deliveries
+ * @property integer $scode
+ * @property string $firm_ur_adr
+ * @property string $firm_fiz_adr
+ * @property string $firm_code_eg
+ * @property string $firm_rs
+ * @property string $firm_mfo
+ * @property string $firm_site
+ * @property string $company
+ */
+class AccountsForm extends Model
+{
+
+    public $re_pass;
+    public $surname;
+    public $country_region;
+    public $verifyCode;
+    public $auth_key;
+    public $password_hash;
+    public $password_reset_token;
+
+
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        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'],
+            [['comment'], 'string'],
+            [['balance'], 'number'],
+            [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150],
+            [['pass','re_pass'], 'string', 'max' => 30],
+            [['phones', 'phones2', 'phones3'], 'string', 'max' => 50],
+            [['address', 'firm_inn', 'firm_bank'], 'string', 'max' => 254],
+            [['last_loginin'], 'string', 'max' => 15],
+            [['snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'company'], 'string', 'max' => 255],
+            [['email'], 'unique'],
+            [['email'], 'email'],
+            ['re_pass', 'compare', 'compareAttribute' => 'pass'],
+            ['verifyCode', 'captcha'],
+            ['dt', 'date', 'format' => 'Y.m.d'],
+            [['rating','if_manager','set_manager_id','balance'], 'default', 'value' => '0'],
+            [['is_active','margin_id','office_id','is_scribe'], 'default', 'value' => '1'],
+            [['comment'], 'default', 'value' => 'Новый пользователь'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'if_manager' => 'Статус менеджера',
+            'email' => 'E-mail (Логин)',
+            'pass' => 'Пароль',
+            'margin_id' => 'Тип цены',
+            'name' => 'Имя',
+            'phones' => 'Телефоны',
+            'country' => Yii::t('app', 'Country'),
+            'city' =>'Город',
+            'address' => 'Адрес',
+            'comment' => 'Комментарий',
+            'rating' => Yii::t('app', 'Rating'),
+            'dt' =>'Дата регистрации',
+            'is_active' => 'Активный',
+            'is_firm' => 'Юридическое лицо',
+            'last_loginin' => Yii::t('app', 'Last Loginin'),
+            'firm_inn' => 'ИНН',
+            'firm_bank' => 'Банк',
+            'balance' => Yii::t('app', 'Balance'),
+            'office_id' => Yii::t('app', 'Office ID'),
+            'is_scribe' => 'Подписка',
+            'set_manager_id' => 'Персональный менеджер',
+            'phones2' => 'Телефоны 2',
+            'phones3' => 'Телефоны 3',
+            'car' => Yii::t('app', 'Car'),
+            'mod' => Yii::t('app', 'Mod'),
+            'snumb' => 'snumb',
+            'deliveries' => Yii::t('app', 'Deliveries'),
+            'scode' => 'Код в 1С',
+            'firm_ur_adr' => 'Юридический адрес',
+            'firm_fiz_adr' => 'Физический адрес',
+            'firm_code_eg' => 'Код ЭГ',
+            'firm_rs' => 'Расчётный счёт',
+            'firm_mfo' => 'МФО',
+            'firm_site' => 'Сайт',
+            'company' => 'Название фирмы',
+            'country_region' => 'Регион'
+        ];
+    }
+
+
+
+
+
+
+
+}
@@ -45,11 +45,15 @@ class PasswordResetRequestForm extends Model
                 $user->generatePasswordResetToken();
             }
  
+
+
             if ($user->save()) {
+
                 $form = array();
                 $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']);
  
             }
@@ -8,7 +8,7 @@ use yii\widgets\ActiveForm;
 use \yii\widgets\Menu;
 use \yii\helpers\Url;
 use common\models\Callback;
-use \common\models\Accounts;
+use \frontend\models\AccountsForm;
 use \yii\helpers\ArrayHelper;
 use \common\models\DicCities;
 use \common\models\Deliveries;
@@ -410,41 +410,41 @@ use \common\models\UserLoginForm;
                                 <div class="registration_for_person">
                                     <?php $form = ActiveForm::begin(['options' => ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => '/site/signup']); ?>
  
-                                    <?= $form->field(new Accounts(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
+                                    <?= $form->field(new AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?>
  
-                                    <?= $form->field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'),
                                         ['prompt' => 'Выберите область']
                                     )->label(false);
                                     ?>
  
-                                    <?= $form->field(new Accounts(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         [],
                                         ['prompt' => 'Выберите город']
                                     )->label(false);
                                     ?>
  
-                                    <?= $form->field(new Accounts(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
+                                    <?= $form->field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList(
                                         ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'),
                                         ['prompt' => 'Выберите тип перевозки']
                                     )->label(false);
                                     ?>
  
-                                    <?= $form->field(new Accounts(), 'verifyCode')->widget(Captcha::className(), [
+                                    <?= $form->field(new AccountsForm(), 'verifyCode')->widget(Captcha::className(), [
                                         'options'=>['placeholder'=>'Введите код' ],
                                         'template' => '<div>{input}</div><div class="row"><div class="col-lg-3">{image}</div></div>',
                                     ])->label(false); ?>
@@ -457,142 +457,6 @@ use \common\models\UserLoginForm;
                     </div>
  
  
-
-
-
-
-<!---->
-<!---->
-<!--                    <form action="" method="post" id="registration_form">-->
-<!--                        <h3>Заявка на регистрацию</h3>-->
-<!--                        <div class="purple_registration active_button" style=" border-radius:12px 0 0 0 " id="person"><p>Частное лицо</p></div><div id="company" class="purple_registration"><p>Оптовик</p></div>-->
-<!--                        <div class="registration_holder">-->
-<!---->
-<!--                            <div class="registration_for_person">-->
-<!---->
-<!---->
-<!--                                <input type="text" name="familyname" id="family_name" placeholder="Фамилия-->
-<!--                                " minlength="2" required=""><span class='star'>*</span>-->
-<!---->
-<!--                                <input name="name" id="name" placeholder="Имя" minlength="2" type="text" required=""><span class='star1'>*</span>-->
-<!--                                <input type="email" name="email" id="email_registration" placeholder="email" minlength="10" required=""><span class='star2'>*</span>-->
-<!---->
-<!--                                <input type="phone" name="telephone" id="telephone_registration" placeholder="Телефон" minlength="7" required=""><span class='star3'>*</span>-->
-<!--                                <input type="telephone" name="telephone" id="telephone_registration_add" placeholder="Телефон"><span class='star4'>*</span>-->
-<!--                                <p class="add_telephone" style="font-size: 14px;-->
-<!--    margin-right: 12px;-->
-<!--    margin-top: 10px;">добавить еще 1 телефон</p>-->
-<!--                                <p>Фактический адрес</p>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="area">-->
-<!--                                        <option value="" disabled="" selected="">Выберите область</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="city">-->
-<!--                                        <option value="" disabled="" selected="">Выберите город</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="steel1">-->
-<!--                                        <option value="" disabled="" selected="">Перевозчик</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!---->
-<!--                                <input type="text" placeholder="Введите код" id="code_input" required="4"><span class='star5'>*</span>-->
-<!--                                <div class="code_generate">-->
-<!--                                    <img src="/images/code_generator.png">-->
-<!--                                </div>-->
-<!--                                <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>-->
-<!---->
-<!---->
-<!--                            </div>-->
-<!--                            <div class="registration_for_company">-->
-<!---->
-<!--                                <input type="text" name="fullname" id="company_name" placeholder="Компания-->
-<!--                                " minlength="2" required="">-->
-<!--                                <input type="text" name="fullname" id="family_name" placeholder="Фамилия-->
-<!--                                " minlength="2" required=""><span class='star'>*</span>-->
-<!---->
-<!--                                <input type="" name="name" id="name" placeholder="Имя" minlength="2" required=""><span class='star1'>*</span>-->
-<!--                                <input type="email" name="email" id="email_registration" placeholder="email" minlength="10" required=""><span class='star3'>*</span>-->
-<!---->
-<!--                                <input type="telephone" name="telephone" id="telephone_registration" placeholder="Телефон" minlength="7" required=""><span class='star4'>*</span><span class='star6'>*</span>-->
-<!--                                <input type="telephone" name="telephone" id="telephone_registration_add1" placeholder="Телефон" style="display:none">-->
-<!--                                <p class="add_telephone1" style="font-size: 14px;-->
-<!--    margin-right: 12px;-->
-<!--    margin-top: 10px;">добавить еще 1 телефон</p>-->
-<!--                                <p>Фактический адрес</p>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="area">-->
-<!--                                        <option value="" disabled="" selected="">Выберите область</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="city">-->
-<!--                                        <option value="" disabled="" selected="">Выберите город</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!--                                <div class="selectize_item2">-->
-<!---->
-<!---->
-<!--                                    <select class="steel1">-->
-<!--                                        <option value="" disabled="" selected="">Перевозчик</option>-->
-<!--                                        <option value="2">Выбери меня!</option>-->
-<!--                                        <option value="3">Выбери меня!</option>-->
-<!--                                        <option value="5">Меня!</option>-->
-<!--                                        <option value="4">Меня</option>-->
-<!--                                    </select>-->
-<!---->
-<!--                                </div>-->
-<!---->
-<!--                                <input type="text" placeholder="Введите код" id="code_input" required='4'>-->
-<!--                                <div class="code_generate">-->
-<!--                                    <img src="/images/code_generator.png">-->
-<!--                                </div><span class='star5'>*</span>-->
-<!--                                <button class="purple" type="submit" value="Submit">Зарегистрироваться</button>-->
-<!---->
-<!---->
-<!--                            </div>-->
-<!--                        </div></form>-->
-
-
-
                 </div>
             </div>