diff --git a/backend/controllers/ArticlesController.php b/backend/controllers/ArticlesController.php index 18d0a67..aaf9835 100644 --- a/backend/controllers/ArticlesController.php +++ b/backend/controllers/ArticlesController.php @@ -86,17 +86,7 @@ $model_langs = $model->generateLangs(); if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); - if(( $image = UploadedFile::getInstance($model, 'image') )) { - $model->image = $image->name; - } - $imgDir = Yii::getAlias('@storage/articles/'); - if(!is_dir($imgDir)) { - mkdir($imgDir, 0755, true); - } if($model->save()) { - if($image) { - $image->saveAs(Yii::getAlias('@storage/articles/' . $image->name)); - } if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', @@ -130,17 +120,7 @@ $model_langs = $model->generateLangs(); if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); - if(( $image = UploadedFile::getInstance($model, 'image') )) { - $model->image = $image->name; - } - $imgDir = Yii::getAlias('@storage/articles/'); - if(!is_dir($imgDir)) { - mkdir($imgDir, 0755, true); - } if($model->save()) { - if($image) { - $image->saveAs(Yii::getAlias('@storage/articles/' . $image->name)); - } if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', diff --git a/backend/controllers/BannerController.php b/backend/controllers/BannerController.php index b20f9ad..c58fba4 100644 --- a/backend/controllers/BannerController.php +++ b/backend/controllers/BannerController.php @@ -2,7 +2,6 @@ namespace backend\controllers; - use common\modules\file\widgets\ImageUploader; use Yii; use common\models\Banner; use common\models\BannerSearch; diff --git a/backend/controllers/BgController.php b/backend/controllers/BgController.php index 894d2c4..589c5fe 100644 --- a/backend/controllers/BgController.php +++ b/backend/controllers/BgController.php @@ -119,7 +119,7 @@ $model_langs = $model->generateLangs(); if($model->load(Yii::$app->request->post()) && $model->save()) { - $model->loadLangs(\Yii::$app->request); + $model->loadLangs(\Yii::$app->request, $model_langs); if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', diff --git a/backend/controllers/BrandController.php b/backend/controllers/BrandController.php index 1915924..f105d03 100644 --- a/backend/controllers/BrandController.php +++ b/backend/controllers/BrandController.php @@ -9,7 +9,6 @@ use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; - use yii\web\UploadedFile; /** * BrandController implements the CRUD actions for Brand model. diff --git a/backend/controllers/CategoryController.php b/backend/controllers/CategoryController.php index c3dd0ef..3d2a8d5 100644 --- a/backend/controllers/CategoryController.php +++ b/backend/controllers/CategoryController.php @@ -88,14 +88,8 @@ if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); - if(( $image = UploadedFile::getInstance($model, 'imageUpload') )) { - $model->image = $image->name; - } if($model->save()) { - if($image) { - $image->saveAs(Yii::getAlias('@imagesDir/categories/' . $image->name)); - } if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return is_null(Yii::$app->request->post('create_and_new')) ? $this->redirect([ @@ -117,7 +111,7 @@ 'model' => $model, 'model_langs' => $model_langs, 'categories' => ArtboxTreeHelper::treeMap(Category::find() - ->getTree(), 'category_id', 'name', '.'), + ->getTree(), 'category_id', 'category_id', '.'), ]); } @@ -136,14 +130,8 @@ $model_langs = $model->generateLangs(); if($model->load(Yii::$app->request->post())) { - if(( $image = UploadedFile::getInstance($model, 'imageUpload') )) { - $model->image = $image->name; - } $model->loadLangs(\Yii::$app->request, $model_langs); if($model->save()) { - if($image) { - $image->saveAs(Yii::getAlias('@imagesDir/categories/' . $image->name)); - } if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', @@ -156,7 +144,7 @@ 'model' => $model, 'model_langs' => $model_langs, 'categories' => ArtboxTreeHelper::treeMap(Category::find() - ->getTree(), 'category_id', 'name', '.'), + ->getTree(), 'category_id', 'category_id', '.'), ]); } diff --git a/backend/controllers/EventController.php b/backend/controllers/EventController.php index 4e3b0d6..dece42b 100644 --- a/backend/controllers/EventController.php +++ b/backend/controllers/EventController.php @@ -9,7 +9,6 @@ use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use developeruz\db_rbac\behaviors\AccessBehavior; - use yii\web\UploadedFile; /** * EventController implements the CRUD actions for Event model. @@ -89,14 +88,7 @@ $model->loadLangs(\Yii::$app->request, $model_langs); - if(( $image = UploadedFile::getInstance($model, 'imageUpload') )) { - $model->image = $image->name; - } - if($model->save()) { - if($image) { - $image->saveAs(Yii::getAlias('@imagesDir/articles/' . $image->name)); - } if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', @@ -133,14 +125,7 @@ $model->loadLangs(\Yii::$app->request, $model_langs); - if(( $image = UploadedFile::getInstance($model, 'imageUpload') )) { - $model->image = $image->name; - } - if($model->save()) { - if($image) { - $image->saveAs(Yii::getAlias('@imagesDir/articles/' . $image->name)); - } if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', diff --git a/backend/controllers/ProjectController.php b/backend/controllers/ProjectController.php index fc963cb..20380b8 100644 --- a/backend/controllers/ProjectController.php +++ b/backend/controllers/ProjectController.php @@ -201,8 +201,9 @@ $project = $this->findModel($id); $model = new ProductToProject(); $products = Product::find() + ->distinct() ->select([ - 'product.name', + 'product.product_id', 'product.product_id', ]) ->joinWith('variants', true, 'INNER JOIN') @@ -221,7 +222,6 @@ if(!empty( $model->product_id ) && !empty( $products[ $model->product_id ] )) { $variants = ProductVariant::find() ->select([ - 'name', 'product_variant_id', ]) ->where([ 'product_id' => $model->product_id ]) @@ -261,7 +261,7 @@ } $products = Product::find() ->select([ - 'product.name', + 'product.product_id', 'product.product_id', ]) ->joinWith('variants', true, 'INNER JOIN') @@ -272,7 +272,6 @@ if(!empty( $model->product_id ) && !empty( $products[ $model->product_id ] )) { $variants = ProductVariant::find() ->select([ - 'name', 'product_variant_id', ]) ->where([ 'product_id' => $model->product_id ]) diff --git a/backend/controllers/SliderImageController.php b/backend/controllers/SliderImageController.php index 675daa1..6a792c8 100644 --- a/backend/controllers/SliderImageController.php +++ b/backend/controllers/SliderImageController.php @@ -10,7 +10,6 @@ use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - use yii\web\UploadedFile; /** * SliderImageController implements the CRUD actions for SliderImage model. @@ -97,38 +96,29 @@ if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); $model->slider_id = $slider_id; - if(( $image = UploadedFile::getInstance($model, 'image') )) { - $model->image = $image->name; - } - if($model->save() && $image) { - $imgDir = Yii::getAlias('@storage/slider/'); - if(!is_dir($imgDir)) { - mkdir($imgDir, 0755, true); + if($model->save()) { + if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { + return $this->redirect([ + 'view', + 'slider_id' => $slider_id, + 'id' => $model->slider_image_id, + ]); + } else { + return $this->redirect([ + 'update', + 'slider_id' => $slider_id, + 'id' => $model->slider_image_id, + ]); } - $image->saveAs(Yii::getAlias('@storage/slider/' . $image->name)); - } - if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { - return $this->redirect([ - 'view', - 'slider_id' => $slider_id, - 'id' => $model->slider_image_id, - ]); - } else { - return $this->redirect([ - 'update', - 'slider_id' => $slider_id, - 'id' => $model->slider_image_id, - ]); } - } else { - $slider = Slider::findOne($slider_id); - return $this->render('create', [ - 'slider_id' => $slider_id, - 'model' => $model, - 'model_langs' => $model_langs, - 'slider' => $slider, - ]); } + $slider = Slider::findOne($slider_id); + return $this->render('create', [ + 'slider_id' => $slider_id, + 'model' => $model, + 'model_langs' => $model_langs, + 'slider' => $slider, + ]); } /** @@ -146,20 +136,7 @@ $model_langs = $model->generateLangs(); if($model->load(Yii::$app->request->post())) { $model->loadLangs(\Yii::$app->request, $model_langs); - if(( $image = UploadedFile::getInstance($model, 'image') )) { - $model->image = $image->name; - } - if(!$model->image) { - $model->image = $model->getOldAttribute('image'); - } - if($model->save() && $image) { - $imgDir = Yii::getAlias('@storage/slider/'); - if(!is_dir($imgDir)) { - mkdir($imgDir, 0755, true); - } - $image->saveAs(Yii::getAlias('@storage/slider/' . $image->name)); - } - if($model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { + if($model->save() && $model->linkLangs($model_langs) && $model->saveLangs($model_langs)) { return $this->redirect([ 'view', 'slider_id' => $slider_id, diff --git a/backend/models/Label.php b/backend/models/Label.php index bcf0b24..98d0d73 100644 --- a/backend/models/Label.php +++ b/backend/models/Label.php @@ -11,9 +11,9 @@ use yii\web\Request; * Class Label * * * From language behavior * - * @property {TableLang} $lang - * @property {TableLang}[] $langs - * @property {TableLang} $object_lang + * @property OrdersLabelLang $lang + * @property OrdersLabelLang[] $langs + * @property OrdersLabelLang $object_lang * @property string $ownerKey * @property string $langKey * @method string getOwnerKey() @@ -22,7 +22,7 @@ use yii\web\Request; * @method void setLangKey(string $value) * @method ActiveQuery getLangs() * @method ActiveQuery getLang( integer $language_id ) - * @method {TableLang}[] generateLangs() + * @method OrdersLabelLang[] generateLangs() * @method void loadLangs(Request $request, ActiveRecord[] $model_langs) * @method bool linkLangs(ActiveRecord[] $model_langs) * @method bool saveLangs(ActiveRecord[] $model_langs) @@ -44,8 +44,4 @@ class Label extends \yii\db\ActiveRecord ], ]; } - - public function getNl(){ - return $this->name; - } } diff --git a/backend/views/articles/_form.php b/backend/views/articles/_form.php index b615fbb..07698f5 100644 --- a/backend/views/articles/_form.php +++ b/backend/views/articles/_form.php @@ -29,31 +29,9 @@ ->widget(DatePicker::className(), [ 'dateFormat' => 'dd-MM-yyyy', ]) ?> - field($model, 'title') - ->textInput([ 'maxlength' => true ]) ?> - - field($model, 'body') - ->widget(CKEditor::className(), [ - 'editorOptions' => ElFinder::ckeditorOptions('elfinder', [ - 'preset' => 'full', - 'inline' => false, - 'filebrowserUploadUrl' => Yii::$app->getUrlManager() - ->createUrl('file/uploader/images-upload'), - ]), - ]) ?> - - field($model, 'body_preview') - ->widget(CKEditor::className(), [ - 'editorOptions' => ElFinder::ckeditorOptions('elfinder', [ - 'preset' => 'full', - 'inline' => false, - 'filebrowserUploadUrl' => Yii::$app->getUrlManager() - ->createUrl('file/uploader/images-upload'), - ]), - ]) ?> field($model, 'image') - ->widget(\kartik\file\FileInput::classname(), [ + ->widget(\kartik\file\FileInput::className(), [ 'language' => 'ru', 'options' => [ 'accept' => 'image/*', @@ -73,24 +51,6 @@ ], ]); ?> - field($model, 'translit') - ->textInput([ 'maxlength' => true ]) ?> - - field($model, 'meta_title') - ->textInput([ 'maxlength' => true ]) ?> - - field($model, 'meta_keywords') - ->textInput([ 'maxlength' => true ]) ?> - - field($model, 'meta_description') - ->textInput([ 'maxlength' => true ]) ?> - - field($model, 'seo_text') - ->textarea([ 'rows' => 6 ]) ?> - - field($model, 'h1') - ->textInput([ 'maxlength' => true ]) ?> - $model_langs, diff --git a/backend/views/articles/_form_language.php b/backend/views/articles/_form_language.php index 9f280fa..8ad752c 100644 --- a/backend/views/articles/_form_language.php +++ b/backend/views/articles/_form_language.php @@ -15,6 +15,8 @@ ?> field($model_lang, '[' . $language->language_id . ']title') ->textInput([ 'maxlength' => true ]); ?> +field($model_lang, '[' . $language->language_id . ']alias') + ->textInput([ 'maxlength' => true ]); ?> field($model_lang, '[' . $language->language_id . ']body') ->widget(CKEditor::className(), [ 'editorOptions' => ElFinder::ckeditorOptions('elfinder', [ diff --git a/backend/views/articles/create.php b/backend/views/articles/create.php index 33777c0..2e4d10e 100644 --- a/backend/views/articles/create.php +++ b/backend/views/articles/create.php @@ -9,9 +9,9 @@ * @var Articles $model * @var ArticlesLang[] $model_langs */ - $this->title = 'Create Articles'; + $this->title = \Yii::t('app', 'Create Articles'); $this->params[ 'breadcrumbs' ][] = [ - 'label' => 'Articles', + 'label' => \Yii::t('app', 'Articles'), 'url' => [ 'index' ], ]; $this->params[ 'breadcrumbs' ][] = $this->title; diff --git a/backend/views/articles/index.php b/backend/views/articles/index.php index f97b4d3..7d2856a 100644 --- a/backend/views/articles/index.php +++ b/backend/views/articles/index.php @@ -7,34 +7,22 @@ use yii\grid\GridView; /* @var $searchModel common\models\ArticlesSearch */ /* @var $dataProvider yii\data\ActiveDataProvider */ -$this->title = 'Articles'; +$this->title = \Yii::t('app', 'Articles'); $this->params['breadcrumbs'][] = $this->title; ?> -
- -

title) ?>

- render('_search', ['model' => $searchModel]); ?> - +
+

title) ?>

- 'btn btn-success']) ?> + 'btn btn-success']) ?>

$dataProvider, 'filterModel' => $searchModel, 'columns' => [ ['class' => 'yii\grid\SerialColumn'], - 'id', 'date', - 'title', - 'image', - // 'translit', - // 'meta_title', - // 'meta_keywords', - // 'meta_description', - // 'seo_text:ntext', - // 'h1', - + 'imageUrl:image', ['class' => 'yii\grid\ActionColumn'], ], ]); ?> diff --git a/backend/views/articles/update.php b/backend/views/articles/update.php index 5c7a71c..20b26de 100644 --- a/backend/views/articles/update.php +++ b/backend/views/articles/update.php @@ -9,19 +9,19 @@ * @var Articles $model * @var ArticlesLang[] $model_langs */ - $this->title = 'Update Articles: ' . $model->title; + $this->title = \Yii::t('app', 'Update Articles').': ' . $model->id; $this->params[ 'breadcrumbs' ][] = [ - 'label' => 'Articles', + 'label' => \Yii::t('app', 'Articles'), 'url' => [ 'index' ], ]; $this->params[ 'breadcrumbs' ][] = [ - 'label' => $model->title, + 'label' => $model->id, 'url' => [ 'view', 'id' => $model->id, ], ]; - $this->params[ 'breadcrumbs' ][] = 'Update'; + $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Update'); ?>
diff --git a/backend/views/articles/view.php b/backend/views/articles/view.php index 23ccbc5..ce6f4cb 100644 --- a/backend/views/articles/view.php +++ b/backend/views/articles/view.php @@ -6,37 +6,27 @@ use yii\widgets\DetailView; /* @var $this yii\web\View */ /* @var $model common\models\Articles */ -$this->title = $model->title; -$this->params['breadcrumbs'][] = ['label' => 'Articles', 'url' => ['index']]; +$this->title = $model->id; +$this->params['breadcrumbs'][] = ['label' => \Yii::t('app', 'Articles'), 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; ?> -
- -

title) ?>

- +
+

title) ?>

- $model->id], ['class' => 'btn btn-primary']) ?> - $model->id], [ + $model->id], ['class' => 'btn btn-primary']) ?> + $model->id], [ 'class' => 'btn btn-danger', 'data' => [ - 'confirm' => 'Are you sure you want to delete this item?', + 'confirm' => \Yii::t('app', 'Are you sure you want to delete this item?'), 'method' => 'post', ], ]) ?>

- $model, 'attributes' => [ 'id', 'date', - 'title', - 'translit', - 'meta_title', - 'meta_keywords', - 'meta_description', - 'h1', ], ]) ?> -
diff --git a/backend/views/banner/_form.php b/backend/views/banner/_form.php index 1f5aa23..cade5cd 100644 --- a/backend/views/banner/_form.php +++ b/backend/views/banner/_form.php @@ -2,7 +2,6 @@ use common\models\Banner; use common\models\BannerLang; - use common\modules\file\widgets\ImageUploader; use common\modules\language\widgets\LanguageForm; use kartik\select2\Select2; use yii\helpers\Html; @@ -25,12 +24,6 @@ ], ]); ?> - field($model, 'alt') - ->textInput([ 'maxlength' => true ]) ?> - - field($model, 'title') - ->textInput([ 'maxlength' => true ]) ?> - field($model, 'url') ->textInput([ 'maxlength' => true ]) ?> @@ -39,10 +32,10 @@ 'name' => 'status', 'hideSearch' => true, 'data' => [ - 1 => 'Active', - 2 => 'Inactive', + 1 => \Yii::t('app', 'Active'), + 2 => \Yii::t('app', 'Inactive'), ], - 'options' => [ 'placeholder' => 'Select status...' ], + 'options' => [ 'placeholder' => \Yii::t('app', 'Select status...') ], 'pluginOptions' => [ 'allowClear' => true, ], diff --git a/backend/views/banner/index.php b/backend/views/banner/index.php index a6ecfc8..b9648c6 100644 --- a/backend/views/banner/index.php +++ b/backend/views/banner/index.php @@ -1,37 +1,32 @@ title = Yii::t('app', 'Banners'); -$this->params['breadcrumbs'][] = $this->title; + + use yii\helpers\Html; + use yii\grid\GridView; + + /* @var $this yii\web\View */ + /* @var $searchModel common\models\BannerSearch */ + /* @var $dataProvider yii\data\ActiveDataProvider */ + + $this->title = Yii::t('app', 'Banners'); + $this->params[ 'breadcrumbs' ][] = $this->title; ?> diff --git a/backend/views/banner/update.php b/backend/views/banner/update.php index 5b79eb5..eb25ccf 100644 --- a/backend/views/banner/update.php +++ b/backend/views/banner/update.php @@ -13,13 +13,13 @@ $this->title = Yii::t('app', 'Update {modelClass}: ', [ 'modelClass' => 'Banner', - ]) . $model->title; + ]) . $model->banner_id; $this->params[ 'breadcrumbs' ][] = [ 'label' => Yii::t('app', 'Banners'), 'url' => [ 'index' ], ]; $this->params[ 'breadcrumbs' ][] = [ - 'label' => $model->title, + 'label' => $model->banner_id, 'url' => [ 'view', 'id' => $model->banner_id, diff --git a/backend/views/banner/view.php b/backend/views/banner/view.php index 9200c04..65b7040 100644 --- a/backend/views/banner/view.php +++ b/backend/views/banner/view.php @@ -1,38 +1,44 @@ title = $model->title; -$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Banners'), 'url' => ['index']]; -$this->params['breadcrumbs'][] = $this->title; + + use yii\helpers\Html; + use yii\widgets\DetailView; + + /* @var $this yii\web\View */ + /* @var $model common\models\Banner */ + + $this->title = $model->banner_id; + $this->params[ 'breadcrumbs' ][] = [ + 'label' => Yii::t('app', 'Banners'), + 'url' => [ 'index' ], + ]; + $this->params[ 'breadcrumbs' ][] = $this->title; ?>