Yarik / artbox-shop

Commit 6bab123fede3ab3cefd956463fec513129012591

Authored by Yarik
2 parents ee968c15 98b5afb8

Merge remote-tracking branch 'origin/master'

Showing 6 changed files with 39 additions and 33 deletions   Show diff stats
Inline Side-by-side
1 { 1 {
2 - "directory": "vendor/bower" 2 +
  3 + "directory" : "vendor/bower"
3 } 4 }
backend/tests/_bootstrap.php
  Show/Hide comments   View file @6bab123
1 <?php 1 <?php
2 - defined('YII_DEBUG') or define('YII_DEBUG', true);  
3 - defined('YII_ENV') or define('YII_ENV', 'test');  
4 - defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', __DIR__ . '/../../');  
5 -  
6 - require_once( YII_APP_BASE_PATH . '/vendor/autoload.php' );  
7 - require_once( YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php' );  
8 - require_once( YII_APP_BASE_PATH . '/common/config/bootstrap.php' );  
9 - require_once( __DIR__ . '/../config/bootstrap.php' ); 2 +
  3 +defined('YII_DEBUG') or define('YII_DEBUG', true);
  4 +defined('YII_ENV') or define('YII_ENV', 'test');
  5 +defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', __DIR__.'/../../');
  6 +
  7 +require_once(YII_APP_BASE_PATH . '/vendor/autoload.php');
  8 +require_once(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
  9 +require_once(YII_APP_BASE_PATH . '/common/config/bootstrap.php');
  10 +require_once(__DIR__ . '/../config/bootstrap.php');
backend/tests/functional/_bootstrap.php
  Show/Hide comments   View file @6bab123
1 <?php 1 <?php
2 - /**  
3 - * Here you can initialize variables via \Codeception\Util\Fixtures class  
4 - * to store data in global array and use it in Cests.  
5 - *  
6 - * ```php  
7 - * // Here _bootstrap.php  
8 - * \Codeception\Util\Fixtures::add('user1', ['name' => 'davert']);  
9 - * ```  
10 - *  
11 - * In Cests  
12 - *  
13 - * ```php  
14 - * \Codeception\Util\Fixtures::get('user1');  
15 - * ```  
16 - */  
17 \ No newline at end of file 2 \ No newline at end of file
  3 +
  4 +/**
  5 + * Here you can initialize variables via \Codeception\Util\Fixtures class
  6 + * to store data in global array and use it in Cests.
  7 + *
  8 + * ```php
  9 + * // Here _bootstrap.php
  10 + * \Codeception\Util\Fixtures::add('user1', ['name' => 'davert']);
  11 + * ```
  12 + *
  13 + * In Cests
  14 + *
  15 + * ```php
  16 + * \Codeception\Util\Fixtures::get('user1');
  17 + * ```
  18 + */
backend/views/layouts/menu_items.php
  Show/Hide comments   View file @6bab123
@@ -65,15 +65,20 @@ @@ -65,15 +65,20 @@
65 ], 65 ],
66 ], 66 ],
67 [ 67 [
68 - 'label' => \Yii::t('app', 'SEO'), 68 + 'label' => \Yii::t('app', 'Catalog'),
69 'url' => '#', 69 'url' => '#',
70 - 'icon' => 'bolt', 70 + 'icon' => 'tags',
71 'items' => [ 71 'items' => [
72 [ 72 [
73 - 'label' => \Yii::t('core', 'Category'), 73 + 'label' => \Yii::t('catalog', 'Categories'),
74 'url' => [ 'category/index' ], 74 'url' => [ 'category/index' ],
75 'icon' => 'file-text', 75 'icon' => 'file-text',
76 ], 76 ],
  77 + [
  78 + 'label' => \Yii::t('catalog', 'Products'),
  79 + 'url' => [ 'product/index' ],
  80 + 'icon' => 'gift',
  81 + ],
77 ], 82 ],
78 ], 83 ],
79 [ 84 [
backend/web/js/analytics.js
  Show/Hide comments   View file @6bab123
@@ -18,6 +18,8 @@ $( @@ -18,6 +18,8 @@ $(
18 var chart = AmCharts.makeChart( 18 var chart = AmCharts.makeChart(
19 "chartdiv", { 19 "chartdiv", {
20 "type": "serial", 20 "type": "serial",
  21 + "startDuration": 1,
  22 + "startEffect": "elastic",
21 'dataProvider': data.plot, 23 'dataProvider': data.plot,
22 'categoryField': 'day', 24 'categoryField': 'day',
23 'categoryAxis': { 25 'categoryAxis': {
common/config/main.php
  Show/Hide comments   View file @6bab123
@@ -27,10 +27,6 @@ @@ -27,10 +27,6 @@
27 'class' => 'yii\i18n\PhpMessageSource', 27 'class' => 'yii\i18n\PhpMessageSource',
28 'basePath' => '@artbox/core/messages', 28 'basePath' => '@artbox/core/messages',
29 ], 29 ],
30 - 'catalog' => [  
31 - 'class' => 'yii\i18n\PhpMessageSource',  
32 - 'basePath' => '@artbox/catalog/messages',  
33 - ],  
34 'app' => [ 30 'app' => [
35 'class' => 'yii\i18n\PhpMessageSource', 31 'class' => 'yii\i18n\PhpMessageSource',
36 'basePath' => '@common/messages', 32 'basePath' => '@common/messages',
@@ -54,8 +50,8 @@ @@ -54,8 +50,8 @@
54 ], 50 ],
55 'imagemanager' => [ 51 'imagemanager' => [
56 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', 52 'class' => 'noam148\imagemanager\components\ImageManagerGetPath',
57 - 'mediaPath' => dirname(dirname(__DIR__)) . '/common/images',  
58 - 'cachePath' => 'assets/images', 53 + 'mediaPath' => dirname(dirname(__DIR__)) . '/storage',
  54 + 'cachePath' => '../../storage/cache',
59 'useFilename' => true, 55 'useFilename' => true,
60 'absoluteUrl' => false, 56 'absoluteUrl' => false,
61 ], 57 ],