Administrator / test_1

Commit 2481f81f95af1d738ea5d7b807180f8f6dfbaaed

Authored by Administrator
1 parent 385d70ca

Importers CRUD

Showing 19 changed files with 16 additions and 8 deletions   Show diff stats
Inline Side-by-side
backend/controllers/BrandsReplaceController.php
  Show/Hide comments   View file @2481f81
@@ -14,6 +14,8 @@ use yii\filters\VerbFilter; @@ -14,6 +14,8 @@ use yii\filters\VerbFilter;
14 */ 14 */
15 class BrandsReplaceController extends Controller 15 class BrandsReplaceController extends Controller
16 { 16 {
  17 +
  18 + public $layout = "/column";
17 public function behaviors() 19 public function behaviors()
18 { 20 {
19 return [ 21 return [
backend/controllers/DetailsController.php
  Show/Hide comments   View file @2481f81
@@ -34,7 +34,6 @@ class DetailsController extends Controller @@ -34,7 +34,6 @@ class DetailsController extends Controller
34 { 34 {
35 $searchModel = new DetailsSearch(); 35 $searchModel = new DetailsSearch();
36 $dataProvider = $searchModel->search(Yii::$app->request->queryParams); 36 $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
37 -  
38 return $this->render('index', [ 37 return $this->render('index', [
39 'searchModel' => $searchModel, 38 'searchModel' => $searchModel,
40 'dataProvider' => $dataProvider, 39 'dataProvider' => $dataProvider,
backend/controllers/DetailsCrossesController.php
  Show/Hide comments   View file @2481f81
@@ -14,6 +14,7 @@ use yii\filters\VerbFilter; @@ -14,6 +14,7 @@ use yii\filters\VerbFilter;
14 */ 14 */
15 class DetailsCrossesController extends Controller 15 class DetailsCrossesController extends Controller
16 { 16 {
  17 + public $layout = "/column";
17 public function behaviors() 18 public function behaviors()
18 { 19 {
19 return [ 20 return [
backend/views/accounts/index.php
  Show/Hide comments   View file @2481f81
@@ -22,6 +22,7 @@ $this->params['breadcrumbs'][] = $this->title; @@ -22,6 +22,7 @@ $this->params['breadcrumbs'][] = $this->title;
22 <?= GridView::widget([ 22 <?= GridView::widget([
23 'dataProvider' => $dataProvider, 23 'dataProvider' => $dataProvider,
24 'filterModel' => $searchModel, 24 'filterModel' => $searchModel,
  25 + 'layout'=>"{pager}\n{items}",
25 'columns' => [ 26 'columns' => [
26 ['class' => 'yii\grid\SerialColumn'], 27 ['class' => 'yii\grid\SerialColumn'],
27 28
backend/views/brands_replace/_form.php renamed to backend/views/brands-replace/_form.php
  Show/Hide comments   View file @2481f81
backend/views/brands_replace/_search.php renamed to backend/views/brands-replace/_search.php
  Show/Hide comments   View file @2481f81
backend/views/brands_replace/create.php renamed to backend/views/brands-replace/create.php
  Show/Hide comments   View file @2481f81
backend/views/brands_replace/index.php renamed to backend/views/brands-replace/index.php
  Show/Hide comments   View file @2481f81
backend/views/brands_replace/update.php renamed to backend/views/brands-replace/update.php
  Show/Hide comments   View file @2481f81
backend/views/brands_replace/view.php renamed to backend/views/brands-replace/view.php
  Show/Hide comments   View file @2481f81
backend/views/details_crosses/_form.php renamed to backend/views/details-crosses/_form.php
  Show/Hide comments   View file @2481f81
backend/views/details_crosses/_search.php renamed to backend/views/details-crosses/_search.php
  Show/Hide comments   View file @2481f81
backend/views/details_crosses/create.php renamed to backend/views/details-crosses/create.php
  Show/Hide comments   View file @2481f81
backend/views/details_crosses/index.php renamed to backend/views/details-crosses/index.php
  Show/Hide comments   View file @2481f81
backend/views/details_crosses/update.php renamed to backend/views/details-crosses/update.php
  Show/Hide comments   View file @2481f81
backend/views/details_crosses/view.php renamed to backend/views/details-crosses/view.php
  Show/Hide comments   View file @2481f81
backend/views/details/index.php
  Show/Hide comments   View file @2481f81
@@ -22,6 +22,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title; @@ -22,6 +22,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
22 <?= GridView::widget([ 22 <?= GridView::widget([
23 'dataProvider' => $dataProvider, 23 'dataProvider' => $dataProvider,
24 'filterModel' => $searchModel, 24 'filterModel' => $searchModel,
  25 + 'layout'=>"{pager}\n{items}",
25 'columns' => [ 26 'columns' => [
26 ['class' => 'yii\grid\SerialColumn'], 27 ['class' => 'yii\grid\SerialColumn'],
27 28
backend/views/layouts/column.php
  Show/Hide comments   View file @2481f81
@@ -305,10 +305,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -305,10 +305,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
305 ], 305 ],
306 ], 306 ],
307 ['label' => 'Справочник', 'url' => ['#'], 'items' => [ 307 ['label' => 'Справочник', 'url' => ['#'], 'items' => [
308 - ['label' => 'Замены брендов', 'url' => ['currency/index']],  
309 - ['label' => 'Карточки товаров', 'url' => ['currency/index']],  
310 - ['label' => 'Товары поставщиков', 'url' => ['currency/index']],  
311 - ['label' => 'Кроссы', 'url' => ['currency/index']], 308 + ['label' => 'Замены брендов', 'url' => ['brands-replace/index']],
  309 + ['label' => 'Карточки товаров', 'url' => ['#']],
  310 + ['label' => 'Товары поставщиков', 'url' => ['details/index']],
  311 + ['label' => 'Кроссы', 'url' => ['details-crosses/index']],
312 ['label' => 'Бренды', 'url' => ['currency/index']], 312 ['label' => 'Бренды', 'url' => ['currency/index']],
313 ['label' => 'Марки авто', 'url' => ['currency/index']], 313 ['label' => 'Марки авто', 'url' => ['currency/index']],
314 ['label' => 'Статусы заказов', 'url' => ['currency/index']], 314 ['label' => 'Статусы заказов', 'url' => ['currency/index']],
@@ -319,6 +319,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -319,6 +319,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
319 ['label' => 'Офисы', 'url' => ['currency/index']], 319 ['label' => 'Офисы', 'url' => ['currency/index']],
320 ], 320 ],
321 ], 321 ],
  322 + ['label' => 'Справочник', 'url' => ['#'], 'items' => [
  323 + ['label' => 'Замены брендов', 'url' => ['currency/index']],
  324 + ],
  325 + ],
322 326
323 ], 327 ],
324 'submenuTemplate' => "\n<ul class='treeview-menu'>\n{items}\n</ul>\n", 328 'submenuTemplate' => "\n<ul class='treeview-menu'>\n{items}\n</ul>\n",
common/models/Currency.php
  Show/Hide comments   View file @2481f81
@@ -46,10 +46,10 @@ class Currency extends \yii\db\ActiveRecord @@ -46,10 +46,10 @@ class Currency extends \yii\db\ActiveRecord
46 { 46 {
47 return [ 47 return [
48 'id' => 'ID', 48 'id' => 'ID',
49 - 'name' => 'Name',  
50 - 'rate' => 'Rate', 49 + 'name' => 'Название',
  50 + 'rate' => 'Курс',
51 'is_default' => 'Is Default', 51 'is_default' => 'Is Default',
52 - 'timestamp' => 'Timestamp', 52 + 'timestamp' => 'Дата обновления',
53 ]; 53 ];
54 } 54 }
55 } 55 }