diff --git a/composer.json b/composer.json index 5004a33..4c9a9f7 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,9 @@ "require": { "php": ">=7.0", "yiisoft/yii2": "*", - "developeruz/yii2-db-rbac": "*" + "artweb/artbox": "dev-master", + "artweb/artbox/ecommerce": "dev-master", + "artweb/artbox/language": "dev-master" }, "autoload": { "psr-4": { diff --git a/controllers/BlogArticleController.php b/controllers/BlogArticleController.php index c5628f8..1939f13 100644 --- a/controllers/BlogArticleController.php +++ b/controllers/BlogArticleController.php @@ -4,7 +4,7 @@ use artweb\artbox\blog\models\BlogCategory; use artweb\artbox\blog\models\BlogTag; - use common\modules\product\models\Product; + use artweb\artbox\ecommerce\models\Product; use Yii; use artweb\artbox\blog\models\BlogArticle; use artweb\artbox\blog\models\BlogArticleSearch; diff --git a/models/BlogArticle.php b/models/BlogArticle.php index 2ad15f4..3e7376c 100644 --- a/models/BlogArticle.php +++ b/models/BlogArticle.php @@ -2,12 +2,12 @@ namespace artweb\artbox\blog\models; - use common\behaviors\SaveImgBehavior; + use artweb\artbox\behaviors\SaveImgBehavior; use yii\behaviors\TimestampBehavior; use yii\db\ActiveRecord; - use common\modules\language\behaviors\LanguageBehavior; - use common\modules\language\models\Language; - use common\modules\product\models\Product; + use artweb\artbox\language\behaviors\LanguageBehavior; + use artweb\artbox\language\models\Language; + use artweb\artbox\ecommerce\models\Product; use yii\db\ActiveQuery; use yii\web\Request; diff --git a/models/BlogArticleLang.php b/models/BlogArticleLang.php index 3e2af5c..40a9a44 100644 --- a/models/BlogArticleLang.php +++ b/models/BlogArticleLang.php @@ -2,7 +2,7 @@ namespace artweb\artbox\blog\models; - use common\modules\language\models\Language; + use artweb\artbox\language\models\Language; use yii\db\ActiveRecord; /** @@ -36,7 +36,7 @@ { return [ 'slug' => [ - 'class' => 'common\behaviors\Slug', + 'class' => 'artweb\artbox\behaviors\Slug', ], ]; } diff --git a/models/BlogCategory.php b/models/BlogCategory.php index d03e35b..d840f36 100644 --- a/models/BlogCategory.php +++ b/models/BlogCategory.php @@ -3,9 +3,9 @@ namespace artweb\artbox\blog\models; use yii\db\ActiveRecord; - use common\modules\language\behaviors\LanguageBehavior; - use common\behaviors\SaveImgBehavior; - use common\modules\language\models\Language; + use artweb\artbox\language\behaviors\LanguageBehavior; + use artweb\artbox\behaviors\SaveImgBehavior; + use artweb\artbox\language\models\Language; use yii\db\ActiveQuery; use yii\web\Request; @@ -77,7 +77,7 @@ 'class' => LanguageBehavior::className(), ], 'Slug' => [ - 'class' => 'common\behaviors\Slug', + 'class' => 'artweb\artbox\behaviors\Slug', ], ]; } diff --git a/models/BlogCategoryLang.php b/models/BlogCategoryLang.php index 53368b7..acef49c 100644 --- a/models/BlogCategoryLang.php +++ b/models/BlogCategoryLang.php @@ -3,7 +3,7 @@ namespace artweb\artbox\blog\models; use yii\db\ActiveRecord; - use common\modules\language\models\Language; + use artweb\artbox\language\models\Language; /** * This is the model class for table "blog_category_lang". @@ -35,7 +35,7 @@ { return [ 'slug' => [ - 'class' => 'common\behaviors\Slug', + 'class' => 'artweb\artbox\behaviors\Slug', ], ]; } diff --git a/models/BlogTag.php b/models/BlogTag.php index 5cf4c27..e8cf1b3 100644 --- a/models/BlogTag.php +++ b/models/BlogTag.php @@ -3,8 +3,8 @@ namespace artweb\artbox\blog\models; use yii\db\ActiveRecord; - use common\modules\language\behaviors\LanguageBehavior; - use common\modules\language\models\Language; + use artweb\artbox\language\behaviors\LanguageBehavior; + use artweb\artbox\language\models\Language; use yii\db\ActiveQuery; use yii\web\Request; diff --git a/models/BlogTagLang.php b/models/BlogTagLang.php index dd14be8..16b71c3 100644 --- a/models/BlogTagLang.php +++ b/models/BlogTagLang.php @@ -2,7 +2,7 @@ namespace artweb\artbox\blog\models; - use common\modules\language\models\Language; + use artweb\artbox\language\models\Language; use yii\db\ActiveRecord; /** diff --git a/views/blog-article/_form.php b/views/blog-article/_form.php index 4fcd766..663f81a 100644 --- a/views/blog-article/_form.php +++ b/views/blog-article/_form.php @@ -8,7 +8,7 @@ use yii\helpers\Html; use yii\web\View; use yii\widgets\ActiveForm; - use common\modules\language\widgets\LanguageForm; + use artweb\artbox\language\widgets\LanguageForm; use yii\web\JsExpression; /** @@ -92,7 +92,7 @@ 'gif', 'png', ], - 'initialPreview' => !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage( + 'initialPreview' => !empty( $model->imageUrl ) ? \artweb\artbox\components\artboximage\ArtboxImageHelper::getImage( $model->imageUrl, 'list' ) : '', diff --git a/views/blog-article/_form_language.php b/views/blog-article/_form_language.php index cd5583e..c31b756 100644 --- a/views/blog-article/_form_language.php +++ b/views/blog-article/_form_language.php @@ -1,6 +1,6 @@ !empty( $model->imageUrl ) ? \common\components\artboximage\ArtboxImageHelper::getImage( + 'initialPreview' => !empty( $model->imageUrl ) ? \artweb\artbox\components\artboximage\ArtboxImageHelper::getImage( $model->imageUrl, 'list' ) : '', diff --git a/views/blog-category/_form_language.php b/views/blog-category/_form_language.php index 7da5d86..7d32781 100644 --- a/views/blog-category/_form_language.php +++ b/views/blog-category/_form_language.php @@ -1,6 +1,6 @@