From 2cbb3bdcccf02743b6774a3b02529b1339c8257c Mon Sep 17 00:00:00 2001 From: Веталь Date: Wed, 14 Sep 2016 17:27:51 +0300 Subject: [PATCH] test commit --- backend/controllers/ArticlesController.php | 26 ++++++++++++++++++++++++-- backend/controllers/SliderImageController.php | 32 ++++++++++++++++++++++++++++++-- backend/views/banner/_form.php | 40 ++++++++++++++++++++-------------------- backend/views/bg/_form.php | 21 ++------------------- backend/views/brand/_form.php | 2 -- backend/views/brand/index.php | 7 +++---- backend/views/customer/_form.php | 5 ++++- backend/views/customer/index.php | 1 + backend/views/slider-image/_form.php | 1 - common/behaviors/SaveImgBehavior.php | 83 ----------------------------------------------------------------------------------- common/config/main.php | 14 +++++++++----- common/models/Articles.php | 16 +++++++++------- common/models/Banner.php | 16 ---------------- common/models/Basket.php | 14 +++++++------- common/models/Bg.php | 17 +---------------- common/models/Customer.php | 24 ++++++++++++++++++++++++ common/models/CustomerSearch.php | 10 ++++------ common/models/SliderImage.php | 26 ++++++-------------------- common/modules/comment/widgets/CommentWidget.php | 6 +++--- common/modules/product/models/Brand.php | 2 -- common/modules/product/widgets/views/product_smart.php | 99 ++++++++++++++++++++++++++++++++++++++------------------------------------------------------------- common/modules/product/widgets/views/products_block.php | 44 ++++++++++++++++++++++++++++---------------- composer.json | 1 - frontend/assets/AppAsset.php | 3 ++- frontend/controllers/CatalogController.php | 26 +++++++++++++------------- frontend/views/catalog/brand.php | 241 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/catalog/products.php | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- frontend/views/layouts/cabinet.php | 30 ++++++++++++++++-------------- frontend/views/layouts/main-menu.php | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/views/layouts/main.php | 673 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/partial/brand_list.php | 16 ---------------- frontend/views/partial/main-menu.php | 54 ------------------------------------------------------ frontend/views/site/index.php | 9 +++++++-- frontend/web/css/css_header.css | 1358 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/web/js/new_script.js | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/js/script.js | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/widgets/views/slider.php | 20 +++++++++++++++----- 37 files changed, 2312 insertions(+), 1579 deletions(-) delete mode 100644 common/behaviors/SaveImgBehavior.php delete mode 100755 frontend/views/catalog/brand.php create mode 100644 frontend/views/layouts/main-menu.php delete mode 100644 frontend/views/partial/brand_list.php delete mode 100755 frontend/views/partial/main-menu.php create mode 100644 frontend/web/js/new_script.js diff --git a/backend/controllers/ArticlesController.php b/backend/controllers/ArticlesController.php index 270a8e9..f2ef542 100755 --- a/backend/controllers/ArticlesController.php +++ b/backend/controllers/ArticlesController.php @@ -81,7 +81,18 @@ class ArticlesController extends Controller if ($model->load(Yii::$app->request->post())) { - $model->save(); + 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() && $image) { + $image->saveAs(Yii::getAlias('@storage/articles/' . $image->name)); + } return $this->redirect(['view', 'id' => $model->id]); } else { @@ -102,7 +113,18 @@ class ArticlesController extends Controller $model = $this->findModel($id); if ($model->load(Yii::$app->request->post())) { - $model->save(); + 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() && $image) { + $image->saveAs(Yii::getAlias('@storage/articles/' . $image->name)); + } return $this->redirect(['view', 'id' => $model->id]); } else { diff --git a/backend/controllers/SliderImageController.php b/backend/controllers/SliderImageController.php index b055c0d..a0009cd 100755 --- a/backend/controllers/SliderImageController.php +++ b/backend/controllers/SliderImageController.php @@ -85,7 +85,19 @@ class SliderImageController extends Controller if ($model->load(Yii::$app->request->post())) { $model->slider_id = $slider_id; - $model->save(); + 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); + } + + $image->saveAs(Yii::getAlias('@storage/slider/' . $image->name)); + } return $this->redirect(['view', 'slider_id'=>$slider_id, 'id' => $model->slider_image_id]); } else { @@ -114,7 +126,23 @@ class SliderImageController extends Controller - $model->save(); + 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)); + } return $this->redirect(['view', 'slider_id'=>$slider_id, 'id' => $model->slider_image_id]); } else { diff --git a/backend/views/banner/_form.php b/backend/views/banner/_form.php index ea230cb..0c8868a 100755 --- a/backend/views/banner/_form.php +++ b/backend/views/banner/_form.php @@ -12,10 +12,7 @@ use yii\widgets\ActiveForm;