Commit b24bc5b0d05fe1a0bb86280170c5e68c90c8af82

Authored by Administrator
1 parent f120f504

big commti

console/controllers/SiteMapController.php
@@ -74,9 +74,11 @@ class SiteMapController extends Controller @@ -74,9 +74,11 @@ class SiteMapController extends Controller
74 return Articles::find()->all(); 74 return Articles::find()->all();
75 } 75 }
76 76
77 - public function getBrands($category){  
78 77
79 - return $category->brands; 78 +
  79 + public function getBrands(){
  80 + return $this->getProducts()->select('brand.*')->joinWith('brand')->groupBy('brand.brand_id');
  81 +
80 } 82 }
81 83
82 /** 84 /**
frontend/models/SignupForm.php
1 -<?php  
2 -namespace frontend\models;  
3 -  
4 -use common\models\Customer;  
5 -use yii\base\Model;  
6 -use Yii;  
7 -  
8 -/**  
9 - * Signup form  
10 - */  
11 -class SignupForm extends Model  
12 -{  
13 - public $username;  
14 - public $email;  
15 - public $password;  
16 - public $verifyCode;  
17 - public $password_repeat;  
18 - public $surname;  
19 - public $phone;  
20 -  
21 - /**  
22 - * @inheritdoc  
23 - */  
24 - public function rules()  
25 - {  
26 - return [  
27 - ['username', 'filter', 'filter' => 'trim'],  
28 - ['username', 'required'],  
29 - [['username','surname'], 'string', 'min' => 2, 'max' => 255],  
30 -  
31 - ['email', 'filter', 'filter' => 'trim'],  
32 - ['email', 'required'],  
33 - ['email', 'email'],  
34 - [['email','phone'], 'string', 'max' => 255],  
35 - ['email', 'unique', 'targetClass' => '\common\models\Customer', 'message' => Yii::t('app','message',[  
36 - 'field' => 'Email'  
37 - ])],  
38 -  
39 - [['phone'], 'unique', 'targetClass' => '\common\models\Customer', 'message' => Yii::t('app','message',[  
40 - 'field' => 'Телефон'  
41 - ])],  
42 -  
43 - ['password_repeat', 'required'],  
44 - ['password_repeat', 'compare', 'compareAttribute'=>'password', 'message'=> Yii::t('app', 'message_match_password') ],  
45 -  
46 - ['password', 'required'],  
47 - ['password', 'string', 'min' => 6],  
48 - ];  
49 - }  
50 -  
51 -  
52 -  
53 -  
54 -  
55 - /**  
56 - * Signs user up.  
57 - *  
58 - * @return Customer|null the saved model or null if saving fails  
59 - */  
60 - public function signup()  
61 - {  
62 -  
63 - if (!$this->validate()) {  
64 - return null;  
65 - }  
66 -  
67 - $user = new Customer();  
68 - $user->username = $this->username;  
69 - $user->surname = $this->surname;  
70 - $user->email = $this->email;  
71 - $user->phone = $this->phone;  
72 - $user->setPassword($this->password);  
73 - $user->generateAuthKey();  
74 - $user->validate();  
75 - return $user->save() ? $user : null;  
76 - }  
77 -} 1 +<?php
  2 +namespace frontend\models;
  3 +
  4 +use common\models\Customer;
  5 +use yii\base\Model;
  6 +use Yii;
  7 +
  8 +/**
  9 + * Signup form
  10 + */
  11 +class SignupForm extends Model
  12 +{
  13 + public $username;
  14 + public $email;
  15 + public $password;
  16 + public $verifyCode;
  17 + public $password_repeat;
  18 + public $surname;
  19 + public $phone;
  20 +
  21 + /**
  22 + * @inheritdoc
  23 + */
  24 + public function rules()
  25 + {
  26 + return [
  27 + ['username', 'filter', 'filter' => 'trim'],
  28 + ['username', 'required'],
  29 + [['username','surname'], 'string', 'min' => 2, 'max' => 255],
  30 +
  31 + ['email', 'filter', 'filter' => 'trim'],
  32 + ['email', 'required'],
  33 + ['email', 'email'],
  34 + [['email','phone'], 'string', 'max' => 255],
  35 + ['email', 'unique', 'targetClass' => '\common\models\Customer', 'message' => Yii::t('app','message',[
  36 + 'field' => 'Email'
  37 + ])],
  38 +
  39 + [['phone'], 'unique', 'targetClass' => '\common\models\Customer', 'message' => Yii::t('app','message',[
  40 + 'field' => 'Телефон'
  41 + ])],
  42 +
  43 + ['password_repeat', 'required'],
  44 + ['password_repeat', 'compare', 'compareAttribute'=>'password', 'message'=> Yii::t('app', 'message_match_password') ],
  45 +
  46 + ['password', 'required'],
  47 + ['password', 'string', 'min' => 6],
  48 + ];
  49 + }
  50 +
  51 +
  52 +
  53 +
  54 +
  55 + /**
  56 + * Signs user up.
  57 + *
  58 + * @return Customer|null the saved model or null if saving fails
  59 + */
  60 + public function signup()
  61 + {
  62 +
  63 + if (!$this->validate()) {
  64 + return null;
  65 + }
  66 +
  67 + $user = new Customer();
  68 + $user->username = $this->username;
  69 + $user->surname = $this->surname;
  70 + $user->email = $this->email;
  71 + $user->phone = $this->phone;
  72 + $user->setPassword($this->password);
  73 + $user->generateAuthKey();
  74 + $user->validate();
  75 + return $user->save() ? $user : null;
  76 + }
  77 +}