From 4994ab9ee16380b413a15b7c25aa72b98df07e6b Mon Sep 17 00:00:00 2001
From: Eugeny Galkovskiy <zhegal@gmail.com>
Date: Wed, 15 Jun 2016 17:30:17 +0300
Subject: [PATCH] 150616

---
 backend/controllers/OrdersController.php | 18 +++++++++++++++---
 backend/views/layouts/main-sidebar.php   | 55 ++++++++++++++++++++++++++-----------------------------
 backend/views/orders/_form.php           | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 backend/views/orders/create.php          | 19 +++++++++++++++++++
 backend/views/orders/index.php           |  3 +++
 5 files changed, 129 insertions(+), 32 deletions(-)
 create mode 100644 backend/views/orders/_form.php
 create mode 100644 backend/views/orders/create.php

diff --git a/backend/controllers/OrdersController.php b/backend/controllers/OrdersController.php
index 319f525..4794d3a 100755
--- a/backend/controllers/OrdersController.php
+++ b/backend/controllers/OrdersController.php
@@ -8,7 +8,7 @@ use yii\web\Controller;
 use yii\filters\VerbFilter;
 use yii\data\ActiveDataProvider;
 use yii\web\HttpException;
-use backend\models\Orders;
+use common\models\Orders;
 use backend\models\OrdersProducts;
 use common\modules\product\models\ProductVariant;
 use yii\web\NotFoundHttpException;
@@ -93,7 +93,7 @@ class OrdersController extends Controller
 	public function actionDelete(){
 		$model = Orders::findOne($_GET['id']);
 		$model->delete();
-		return Yii::$app->response->redirect(['/admin/orders/index']);
+		return Yii::$app->response->redirect(['/orders/index']);
 	}
         
         
@@ -115,12 +115,24 @@ class OrdersController extends Controller
             
             //return $this->render('add',['model'=>$model]);
         }
+
+    public function actionCreate(){
+        $model = new Orders();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['index']);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
         
 	public function actionDelete_product(){
 		$model = OrdersProducts::findOne($_GET['id']);
 		$model->delete();
 		return Yii::$app->response->redirect(['/admin/orders/show','id'=>$_GET['order_id']]);
-	}  
+	}
 
     protected function findModel($id)
     {
diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php
index 0f10d96..f389844 100755
--- a/backend/views/layouts/main-sidebar.php
+++ b/backend/views/layouts/main-sidebar.php
@@ -5,6 +5,8 @@ use yii\widgets\Menu;
     <!-- sidebar: style can be found in sidebar.less -->
     <section class="sidebar">
         <?php
+//print_r($this->context->id);
+//        die();
 
         $items = [
             [
@@ -17,6 +19,13 @@ use yii\widgets\Menu;
                 'label' => 'eCommerce',
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
                 'url' => ['/product/manage'],
+                'active' => preg_match('/^manage.*$/', $this->context->id) ||
+                            preg_match('/^category.*$/', $this->context->id) ||
+                            preg_match('/^brand.*$/', $this->context->id) ||
+                            preg_match('/^product-unit.*$/', $this->context->id) ||
+                            preg_match('/^import.*$/', $this->context->id) ||
+                            preg_match('/^tax-group.*$/', $this->context->id) ||
+                            preg_match('/^export.*$/', $this->context->id) ? true : false,
                 'options' => ['class'=>\Yii::$app->user->can('product') || \Yii::$app->user->can('category') || \Yii::$app->user->can('brand') || \Yii::$app->user->can('rubrication')  ? '' :'hide'],
                 'items' => [
                     [
@@ -27,7 +36,8 @@ use yii\widgets\Menu;
                     [
                         'label' => 'Категории',
                         'url' => ['/category'],
-                        'options' => ['class'=>\Yii::$app->user->can('category') ? '' :'hide']
+                        'options' => ['class'=>\Yii::$app->user->can('category') ? '' :'hide'],
+
                     ],
                     [
                         'label' => 'Бренды',
@@ -35,21 +45,11 @@ use yii\widgets\Menu;
                         'options' => ['class'=>\Yii::$app->user->can('brand') ? '' :'hide'],
                     ],
                     [
-                        'label' => 'Характеристики',
-                        'url' => ['/rubrication/tax-group'],
-                        'options' => ['class'=>\Yii::$app->user->can('rubrication') ? '' :'hide'],
-                    ],
-                    [
                         'label' => 'Единицы измерения',
                         'url' => ['/product/product-unit'],
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
                     ],
                     [
-                        'label' => 'Типы вариантов',
-                        'url' => ['/product/product-variant-type'],
-                        'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
-                    ],
-                    [
                         'label' => 'Импорт товаров',
                         'url' => ['/product/manage/import'],
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
@@ -59,12 +59,23 @@ use yii\widgets\Menu;
                         'url' => ['/product/manage/export'],
                         'options' => ['class'=>\Yii::$app->user->can('product') ? '' :'hide'],
                     ],
+                    [
+                        'label' => 'Характеристики',
+                        'url' => ['/rubrication/tax-group'],
+                        'options' => ['class'=>\Yii::$app->user->can('rubrication') ? '' :'hide'],
+                    ],
+                    [
+                        'label' => 'Зависимости',
+                        'url' => ['/relation/manage'],
+                        'options' => ['class'=>\Yii::$app->user->can('relation') ? '' :'hide'],
+                    ]
                 ]
             ],
             [
                 'label' => 'Слайдер/Банеры',
                 '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'],
+                'active' => preg_match('/^slider.*$/', $this->context->id) || preg_match('/^banner.*$/', $this->context->id) ? true : false,
                 'items' => [
                     [
                         'label' => 'Слайдер',
@@ -79,24 +90,6 @@ use yii\widgets\Menu;
                 ]
             ],
             [
-                'label' => 'Характеристики',
-                'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
-                'url' => ['/rubrication/tax-group'],
-                'options' => ['class'=>\Yii::$app->user->can('rubrication') || \Yii::$app->user->can('relation') ? '' :'hide'],
-                'items' => [
-                    [
-                        'label' => 'Характеристики',
-                        'url' => ['/rubrication/tax-group'],
-                        'options' => ['class'=>\Yii::$app->user->can('rubrication') ? '' :'hide'],
-                    ],
-                    [
-                        'label' => 'Зависимости',
-                        'url' => ['/relation/manage'],
-                        'options' => ['class'=>\Yii::$app->user->can('relation') ? '' :'hide'],
-                    ]
-                ]
-            ],
-            [
                 'label' => 'Текстовые страницы',
                  'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-duplicate"></i> <span>{label}</span></a>',
                 'url' => ['/page/index'],
@@ -117,6 +110,7 @@ use yii\widgets\Menu;
             [
                 'label' => 'SEO',
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
+                'active' => preg_match('/^seo.*$/', $this->context->id) || preg_match('/^seo-category.*$/', $this->context->id) ? true : false,
                 'options' => ['class'=>\Yii::$app->user->can('seo') || \Yii::$app->user->can('seo-category') ? '' :'hide'],
                 'items' => [
                     [
@@ -131,6 +125,7 @@ use yii\widgets\Menu;
                     ]
                 ]
             ],
+
             [
                 'label' => 'Фон',
                 'url' => ['/bg/index'],
@@ -152,6 +147,8 @@ use yii\widgets\Menu;
             [
                 'label' => 'Настройка ролей',
                 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-cog"></i> <span>{label}</span></a>',
+                'active' => preg_match('/^user.*$/', $this->context->id)
+                            || preg_match('/^access.*$/', $this->context->id) ? true : false,
                 'options' => ['class'=>\Yii::$app->user->can('user') || \Yii::$app->user->can('user') || \Yii::$app->user->can('permit')  ? '' :'hide'],
                 'items' => [
                     [
diff --git a/backend/views/orders/_form.php b/backend/views/orders/_form.php
new file mode 100644
index 0000000..6579e53
--- /dev/null
+++ b/backend/views/orders/_form.php
@@ -0,0 +1,66 @@
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\bootstrap\ActiveForm;
+use yii\helpers\ArrayHelper;
+use common\models\Delivery;
+use yii\bootstrap\Modal;
+use kartik\date\DatePicker;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Slider */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+    <?php $form = ActiveForm::begin(); ?>
+<div class="container" style="margin-left: 0;">
+<div class="col-sm-6">
+
+
+    <?= $form->field($model, 'name') ?>
+
+
+    <?= $form->field($model, 'phone') ?>
+
+    <?= $form->field($model, 'phone2') ?>
+
+    <?= $form->field($model, 'email') ?>
+
+    <?= $form->field($model, 'numbercard') ?>
+
+    <?= $form->field($model, 'body')->textArea(['rows' => '3']) ?>
+<!--    --><?//= $form->field($model, 'delivery')->dropDownList(ArrayHelper::map(Delivery::find()->asArray()->all(), 'id', 'title')) ?>
+    <?= $form->field($model, 'declaration') ?>
+
+    <?= $form->field($model, 'stock') ?>
+
+    <?= $form->field($model, 'consignment') ?>
+</div>
+<div class="col-sm-6">
+
+    <?=$form->field($model, 'payment')->dropDownList(['Оплатить наличными'=>'Оплатить наличными','Оплатить на карту Приват Банка'=>'Оплатить на карту Приват Банка','Оплатить по безналичному расчету'=>'Оплатить по безналичному расчету','Оплатить Правекс-телеграф'=>'Оплатить Правекс-телеграф','Наложенным платежом'=>'Наложенным платежом'],['prompt'=>'...']); ?>
+
+    <?= $form->field($model, 'insurance') ?>
+
+    <?= $form->field($model, 'amount_imposed') ?>
+
+    <?= $form->field($model, 'shipping_by') ?>
+
+    <?= $form->field($model, 'city') ?>
+
+    <?= $form->field($model, 'adress') ?>
+
+
+    <?= $form->field($model, 'total') ?>
+
+    <?=$form->field($model, 'status')->dropDownList(['Нет'=>'Нет','Обработан'=>'Обработан','На комплектации'=>'На комплектации','Укомплектован'=>'Укомплектован','Доставка'=>'Доставка','Выполнен'=>'Выполнен','Резерв оплачен'=>'Резерв оплачен','Резерв неоплачен'=>'Резерв неоплачен'],['prompt'=>'...']); ?>
+
+    <?= $form->field($model, 'comment')->textArea(['rows' => '3']) ?>
+</div>
+</div>
+<div class="form-group">
+    <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+</div>
+    <?php ActiveForm::end(); ?>
+
diff --git a/backend/views/orders/create.php b/backend/views/orders/create.php
new file mode 100644
index 0000000..15d213f
--- /dev/null
+++ b/backend/views/orders/create.php
@@ -0,0 +1,19 @@
+<?php
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\bootstrap\ActiveForm;
+
+
+$this->title = 'Добавить товар в заказ';
+$this->params['breadcrumbs'][] = ['label' => 'Pages', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="orders-create">
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+</div>
+
diff --git a/backend/views/orders/index.php b/backend/views/orders/index.php
index 8329765..9907dcc 100755
--- a/backend/views/orders/index.php
+++ b/backend/views/orders/index.php
@@ -11,6 +11,9 @@ $this->title = 'Заказы';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <h1>Заказы</h1>
+    <p>
+        <?= Html::a('Add Orders', ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
 <?php \yii\widgets\Pjax::begin(   [
 
 ]); ?>
--
libgit2 0.21.4