From b24bc5b0d05fe1a0bb86280170c5e68c90c8af82 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Mon, 5 Sep 2016 14:28:14 +0300
Subject: [PATCH] big commti

---
 console/controllers/SiteMapController.php |   6 ++++--
 frontend/models/SignupForm.php            | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
 2 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/console/controllers/SiteMapController.php b/console/controllers/SiteMapController.php
index 9b72340..5c60336 100644
--- a/console/controllers/SiteMapController.php
+++ b/console/controllers/SiteMapController.php
@@ -74,9 +74,11 @@ class SiteMapController extends Controller
         return Articles::find()->all();
     }
 
-    public function getBrands($category){
 
-        return $category->brands;
+
+    public function getBrands(){
+        return $this->getProducts()->select('brand.*')->joinWith('brand')->groupBy('brand.brand_id');
+
     }
 
     /**
diff --git a/frontend/models/SignupForm.php b/frontend/models/SignupForm.php
index a65ff88..aac69bc 100755
--- a/frontend/models/SignupForm.php
+++ b/frontend/models/SignupForm.php
@@ -1,77 +1,77 @@
-<?php
-namespace frontend\models;
-
-use common\models\Customer;
-use yii\base\Model;
-use Yii;
-
-/**
- * Signup form
- */
-class SignupForm extends Model
-{
-    public $username;
-    public $email;
-    public $password;
-    public $verifyCode;
-    public $password_repeat;
-    public $surname;
-    public $phone;
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            ['username', 'filter', 'filter' => 'trim'],
-            ['username', 'required'],
-            [['username','surname'], 'string', 'min' => 2, 'max' => 255],
-
-            ['email', 'filter', 'filter' => 'trim'],
-            ['email', 'required'],
-            ['email', 'email'],
-            [['email','phone'], 'string', 'max' => 255],
-            ['email', 'unique', 'targetClass' => '\common\models\Customer', 'message' =>  Yii::t('app','message',[
-                'field' => 'Email'
-            ])],
-
-            [['phone'], 'unique', 'targetClass' => '\common\models\Customer', 'message' =>  Yii::t('app','message',[
-                'field' => 'Телефон'
-            ])],
-
-            ['password_repeat', 'required'],
-            ['password_repeat', 'compare', 'compareAttribute'=>'password', 'message'=> Yii::t('app', 'message_match_password') ],
-
-            ['password', 'required'],
-            ['password', 'string', 'min' => 6],
-        ];
-    }
-
-
-
-
-
-    /**
-     * Signs user up.
-     *
-     * @return Customer|null the saved model or null if saving fails
-     */
-    public function signup()
-    {
-
-        if (!$this->validate()) {
-            return null;
-        }
-        
-        $user = new Customer();
-        $user->username = $this->username;
-        $user->surname = $this->surname;
-        $user->email = $this->email;
-        $user->phone = $this->phone;
-        $user->setPassword($this->password);
-        $user->generateAuthKey();
-        $user->validate();
-        return $user->save() ? $user : null;
-    }
-}
+<?php
+namespace frontend\models;
+
+use common\models\Customer;
+use yii\base\Model;
+use Yii;
+
+/**
+ * Signup form
+ */
+class SignupForm extends Model
+{
+    public $username;
+    public $email;
+    public $password;
+    public $verifyCode;
+    public $password_repeat;
+    public $surname;
+    public $phone;
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            ['username', 'filter', 'filter' => 'trim'],
+            ['username', 'required'],
+            [['username','surname'], 'string', 'min' => 2, 'max' => 255],
+
+            ['email', 'filter', 'filter' => 'trim'],
+            ['email', 'required'],
+            ['email', 'email'],
+            [['email','phone'], 'string', 'max' => 255],
+            ['email', 'unique', 'targetClass' => '\common\models\Customer', 'message' =>  Yii::t('app','message',[
+                'field' => 'Email'
+            ])],
+
+            [['phone'], 'unique', 'targetClass' => '\common\models\Customer', 'message' =>  Yii::t('app','message',[
+                'field' => 'Телефон'
+            ])],
+
+            ['password_repeat', 'required'],
+            ['password_repeat', 'compare', 'compareAttribute'=>'password', 'message'=> Yii::t('app', 'message_match_password') ],
+
+            ['password', 'required'],
+            ['password', 'string', 'min' => 6],
+        ];
+    }
+
+
+
+
+
+    /**
+     * Signs user up.
+     *
+     * @return Customer|null the saved model or null if saving fails
+     */
+    public function signup()
+    {
+
+        if (!$this->validate()) {
+            return null;
+        }
+        
+        $user = new Customer();
+        $user->username = $this->username;
+        $user->surname = $this->surname;
+        $user->email = $this->email;
+        $user->phone = $this->phone;
+        $user->setPassword($this->password);
+        $user->generateAuthKey();
+        $user->validate();
+        return $user->save() ? $user : null;
+    }
+}
--
libgit2 0.21.4