Merge branch 'master' of gitlab.artweb.com.ua:root/new_rukzachok

Karnovsky A
2 parents 926c92c1 459a11d6
Showing 4 changed files with 25 additions and 12 deletions Show diff stats
backend/config/main.php
backend/views/layouts/header.php
backend/views/layouts/main-sidebar.php
frontend/views/basket/index.php
@@ -27,8 +27,13 @@ return [
                 'site' =>
                 [
                     [
-                        'actions' => ['login', 'error','logout', 'index' ],
+                        'actions' => ['login', 'error','logout',],
                         'allow' => true,
+                    ],
+                    [
+                        'actions' => ['index'],
+                        'allow' => true,
+                        'roles' => ['@'],
                     ]
  
                 ]
@@ -16,7 +16,7 @@ AppAsset::register($this);
 ?>
 <header class="main-header">
     <!-- Logo -->
-    <a href="index2.html" class="logo">
+    <a href="/admin/" class="logo">
         <!-- mini logo for sidebar mini 50x50 pixels -->
         <span class="logo-mini"><b>A</b>BOX</span>
         <!-- logo for regular state and mobile devices -->
@@ -53,7 +53,7 @@ use yii\widgets\Menu;
             ],
             [
                 'label' => 'Слайдер/Банеры',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-picture"></i> <span>{label}</span></a>',
                 'options' => ['class'=>\Yii::$app->user->can('banner') || \Yii::$app->user->can('slider') ? '' :'hide'],
                 'items' => [
                     [
@@ -88,16 +88,19 @@ use yii\widgets\Menu;
             ],
             [
                 'label' => 'Текстовые страницы',
+                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-duplicate"></i> <span>{label}</span></a>',
                 'url' => ['/page/index'],
                 'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'],
             ],
             [
                 'label' => 'Статьи',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-pencil"></i> <span>{label}</span></a>',
                 'url' => ['/articles/index'],
                 'options' => ['class'=>\Yii::$app->user->can('articles') ? '' :'hide'],
             ],
             [
                 'label' => 'Акции',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-piggy-bank"></i> <span>{label}</span></a>',
                 'url' => ['/event/index'],
                 'options' => ['class'=>\Yii::$app->user->can('event') ? '' :'hide'],
             ],
@@ -121,26 +124,24 @@ use yii\widgets\Menu;
             [
                 'label' => 'Фон',
                 'url' => ['/bg/index'],
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-picture"></i> <span>{label}</span></a>',
                 'options' => ['class'=>\Yii::$app->user->can('bg')? '' :'hide']
             ],
             [
                 'label' => 'Подписка',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-envelope"></i> <span>{label}</span></a>',
                 'url' => ['/subscribe/index'],
                 'options' => ['class'=>\Yii::$app->user->can('subscribe') ? '' :'hide'],
             ],
             [
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-user"></i> <span>{label}</span></a>',
                 'label' => 'Пользователи',
                 'url' => ['/customer/index'],
                 'options' => ['class'=>\Yii::$app->user->can('customer') ? '' :'hide'],
             ],
             [
-                'label' => 'Группы пользователей',
-                'url' => ['/group/index'],
-                'options' => ['class'=>\Yii::$app->user->can('group')? '' :'hide']
-            ],
-            [
                 'label' => 'Настройка ролей',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
+                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-cog"></i> <span>{label}</span></a>',
                 'options' => ['class'=>\Yii::$app->user->can('user') || \Yii::$app->user->can('user') || \Yii::$app->user->can('permit')  ? '' :'hide'],
                 'items' => [
                     [
@@ -172,7 +173,11 @@ use yii\widgets\Menu;
             );
         } else {
             array_push($items,
-                ['label' => 'Logout (' . Yii::$app->user->identity->username . ')','url'=>'/admin/site/logout']
+                [
+                    'label' => 'Logout (' . Yii::$app->user->identity->username . ')',
+                    'url'=>'/admin/site/logout',
+                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-log-out"></i> <span>{label}</span></a>',
+                ]
             );
         }
         echo Menu::widget([
@@ -69,8 +69,11 @@ $(&#39;#orders-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
  
      <div class="input-blocks-group radio_grp hidden_box">
          <div class="input-blocks-wrapper">
-             <?= $form->field($modelOrder, 'delivery')
-                 ->radioList(ArrayHelper::map(Delivery::find()->where(['parent_id'=>0])->asArray()->all(), 'id', 'title'),[
+             <?php
+             $deliveries = ArrayHelper::map(Delivery::find()->where(['parent_id'=>0])->asArray()->all(), 'id', 'title');
+             array_pop($deliveries);
+             echo $form->field($modelOrder, 'delivery')
+                 ->radioList($deliveries,[
                      'item' => function($index, $label, $name, $checked, $value) {
                          $return = '<div class="custom-form-buttons">';
                          $return .= '<input class="custom-radio" id="custom-radio-' . $value . '" ' . ( $checked ? "checked" : "" ) . ' type="radio" name="' . $name . '" value="' . $value . '" >';