add active menu

Administrator
1 parent 82b29c31
Showing 15 changed files with 231 additions and 242 deletions Show diff stats
backend/controllers/OrdersController.php
common/components/Mailer.php
common/models/Customer.php
common/models/Orders.php
console/migrations/m160518_185644_change_order.php
frontend/config/main.php
frontend/controllers/BasketController.php
frontend/controllers/EventController.php
frontend/views/basket/index.php
frontend/views/event/_objects.php
frontend/views/event/index.php
frontend/views/event/show.php
frontend/views/event/view.php
frontend/views/layouts/main-menu.php
frontend/views/layouts/main.php
@@ -16,7 +16,6 @@ use common\modules\product\models\ProductVariant;
 class OrdersController extends Controller
 {
-//    public $layout = 'update';
     /**
      * @inheritdoc
      */
@@ -43,7 +42,6 @@ class OrdersController extends Controller
                 if(!empty($searchModel->id))$query->andFilterWhere(['like', 'id', $searchModel->id]);
 		        if(!empty($searchModel->phone))$query->andFilterWhere(['like', 'phone', $searchModel->phone]);
                 if(!empty($searchModel->name))$query->andFilterWhere(['like', 'name', $searchModel->name]);
-                if(!empty($searchModel->surname))$query->andFilterWhere(['like', 'surname', $searchModel->surname]);
                 if(!empty($searchModel->total))$query->andFilterWhere(['like', 'total', $searchModel->total]);
                 if(!empty($searchModel->reserve))$query->andFilterWhere(['like', 'reserve', $searchModel->reserve]);
                 if(!empty($searchModel->status))$query->andFilterWhere(['like', 'status', $searchModel->status]);
@@ -6,7 +6,7 @@ use yii\base\Widget;
 class Mailer extends Widget{
     public $message;
-    public $email = 'dockdep@gmail.com';
+    public $email;
     public $text;
     public $subject;
@@ -30,6 +30,7 @@ class Mailer extends Widget{
         $mail->MsgHTML($this->text);
         $address = "dockdep@gmail.com";
         $mail->AddAddress($address);
+        $mail->AddAddress($this->email);
         if(!$mail->send()) {
             \Yii::$app->getSession()->setFlash('error', 'Mailer Error: ' . $mail->ErrorInfo);
             return 'Mailer Error: ' . $mail->ErrorInfo;
 <?php
 namespace common\models;
+use common\components\Mailer;
 use Yii;
 class Customer extends \yii\db\ActiveRecord implements \yii\web\IdentityInterface
@@ -75,43 +76,32 @@ class Customer extends \yii\db\ActiveRecord implements \yii\web\IdentityInterfac
     }
     public function sendMsg(){
-                        $body = 'Вас приветствует сайт Rukzachok';
-                        $body .= "\n\r";            
-                        $body .= 'Ваш логин: '.$this->username;
-                        $body .= "\n\r";
-                        $body .= 'Ваш пароль: '.$this->password;
-
-                        
-            Yii::$app->mailer->compose()
-                ->setTo($this->username)
-                ->setFrom(['send@artweb.ua' => 'send'])
-                ->setSubject('Rukzachok Ваш пароль')
-                ->setTextBody($body)
-                ->send();        
+        $body = 'Вас приветствует сайт Rukzachok';
+        $body .= "\n\r";
+        $body .= 'Ваш логин: '.$this->username;
+        $body .= "\n\r";
+        $body .= 'Ваш пароль: '.$this->password;
+
+        Mailer::widget(['text'=> $body, 'subject'=> 'Спасибо за регистрацию', 'email' => $this->username ]);
     }
-		public function afterSave($insert, $changedAttributes)
-		 {
-			 parent::afterSave($insert, $changedAttributes);
-/*
-$auth = new DbManager;
-$auth->init();
-$role = $auth->createRole('company');
-$auth->add($role);
-$role = $auth->createRole('customer');
-$auth->add($role);
-*/
-			 // установка роли пользователя
-			 $auth = Yii::$app->authManager;
-			 $role = $auth->getRole($this->role);
-			 if (!$insert) {
-				 $auth->revokeAll($this->id);
-			 }
-			 $auth->assign($role, $this->id);
-                         
-                         $this->sendMsg();
-		 }
+    public function afterSave($insert, $changedAttributes)
+    {
+        parent::afterSave($insert, $changedAttributes);
+
+        // установка роли пользователя
+        $auth = Yii::$app->authManager;
+        $role = $auth->getRole($this->role);
+        if (!$insert) {
+            $auth->revokeAll($this->id);
+        }
+        $auth->assign($role, $this->id);
+
+        if($this->isNewRecord){
+            $this->sendMsg();
+        }
+    }
 	public function beforeSave($insert) {
@@ -135,37 +125,32 @@ $auth-&gt;add($role);
 		return parent::beforeSave($insert);
 	}
-        public function beforeDelete() {
-            //$this->deleteImage($this->image); 
-            return parent::beforeDelete();
-        }
-        
-        public function deleteImage($file){ 
-                        if(!empty($file)){
-                            @unlink('upload/profile/'.$file);
-                            @unlink('upload/profile/ico/'.$file);
-                           // @unlink('upload/fotos/big/'.$file);
-                        }            
-        }
-        
-        
-        public function getOld(){
-            if(empty($this->birth_year) || empty($this->birth_mouth) || empty($this->birth_day))return;
-            $birthday = $this->birth_year.'-'.$this->birth_mouth.'-'.$this->birth_day;    
-            if($birthday=="0000-00-00")return;	
-            $birthday_timestamp = strtotime($birthday);
-            $age = date('Y') - date('Y', $birthday_timestamp);
-            if (date('md', $birthday_timestamp) > date('md')) {
-              $age--;
-            }
-            return $age;
-             
+    public function beforeDelete() {
+        //$this->deleteImage($this->image);
+        return parent::beforeDelete();
+    }
+
+    public function deleteImage($file){
+                    if(!empty($file)){
+                        @unlink('upload/profile/'.$file);
+                        @unlink('upload/profile/ico/'.$file);
+                       // @unlink('upload/fotos/big/'.$file);
+                    }
+    }
+
+
+    public function getOld(){
+        if(empty($this->birth_year) || empty($this->birth_mouth) || empty($this->birth_day))return;
+        $birthday = $this->birth_year.'-'.$this->birth_mouth.'-'.$this->birth_day;
+        if($birthday=="0000-00-00")return;
+        $birthday_timestamp = strtotime($birthday);
+        $age = date('Y') - date('Y', $birthday_timestamp);
+        if (date('md', $birthday_timestamp) > date('md')) {
+          $age--;
         }
-        
-//        public function getOfferCustomer(){
-//            return $this->hasMany(OfferCustomer::className(), ['service_user_id' => 'id'])->where(['done'=>1]);
-//        }
-//
+        return $age;
+
+    }
     /**
      * @inheritdoc
@@ -18,7 +18,7 @@ class Orders extends \yii\db\ActiveRecord
         return [
             [['name', 'phone'], 'required','whenClient' => true],
             //['email', 'email'],
-            [['total','body','patronymic','surname','email','phone2','delivery','payment'], 'safe'],
+            [['total','body','email','phone2','delivery','payment'], 'safe'],
             [['email'],'email'],
         ];
     }
@@ -26,14 +26,12 @@ class Orders extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'name' => 'Имя',
+            'name' => 'Ф.И.О',
             'phone'=>'Телефон',
             'phone2'=>'Дополнительный телефон',
             'body'=>'Сообщение',
             'adress'=>'Адрес',
             'city'=>'Город',
-            'patronymic'=>'Отчество',
-            'surname'=>'Фамилия',
             'email'=>'E-mail',
             'date_time'=>'Дата',
             'total'=>'Сума',
@@ -60,10 +58,6 @@ class Orders extends \yii\db\ActiveRecord
             $body .= "\n\r";
             $body .= 'Имя: '.$this->name;
             $body .= "\n\r";
-            $body .= 'Фамилия: '.$this->surname;
-            $body .= "\n\r";
-            $body .= 'Отчество: '.$this->patronymic;
-            $body .= "\n\r";
             $body .= 'E-mail: '.$this->email;
             $body .= "\n\r";
             $body .= 'Телефон: '.$this->phone;
+<?php
+
+use yii\db\Migration;
+
+class m160518_185644_change_order extends Migration
+{
+    public function up()
+    {
+        $this->dropColumn('orders', 'surname');
+        $this->dropColumn('orders', 'patronymic');
+    }
+
+    public function down()
+    {
+        $this->addColumn('orders', 'surname','string');
+        $this->addColumn('orders', 'patronymic','string');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
@@ -85,6 +85,8 @@ return [
                 'brends'                                                           => 'brends/index',
                 'blog'                                                             => 'articles/index',
                 'blog/<translit:[\w\-]+>-<id:\d+>'                                 => 'articles/show',
+                'event'                                                             => 'event/index',
+                'event/<alias:[\w\-]+>-<id:\d+>'                                 => 'event/show',
                 '<language:(ru|ua|en)>/<module:\w+>/<controller:\w+>/<action:\w+>' => '<module>/<controller>/<action>',
                 '<language:(ru|ua|en)>/<controller:\w+>/<action:\w+>'              => '<controller>/<action>',
                 '<language:(ru|ua|en)>/admin'                                      => 'admin/default/index',
@@ -50,7 +50,7 @@ class BasketController extends Controller
                           $modelOrdersProducts->load($data);
                           $modelOrdersProducts->save();
                         }
-                        if(!Yii::$app->user->id){
+                        if(!Yii::$app->user->id && !empty($modelOrder->email)){
                         $modelUser = new Customer();
                         $modelUser->role = 'person';
                         $modelUser->username = $modelOrder->email;
@@ -72,7 +72,6 @@ class BasketController extends Controller
                 $modelOrder->email = $user->username;
                 $modelOrder->phone = $user->phone;
                 $modelOrder->name = $user->name;
-                $modelOrder->surname = $user->surname;
             }
             return $this->render('index', [
-<?php
-
-namespace frontend\controllers;
-
-use Yii;
-use common\models\Event;
-use yii\web\Controller;
-use yii\web\NotFoundHttpException;
-use yii\data\ActiveDataProvider;
-
-
-
-class EventController extends Controller
-{
-
-    public function actionIndex()
-    {
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => Event::find() ]);
-
-        return $this->render('index', [
-            'dataProvider' => $dataProvider,
-        ]);
-    }
-
-
-
-    public function actionView($alias)
-    {
-
-        return $this->render('view', [
-            'model' => $this->findModel($alias),
-        ]);
-    }
-
-
-    protected function findModel($alias)
-    {
-        if (($model = Event::findOne(["alias"=>$alias])) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
-
-
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Event;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\data\ActiveDataProvider;
+
+
+
+class EventController extends Controller
+{
+
+    public function actionIndex()
+    {
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => Event::find() ]);
+
+        return $this->render('index', [
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+
+
+    public function actionShow($alias)
+    {
+
+        return $this->render('show', [
+            'model' => $this->findModel($alias),
+        ]);
+    }
+
+
+    protected function findModel($alias)
+    {
+        if (($model = Event::findOne(["alias"=>$alias])) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+
+
 }
 \ No newline at end of file
@@ -43,12 +43,10 @@ $(&#39;#order-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
 <?= Html::a('Вернуться в каталог', ['/site/index'], ['class'=>'btn-success']) ?>
 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?>
 <div class="rightbar">
- <div class="form-order">   
-<?php echo $form->field($modelOrder,'surname'); ?>
+ <div class="form-order">
 <?php echo $form->field($modelOrder,'name'); ?>
-<?php echo $form->field($modelOrder,'patronymic'); ?>    
 <?php echo $form->field($modelOrder,'phone'); ?> 
-<?php echo $form->field($modelOrder,'phone2'); ?> 
+<?php echo $form->field($modelOrder,'phone2'); ?>
 <?php echo $form->field($modelOrder,'city'); ?>    
 <?php echo $form->field($modelOrder,'adress'); ?>
 <?php echo $form->field($modelOrder,'email'); ?>
@@ -2,37 +2,10 @@
 use yii\helpers\Html;
 use frontend\helpers\TextHelper;
 use yii\helpers\Url;
-
+use frontend\components\Text;
 ?>
-<div class="portfolio-portfolio">
-    <div class="portfolio-portfolio-overflow">
-
-        <div class="portfolio-portfolio-img-wrap">
-            <div class="portfolio-portfolio-img">
-                <?=  Html::a(Html::img($model->minImg($model->image, '200','200')),Url::toRoute(['event/view', 'alias' =>$model->alias ]))  ?>
-            </div>
-        </div>
-
-        <div class="portfolio-portfolio-text-wrap">
-
-
-            <div class="portfolio-category-name"><?=  Html::a($model->name,Url::toRoute(['event/view', 'alias' =>$model->alias ]))  ?></div>
-            <div class="date_end">
-                Срок действия по: <?= $model->end_at?>
-            </div>
-            <div class="portfolio-text-name">
-                <p>
-                    <span><?= TextHelper::truncateHtmlText($model->body, 200, '...') ?></span>
-                </p>
-            </div>
-            <table class="tov-tb-3" cellspacing="0" cellpadding="0" border="0">
-                <tbody>
-                <tr>
-                    <td height="25"><img src="/images/ico-2.jpg" alt=""></td>
-                    <td height="25"></td><td><a class="consultation_btn" href="#" style="margin-left: 11px; font-size: 13px; font-family: arial; color: #6b7b9d; border-bottom: 1px dotted;">Заказать консультацию</a></td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
+<div class="news_item">
+    <a href="<?=Url::to(['event/show','alias'=>$model->alias,'id'=>$model->primaryKey])?>"><img src="<?=Yii::$app->request->baseUrl.'/storage/articles/ico/'.$model->image?>" width="180" height="125" border="0" align="left" /></a>
+    <a href="<?=Url::to(['event/show','alias'=>$model->alias,'id'=>$model->primaryKey])?>" class="name"><?=$model->name?></a><br />
+    <?=Text::getShort($model->body,600);?><div class="both"></div>
 </div>
 \ No newline at end of file
 <?php
+use yii\helpers\Url;
+use yii\widgets\Breadcrumbs;
+//use app\models\News;
+use yii\widgets\LinkPager;
+
 use yii\widgets\ListView;
-use frontend\widgets\Seo;
-$this->params['breadcrumbs'][] = ['label' => 'Акции', 'url' => ['index']];
-$this->params['seo']['seo_text'] = 'TEST SEO TEXT';
-$this->params['seo']['h1'] = 'TEST H1';
-$this->params['seo']['description'] = 'TEST DESCRIPTION';
-$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD';
-?>
+?>
 <?php
-    echo ListView::widget( [
-        'dataProvider' => $dataProvider,
-        'itemView'=>'_objects',
-        'summary'=>'',
-        'layout' => "<div class='portfolio-block-left'>{items}</div>
-        <div class='pager-block' id='pager-block-single'>{pager}</div>"
-    ] );
+$this->title = 'Акции';
+$this->registerMetaTag(['name' => 'description', 'content' => 'Акции']);
+$this->registerMetaTag(['name' => 'keywords', 'content' => 'Акции']);
 ?>
-<div class="seo-text">
-    <?= Seo::widget(['row'=>'seo_text'])?>
-</div>
+
+            <nav class="bread-crumbs">
+            <?= Breadcrumbs::widget([
+                'links' => [
+                            'Акции'
+                            ],
+            ]) ?>
+                            <div class="both"></div>
+            </nav>
+
+<div class="layout">
+    
+    <div class="content">
+	<h1>Акции</h1>
+        <?php
+        echo ListView::widget( [
+            'dataProvider' => $dataProvider,
+            'itemView'=>'_objects',
+            'summary'=>''
+        ] );
+        ?>
+
+        <div class="both"></div>
+
+        
+    </div>                                    
+                                        
+</div>
 \ No newline at end of file
+<?php
+use yii\helpers\Url;
+use yii\widgets\Breadcrumbs;
+?>
+<?php
+$this->title = $model->name;
+
+?>
+
+            <nav class="bread-crumbs">
+            <?= Breadcrumbs::widget([
+                'links' => [
+                            ['label'=>'Акции','url'=>['news/index']],
+                    $model->name
+                            ],
+            ]) ?>
+                            <div class="both"></div>
+            </nav>
+
+<div class="layout">
+    
+    <div class="content">
+	<h1><?=$model->name?></h1>
+        
+            <img src="<?=Yii::$app->request->baseUrl.'/storage/articles/big/'.$model->image?>" width="400" height="400" border="0" align="left" class='pic' />
+            <?=$model->body?>
+    </div>                                    
+                                        
+</div>
 \ No newline at end of file
-<?php
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-use frontend\widgets\Seo;
-/* @var $this yii\web\View */
-/* @var $model common\models\Stone */
-
-$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Акции', 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-$this->params['name'] = $this->title;
-?>
-<div class="events-one-item">
-    <h1><?= $model->name?></h1>
-    <?=  Html::img($model->minImg($model->image, '940','480')) ?>
-    <div class="date_end">
-        Срок действия по: <?= $model->end_at?>
-    </div>
-    <div class="content-last-block-text-wrap">
-        <?= $model->body?>
-    </div>
-    <?php
-        echo \common\modules\comment\widgets\CommentWidget::widget([
-            'context'       => $this,
-            'model'         => $model->className(),
-            'model_id'      => $model->event_id,
-            'comment_class' => \common\modules\comment\models\Comment::className(),
-            'rating_class'  => \common\modules\comment\models\Rating::className(),
-            'class_options' => [
-                'scenario'     => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
-                'user_id'      => \Yii::$app->user->getId(),
-                'guestComment' => true,
-                'status'       => \common\modules\comment\models\Comment::STATUS_ACTIVE,
-            ],
-            'list_options'  => [
-                'view' => 'list-comment-review',
-            ],
-            'form_options'  => [
-                'view' => 'form-comment-review',
-                'tag'  => 'span',
-            ],
-            'options'       => [
-                'class' => 'proektant-comments-wr style',
-            ],
-        ]);
-    ?>
-</div>
-<div class="seo-text">
-    <?= Seo::widget(['row'=>'seo_text'])?>
-</div>
+<?php
+use common\modules\product\models\Category;
+use yii\helpers\Url;
+use yii\widgets\Menu;
+
+
+foreach (Category::find ()->all () as $category){
+ $menu[] = ['label' => $category->name ,
+     'url' => Url::to(['catalog/category', 'category' => $category]),
+     'active' => Yii::$app->request->get('category')->alias == $category->alias ? true : false ];
+}
+
+$main_menu = Menu::widget([
+    'items' =>  $menu,
+]);
+?>
+
+<?=$main_menu?>
+<div class="fr">
+    <ul>
+        <li class="akciya"><a href="<?= Url::to (['event/index',]) ?>">Акции</a></li>
+        <li class="brands"><a href="<?= Url::to (['brand/index']) ?>">Бренды</a></li>
+    </ul>
+</div>
@@ -154,19 +154,7 @@
         <div class="menu">
-            <ul>
-                <?php foreach (Category::find ()->all () as $category): ?>
-                    <li><a href="<?= \yii\helpers\Url::to(['catalog/category', 'category' => $category])?>"><?= $category->name ?></a>
-                    </li>
-                <?php endforeach; ?>
-            </ul>
-
-            <div class="fr">
-                <ul>
-                    <li class="akciya"><a href="<?= Url::to (['text/index', 'translit' => 'akcii']) ?>">Акции</a></li>
-                    <li class="brands"><a href="<?= Url::to (['brand/index']) ?>">Бренды</a></li>
-                </ul>
-            </div>
+            <?= $this->render('main-menu', Category::find ()->all())?>
             <div class="both"></div>
         </div>
@@ -306,7 +294,7 @@
                     <li><a href="<?= Url::to (['text/index', 'translit' => 'oplata_i_dostavka']) ?>">Оплата и
                             доставка</a></li>
                     <li><a href="<?= Url::to (['iam/index']) ?>">Личный кабинет</a></li>
-                    <li><a href="#">Акции</a></li>
+                    <li><a href="<?= Url::to (['event/index']) ?>">Акции</a></li>
                     <li><a href="<?= Url::to (['text/index', 'translit' => 'about']) ?>">О магазине</a></li>
                 </ul>