Commit e3a12e2f37b5b536e80b334753a7867b5b3080e0
1 parent
499aac37
Export web interface
Showing
8 changed files
with
26 additions
and
30 deletions
Show diff stats
.gitignore
backend/config/main.php
| @@ -42,14 +42,15 @@ | @@ -42,14 +42,15 @@ | ||
| 42 | 'blog-tag' => 'artbox\weblog\controllers\TagController', | 42 | 'blog-tag' => 'artbox\weblog\controllers\TagController', |
| 43 | 'order' => 'artbox\order\controllers\OrderController', | 43 | 'order' => 'artbox\order\controllers\OrderController', |
| 44 | 'order-product' => 'artbox\order\controllers\OrderProductController', | 44 | 'order-product' => 'artbox\order\controllers\OrderProductController', |
| 45 | - 'label' => 'artbox\order\controllers\LabelController', | ||
| 46 | - 'delivery' => 'artbox\order\controllers\DeliveryController', | ||
| 47 | - 'payment' => 'artbox\order\controllers\PaymentController', | ||
| 48 | - 'sitemap' => 'artbox\core\controllers\SitemapController', | ||
| 49 | - 'comment' => [ | 45 | + 'label' => 'artbox\order\controllers\LabelController', |
| 46 | + 'delivery' => 'artbox\order\controllers\DeliveryController', | ||
| 47 | + 'payment' => 'artbox\order\controllers\PaymentController', | ||
| 48 | + 'sitemap' => 'artbox\core\controllers\SitemapController', | ||
| 49 | + 'comment' => [ | ||
| 50 | 'class' => 'artbox\webcomment\controllers\ManageController', | 50 | 'class' => 'artbox\webcomment\controllers\ManageController', |
| 51 | 'viewPath' => '@artbox/webcomment/views/manage', | 51 | 'viewPath' => '@artbox/webcomment/views/manage', |
| 52 | ], | 52 | ], |
| 53 | + 'export' => 'artbox\catalog\controllers\ExportController', | ||
| 53 | ], | 54 | ], |
| 54 | 'components' => [ | 55 | 'components' => [ |
| 55 | 'assetManager' => [ | 56 | 'assetManager' => [ |
backend/views/layouts/main.php
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | * @var View $this | 5 | * @var View $this |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | + use artbox\catalog\assets\CatalogAsset; | ||
| 8 | use artbox\core\assets\ArtboxCoreAsset; | 9 | use artbox\core\assets\ArtboxCoreAsset; |
| 9 | use artbox\core\models\User; | 10 | use artbox\core\models\User; |
| 10 | use artbox\core\models\UserData; | 11 | use artbox\core\models\UserData; |
| @@ -19,6 +20,7 @@ | @@ -19,6 +20,7 @@ | ||
| 19 | 20 | ||
| 20 | ArtboxCoreAsset::register($this); | 21 | ArtboxCoreAsset::register($this); |
| 21 | OrderAsset::register($this); | 22 | OrderAsset::register($this); |
| 23 | + CatalogAsset::register($this); | ||
| 22 | 24 | ||
| 23 | /** | 25 | /** |
| 24 | * @var User $user | 26 | * @var User $user |
backend/views/layouts/menu_items.php
| @@ -89,6 +89,11 @@ | @@ -89,6 +89,11 @@ | ||
| 89 | 'url' => [ 'import/index' ], | 89 | 'url' => [ 'import/index' ], |
| 90 | 'icon' => 'download', | 90 | 'icon' => 'download', |
| 91 | ], | 91 | ], |
| 92 | + [ | ||
| 93 | + 'label' => \Yii::t('catalog', 'Export'), | ||
| 94 | + 'url' => [ 'export/index' ], | ||
| 95 | + 'icon' => 'upload', | ||
| 96 | + ], | ||
| 92 | ], | 97 | ], |
| 93 | ], | 98 | ], |
| 94 | [ | 99 | [ |
| @@ -175,5 +180,13 @@ | @@ -175,5 +180,13 @@ | ||
| 175 | ], | 180 | ], |
| 176 | ], | 181 | ], |
| 177 | ], | 182 | ], |
| 183 | + [ | ||
| 184 | + 'label' => \Yii::t('catalog', 'Comments'), | ||
| 185 | + 'url' => [ 'comment/index' ], | ||
| 186 | + 'icon' => 'comment-o', | ||
| 187 | + 'active' => function () { | ||
| 188 | + return \Yii::$app->controller->id === 'comment'; | ||
| 189 | + }, | ||
| 190 | + ], | ||
| 178 | ] | 191 | ] |
| 179 | ); | 192 | ); |
| 180 | \ No newline at end of file | 193 | \ No newline at end of file |
23.4 KB
30.2 KB
console/config/main.php
| @@ -16,6 +16,7 @@ | @@ -16,6 +16,7 @@ | ||
| 16 | 'class' => 'yii\console\controllers\FixtureController', | 16 | 'class' => 'yii\console\controllers\FixtureController', |
| 17 | 'namespace' => 'common\fixtures', | 17 | 'namespace' => 'common\fixtures', |
| 18 | ], | 18 | ], |
| 19 | + 'export' => 'artbox\catalog\console\controllers\ExportXmlController', | ||
| 19 | ], | 20 | ], |
| 20 | 'components' => [ | 21 | 'components' => [ |
| 21 | 'log' => [ | 22 | 'log' => [ |
frontend/config/eauth.php
| @@ -26,30 +26,5 @@ | @@ -26,30 +26,5 @@ | ||
| 26 | 'class' => 'nodge\eauth\services\YahooOpenIDService', | 26 | 'class' => 'nodge\eauth\services\YahooOpenIDService', |
| 27 | //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. | 27 | //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. |
| 28 | ], | 28 | ], |
| 29 | - 'linkedin_oauth2' => [ | ||
| 30 | - // register your app here: https://www.linkedin.com/secure/developer | ||
| 31 | - 'class' => 'nodge\eauth\services\LinkedinOAuth2Service', | ||
| 32 | - 'clientId' => '86uay6912iwzn7', | ||
| 33 | - 'clientSecret' => 'IkOc8oMOlxkyNSfK', | ||
| 34 | - 'title' => 'LinkedIn (OAuth2)', | ||
| 35 | - ], | ||
| 36 | - 'github' => [ | ||
| 37 | - // register your app here: https://github.com/settings/applications | ||
| 38 | - 'class' => 'nodge\eauth\services\GitHubOAuth2Service', | ||
| 39 | - 'clientId' => '1a72fc01be1ecca28c76', | ||
| 40 | - 'clientSecret' => '188376ae0736133bdca9f4376a99a1cd2a6e6254', | ||
| 41 | - ], | ||
| 42 | - 'steam' => [ | ||
| 43 | - 'class' => 'nodge\eauth\services\SteamOpenIDService', | ||
| 44 | - //'realm' => '*.example.org', // your domain, can be with wildcard to authenticate on subdomains. | ||
| 45 | - 'apiKey' => 'ED8812C3AA509B94D4744AADBF4FDF49', | ||
| 46 | - // Optional. You can get it here: https://steamcommunity.com/dev/apikey | ||
| 47 | - ], | ||
| 48 | - 'instagram' => [ | ||
| 49 | - // register your app here: https://instagram.com/developer/register/ | ||
| 50 | - 'class' => 'nodge\eauth\services\InstagramOAuth2Service', | ||
| 51 | - 'clientId' => '7c3de0236bb4467bae58707012addce8', | ||
| 52 | - 'clientSecret' => 'bfcf8a5eb47d4998b6e3dd573777a857', | ||
| 53 | - ], | ||
| 54 | ], | 29 | ], |
| 55 | ]; | 30 | ]; |
| 56 | \ No newline at end of file | 31 | \ No newline at end of file |