diff --git a/composer.json b/composer.json index 99303bf..482df1d 100755 --- a/composer.json +++ b/composer.json @@ -35,7 +35,12 @@ "bower-asset/amcharts": "@dev", "bower-asset/pnotify": "@dev", "kartik-v/yii2-widget-colorinput": "*", - "kartik-v/yii2-widget-datepicker": "@dev" + "kartik-v/yii2-widget-datepicker": "@dev", + "artweb/artbox-core": "@dev", + "artweb/artbox-weblog": "@dev", + "artweb/artbox-order": "*", + "artweb/artbox-catalog": "@dev" + }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", @@ -60,5 +65,24 @@ "artbox\\order\\": "artweb/artbox-order/", "artbox\\weblog\\": "artweb/artbox-weblog/" } - } + }, + "repositories": [ + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core.git" + }, + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-catalog.git" + }, + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:Alexey/artbox-weblog.git" + }, + { + "type": "vcs", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-order.git" + } + + ] } diff --git a/composer.lock b/composer.lock index 7bb0273..e900c1e 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "2651b25db443214aeb94e495e1ce3d28", + "content-hash": "fd2019a6d9ac39b40a322f4c07cd03ae", "packages": [ { "name": "2amigos/yii2-tinymce-widget", @@ -67,6 +67,110 @@ "time": "2017-06-09T14:12:14+00:00" }, { + "name": "artweb/artbox-catalog", + "version": "v0.0.3-stable", + "source": { + "type": "git", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-catalog.git", + "reference": "78ed441d336057422c57d94198a59724be3dba5b" + }, + "require": { + "php": ">=7.0", + "yiisoft/yii2": "~2.0" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "artbox\\catalog\\": "" + } + }, + "license": [ + "BSD-3-Clause" + ], + "description": "Artbox catalog extension", + "time": "2017-05-19T09:02:58+00:00" + }, + { + "name": "artweb/artbox-core", + "version": "dev-master", + "source": { + "type": "git", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core.git", + "reference": "75bc9b4f6821a05d495a91cee26ceff5efc760e2" + }, + "require": { + "2amigos/yii2-tinymce-widget": "~1.0", + "bower-asset/amcharts": "*", + "kartik-v/yii2-widget-fileinput": "*", + "php": ">=7.0", + "yiisoft/yii2": "~2.0", + "yiisoft/yii2-bootstrap": "~2.0", + "yiisoft/yii2-imagine": "~2.0", + "yiisoft/yii2-swiftmailer": "~2.0", + "yiister/yii2-gentelella": "~1.0" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "artbox\\core\\": "" + } + }, + "license": [ + "BSD-3-Clause" + ], + "description": "Artbox core extension", + "time": "2017-09-20 11:55:11" + }, + { + "name": "artweb/artbox-order", + "version": "v0.0.1-stable", + "source": { + "type": "git", + "url": "git@gitlab.artweb.com.ua:yarik.nechyporuk/artbox-order.git", + "reference": "32fd1c884de9e36d07b7e8f35cfe5f2279c55eec" + }, + "require": { + "php": ">=7.0", + "yiisoft/yii2": "~2.0" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "artbox\\order\\": "" + } + }, + "license": [ + "BSD-3-Clause" + ], + "description": "Artbox order extension", + "time": "2017-05-18T14:42:03+00:00" + }, + { + "name": "artweb/artbox-weblog", + "version": "dev-master", + "source": { + "type": "git", + "url": "git@gitlab.artweb.com.ua:Alexey/artbox-weblog.git", + "reference": "420d8fd52ac4482d9e0c22e636298b7ce430bfe1" + }, + "require": { + "php": ">=7.0", + "yiisoft/yii2": "~2.0", + "yiisoft/yii2-bootstrap": "~2.0" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "artbox\\weblog\\": "" + } + }, + "license": [ + "BSD-3-Clause" + ], + "description": "Artbox blog support extension", + "time": "2017-09-18 15:38:17" + }, + { "name": "bower-asset/amcharts", "version": "dev-master", "source": { @@ -87,7 +191,7 @@ "dev-master": "3.18.5-dev" } }, - "time": "2016-01-04T17:22:55+00:00" + "time": "2016-01-04 17:22:55" }, { "name": "bower-asset/amcharts-stock", @@ -110,7 +214,7 @@ "dev-master": "3.13.0-dev" } }, - "time": "2015-01-28T07:40:20+00:00" + "time": "2015-01-28 07:40:20" }, { "name": "bower-asset/bootstrap", @@ -159,8 +263,7 @@ "mobile-first", "responsive", "web" - ], - "time": "2016-07-25T15:51:55+00:00" + ] }, { "name": "bower-asset/gentelella", @@ -254,8 +357,7 @@ "responsive", "template", "theme" - ], - "time": "2017-01-25T13:54:24+00:00" + ] }, { "name": "bower-asset/icheck", @@ -305,8 +407,7 @@ "replacement", "skins", "ui" - ], - "time": "2014-03-03T17:36:28+00:00" + ] }, { "name": "bower-asset/jquery", @@ -337,8 +438,7 @@ "javascript", "jquery", "library" - ], - "time": "2016-05-20T17:24:43+00:00" + ] }, { "name": "bower-asset/jquery.inputmask", @@ -397,8 +497,7 @@ "jquery", "mask", "plugins" - ], - "time": "2017-08-24T08:08:54+00:00" + ] }, { "name": "bower-asset/pnotify", @@ -460,8 +559,7 @@ "LGPL-3.0", "MPL-1.1" ], - "description": "JavaScript notification plugin.", - "time": "2015-09-03T02:29:56+00:00" + "description": "JavaScript notification plugin." }, { "name": "bower-asset/punycode", @@ -489,8 +587,7 @@ "node_modules", "package.json" ] - }, - "time": "2014-10-22T12:02:42+00:00" + } }, { "name": "bower-asset/yii2-pjax", @@ -524,8 +621,7 @@ }, "license": [ "MIT" - ], - "time": "2016-03-04T13:24:47+00:00" + ] }, { "name": "cebe/markdown", @@ -1565,7 +1661,7 @@ "widget", "yii2" ], - "time": "2017-09-06T06:18:08+00:00" + "time": "2017-09-06 06:18:08" }, { "name": "kartik-v/yii2-widget-fileinput", @@ -1673,7 +1769,7 @@ "widget", "yii2" ], - "time": "2017-09-04T15:30:52+00:00" + "time": "2017-09-04 15:30:52" }, { "name": "monolog/monolog", @@ -2825,8 +2921,7 @@ "type": "bower-asset-library", "extra": { "bower-asset-main": "dist/typeahead.bundle.js" - }, - "time": "2015-04-27T04:02:14+00:00" + } }, { "name": "codeception/base", @@ -5210,7 +5305,10 @@ "kartik-v/yii2-widget-select2": 20, "bower-asset/amcharts": 20, "bower-asset/pnotify": 20, - "kartik-v/yii2-widget-datepicker": 20 + "kartik-v/yii2-widget-datepicker": 20, + "artweb/artbox-core": 20, + "artweb/artbox-weblog": 20, + "artweb/artbox-catalog": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/console/migrations/m170920_133344_create_article_to_product_table.php b/console/migrations/m170920_133344_create_article_to_product_table.php new file mode 100644 index 0000000..bc5df98 --- /dev/null +++ b/console/migrations/m170920_133344_create_article_to_product_table.php @@ -0,0 +1,45 @@ +createTable('article_to_product', [ + 'article_id' => $this->integer(), + 'product_id'=> $this->integer() + ]); + $this->addPrimaryKey('article_to_product_pk', 'article_to_product', ['article_id', 'product_id']); + + $this->addForeignKey('article_to_product_article_fk', + 'article_to_product', + 'article_id', + 'blog_article', + 'id', + 'CASCADE'); + $this->addForeignKey('article_to_product_product_fk', + 'article_to_product', + 'product_id', + 'product', + 'id', + 'CASCADE'); + } + + /** + * @inheritdoc + */ + public function down() + { + $this->dropForeignKey('article_to_product_article_fk', 'article_to_product'); + $this->dropForeignKey('article_to_product_product_fk', 'article_to_product'); + + $this->dropTable('article_to_product'); + } +} -- libgit2 0.21.4