diff --git a/.gitignore b/.gitignore index 7560254..9e49b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ phpunit.phar /frontend/web/assets/ /frontend/web/css/node_modules/ composer.lock + +tests/_output/* \ No newline at end of file diff --git a/24032016_0400.sql b/24032016_0400.sql old mode 100644 new mode 100755 index db49615..db49615 --- a/24032016_0400.sql +++ b/24032016_0400.sql diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 index e98f03d..e98f03d --- a/LICENSE.md +++ b/LICENSE.md diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 45e56ad..45e56ad --- a/README.md +++ b/README.md diff --git a/backend/assets/AdminLteAsset.php b/backend/assets/AdminLteAsset.php old mode 100644 new mode 100755 index 758a62a..758a62a --- a/backend/assets/AdminLteAsset.php +++ b/backend/assets/AdminLteAsset.php diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php old mode 100644 new mode 100755 index bb15c3c..bb15c3c --- a/backend/assets/AppAsset.php +++ b/backend/assets/AppAsset.php diff --git a/backend/assets/FontAwesomeAsset.php b/backend/assets/FontAwesomeAsset.php old mode 100644 new mode 100755 index 72d6f21..72d6f21 --- a/backend/assets/FontAwesomeAsset.php +++ b/backend/assets/FontAwesomeAsset.php diff --git a/backend/config/.gitignore b/backend/config/.gitignore old mode 100644 new mode 100755 index 20da318..20da318 --- a/backend/config/.gitignore +++ b/backend/config/.gitignore diff --git a/backend/config/bootstrap.php b/backend/config/bootstrap.php old mode 100644 new mode 100755 index b3d9bbc..b3d9bbc --- a/backend/config/bootstrap.php +++ b/backend/config/bootstrap.php diff --git a/backend/config/main.php b/backend/config/main.php old mode 100644 new mode 100755 index c6eadcc..cb6ead6 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -54,6 +54,17 @@ return [ 'adminUrl' => '/admin' ], + 'urlManager' => [ + 'baseUrl' => '/admin', + 'enablePrettyUrl' => true, + 'showScriptName' => false, + 'rules' => [ + 'slider-image///' => 'slider-image/', + 'slider-image//' => 'slider-image/', + + + ] + ] ], 'params' => $params, diff --git a/backend/config/params.php b/backend/config/params.php old mode 100644 new mode 100755 index 7f754b9..7f754b9 --- a/backend/config/params.php +++ b/backend/config/params.php diff --git a/backend/controllers/BannerController.php b/backend/controllers/BannerController.php new file mode 100755 index 0000000..e0dc8a4 --- /dev/null +++ b/backend/controllers/BannerController.php @@ -0,0 +1,145 @@ + [ + 'class' => VerbFilter::className(), + 'actions' => [ + 'delete' => ['POST'], + ], + ], + ]; + } + + /** + * Lists all Banner models. + * @return mixed + */ + public function actionIndex() + { + $searchModel = new BannerSearch(); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + + return $this->render('index', [ + 'searchModel' => $searchModel, + 'dataProvider' => $dataProvider, + ]); + } + + public function actionSaveImageSettings(){ + \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON; + $width = Yii::$app->request->post('width'); + $height = Yii::$app->request->post('height'); + + $html = ImageUploader::widget([ + 'model'=> new Banner(), + 'field'=>'image', + 'size' => [ + [ + 'width'=>$width, + 'height'=>$height, + ], + ], + 'name' => "Загрузить баннер" + ]); + + return ['html'=>$html]; + } + + /** + * Displays a single Banner model. + * @param integer $id + * @return mixed + */ + public function actionView($id) + { + return $this->render('view', [ + 'model' => $this->findModel($id), + ]); + } + + /** + * Creates a new Banner model. + * If creation is successful, the browser will be redirected to the 'view' page. + * @return mixed + */ + public function actionCreate() + { + $model = new Banner(); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->banner_id]); + } else { + return $this->render('create', [ + 'model' => $model, + ]); + } + } + + /** + * Updates an existing Banner model. + * If update is successful, the browser will be redirected to the 'view' page. + * @param integer $id + * @return mixed + */ + public function actionUpdate($id) + { + $model = $this->findModel($id); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->banner_id]); + } else { + return $this->render('update', [ + 'model' => $model, + ]); + } + } + + /** + * Deletes an existing Banner model. + * If deletion is successful, the browser will be redirected to the 'index' page. + * @param integer $id + * @return mixed + */ + public function actionDelete($id) + { + $this->findModel($id)->delete(); + + return $this->redirect(['index']); + } + + /** + * Finds the Banner model based on its primary key value. + * If the model is not found, a 404 HTTP exception will be thrown. + * @param integer $id + * @return Banner the loaded model + * @throws NotFoundHttpException if the model cannot be found + */ + protected function findModel($id) + { + if (($model = Banner::findOne($id)) !== null) { + return $model; + } else { + throw new NotFoundHttpException('The requested page does not exist.'); + } + } +} diff --git a/backend/controllers/BlogController.php b/backend/controllers/BlogController.php old mode 100644 new mode 100755 index 442fd7e..442fd7e --- a/backend/controllers/BlogController.php +++ b/backend/controllers/BlogController.php diff --git a/backend/controllers/BrandController.php b/backend/controllers/BrandController.php old mode 100644 new mode 100755 index d3eb8c2..d3eb8c2 --- a/backend/controllers/BrandController.php +++ b/backend/controllers/BrandController.php diff --git a/backend/controllers/CategoryController.php b/backend/controllers/CategoryController.php old mode 100644 new mode 100755 index e124301..e124301 --- a/backend/controllers/CategoryController.php +++ b/backend/controllers/CategoryController.php diff --git a/backend/controllers/OrdersController.php b/backend/controllers/OrdersController.php old mode 100644 new mode 100755 index 803c32e..803c32e --- a/backend/controllers/OrdersController.php +++ b/backend/controllers/OrdersController.php diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php old mode 100644 new mode 100755 index 07b8283..07b8283 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php new file mode 100755 index 0000000..cd9852a --- /dev/null +++ b/backend/controllers/SliderController.php @@ -0,0 +1,128 @@ + [ + 'class' => VerbFilter::className(), + 'actions' => [ + 'delete' => ['POST'], + ], + ], + ]; + } + + /** + * Lists all Slider models. + * @return mixed + */ + public function actionIndex() + { + $searchModel = new SliderSearch(); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + + return $this->render('index', [ + 'searchModel' => $searchModel, + 'dataProvider' => $dataProvider, + ]); + } + + /** + * Displays a single Slider model. + * @param integer $id + * @return mixed + */ + public function actionView($id) + { + return $this->render('view', [ + 'model' => $this->findModel($id), + ]); + } + + /** + * Creates a new Slider model. + * If creation is successful, the browser will be redirected to the 'view' page. + * @return mixed + */ + public function actionCreate() + { + $model = new Slider(); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->slider_id]); + } else { + + + return $this->render('create', [ + 'model' => $model, + ]); + } + } + + /** + * Updates an existing Slider model. + * If update is successful, the browser will be redirected to the 'view' page. + * @param integer $id + * @return mixed + */ + public function actionUpdate($id) + { + $model = $this->findModel($id); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->slider_id]); + } else { + return $this->render('update', [ + 'model' => $model, + ]); + } + } + + /** + * Deletes an existing Slider model. + * If deletion is successful, the browser will be redirected to the 'index' page. + * @param integer $id + * @return mixed + */ + public function actionDelete($id) + { + $this->findModel($id)->delete(); + + return $this->redirect(['index']); + } + + /** + * Finds the Slider model based on its primary key value. + * If the model is not found, a 404 HTTP exception will be thrown. + * @param integer $id + * @return Slider the loaded model + * @throws NotFoundHttpException if the model cannot be found + */ + protected function findModel($id) + { + if (($model = Slider::findOne($id)) !== null) { + return $model; + } else { + throw new NotFoundHttpException('The requested page does not exist.'); + } + } +} diff --git a/backend/models/.gitkeep b/backend/models/.gitkeep old mode 100644 new mode 100755 index 72e8ffc..72e8ffc --- a/backend/models/.gitkeep +++ b/backend/models/.gitkeep diff --git a/backend/runtime/.gitignore b/backend/runtime/.gitignore old mode 100644 new mode 100755 index c96a04f..c96a04f --- a/backend/runtime/.gitignore +++ b/backend/runtime/.gitignore diff --git a/backend/views/banner/_form.php b/backend/views/banner/_form.php new file mode 100755 index 0000000..88914b4 --- /dev/null +++ b/backend/views/banner/_form.php @@ -0,0 +1,95 @@ + + + + diff --git a/backend/views/banner/_search.php b/backend/views/banner/_search.php new file mode 100755 index 0000000..a0e2104 --- /dev/null +++ b/backend/views/banner/_search.php @@ -0,0 +1,38 @@ + + + diff --git a/backend/views/banner/create.php b/backend/views/banner/create.php new file mode 100755 index 0000000..d6d5d1a --- /dev/null +++ b/backend/views/banner/create.php @@ -0,0 +1,21 @@ +title = Yii::t('app', 'Create Banner'); +$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Banners'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> + diff --git a/backend/views/banner/index.php b/backend/views/banner/index.php new file mode 100755 index 0000000..72f0a13 --- /dev/null +++ b/backend/views/banner/index.php @@ -0,0 +1,37 @@ +title = Yii::t('app', 'Banners'); +$this->params['breadcrumbs'][] = $this->title; +?> + diff --git a/backend/views/banner/update.php b/backend/views/banner/update.php new file mode 100755 index 0000000..254c26b --- /dev/null +++ b/backend/views/banner/update.php @@ -0,0 +1,23 @@ +title = Yii::t('app', 'Update {modelClass}: ', [ + 'modelClass' => 'Banner', +]) . $model->title; +$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Banners'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->title, 'url' => ['view', 'id' => $model->banner_id]]; +$this->params['breadcrumbs'][] = Yii::t('app', 'Update'); +?> + diff --git a/backend/views/banner/view.php b/backend/views/banner/view.php new file mode 100755 index 0000000..16cea65 --- /dev/null +++ b/backend/views/banner/view.php @@ -0,0 +1,40 @@ +title = $model->title; +$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Banners'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> + diff --git a/backend/views/blog/_form.php b/backend/views/blog/_form.php old mode 100644 new mode 100755 index 7f35383..7f35383 --- a/backend/views/blog/_form.php +++ b/backend/views/blog/_form.php diff --git a/backend/views/blog/_search.php b/backend/views/blog/_search.php old mode 100644 new mode 100755 index 364656f..364656f --- a/backend/views/blog/_search.php +++ b/backend/views/blog/_search.php diff --git a/backend/views/blog/create.php b/backend/views/blog/create.php old mode 100644 new mode 100755 index a321524..a321524 --- a/backend/views/blog/create.php +++ b/backend/views/blog/create.php diff --git a/backend/views/blog/index.php b/backend/views/blog/index.php old mode 100644 new mode 100755 index be76474..be76474 --- a/backend/views/blog/index.php +++ b/backend/views/blog/index.php diff --git a/backend/views/blog/update.php b/backend/views/blog/update.php old mode 100644 new mode 100755 index 606398e..606398e --- a/backend/views/blog/update.php +++ b/backend/views/blog/update.php diff --git a/backend/views/blog/view.php b/backend/views/blog/view.php old mode 100644 new mode 100755 index f7ac37d..f7ac37d --- a/backend/views/blog/view.php +++ b/backend/views/blog/view.php diff --git a/backend/views/brand/_form.php b/backend/views/brand/_form.php old mode 100644 new mode 100755 index 2d9c553..2d9c553 --- a/backend/views/brand/_form.php +++ b/backend/views/brand/_form.php diff --git a/backend/views/brand/_search.php b/backend/views/brand/_search.php old mode 100644 new mode 100755 index 967088a..967088a --- a/backend/views/brand/_search.php +++ b/backend/views/brand/_search.php diff --git a/backend/views/brand/create.php b/backend/views/brand/create.php old mode 100644 new mode 100755 index e0d4833..e0d4833 --- a/backend/views/brand/create.php +++ b/backend/views/brand/create.php diff --git a/backend/views/brand/index.php b/backend/views/brand/index.php old mode 100644 new mode 100755 index b0a0619..b0a0619 --- a/backend/views/brand/index.php +++ b/backend/views/brand/index.php diff --git a/backend/views/brand/update.php b/backend/views/brand/update.php old mode 100644 new mode 100755 index 7b60ab0..7b60ab0 --- a/backend/views/brand/update.php +++ b/backend/views/brand/update.php diff --git a/backend/views/brand/view.php b/backend/views/brand/view.php old mode 100644 new mode 100755 index 8180ef0..8180ef0 --- a/backend/views/brand/view.php +++ b/backend/views/brand/view.php diff --git a/backend/views/category/_form.php b/backend/views/category/_form.php old mode 100644 new mode 100755 index 62de6b8..62de6b8 --- a/backend/views/category/_form.php +++ b/backend/views/category/_form.php diff --git a/backend/views/category/_search.php b/backend/views/category/_search.php old mode 100644 new mode 100755 index f098041..f098041 --- a/backend/views/category/_search.php +++ b/backend/views/category/_search.php diff --git a/backend/views/category/create.php b/backend/views/category/create.php old mode 100644 new mode 100755 index 9ca39fb..9ca39fb --- a/backend/views/category/create.php +++ b/backend/views/category/create.php diff --git a/backend/views/category/index.php b/backend/views/category/index.php old mode 100644 new mode 100755 index 876474e..876474e --- a/backend/views/category/index.php +++ b/backend/views/category/index.php diff --git a/backend/views/category/update.php b/backend/views/category/update.php old mode 100644 new mode 100755 index 0f19387..0f19387 --- a/backend/views/category/update.php +++ b/backend/views/category/update.php diff --git a/backend/views/category/view.php b/backend/views/category/view.php old mode 100644 new mode 100755 index d68ed18..d68ed18 --- a/backend/views/category/view.php +++ b/backend/views/category/view.php diff --git a/backend/views/layouts/admin.php b/backend/views/layouts/admin.php old mode 100644 new mode 100755 index 8207813..8207813 --- a/backend/views/layouts/admin.php +++ b/backend/views/layouts/admin.php diff --git a/backend/views/layouts/control-sidebar.php b/backend/views/layouts/control-sidebar.php old mode 100644 new mode 100755 index 7e34b3f..7e34b3f --- a/backend/views/layouts/control-sidebar.php +++ b/backend/views/layouts/control-sidebar.php diff --git a/backend/views/layouts/footer.php b/backend/views/layouts/footer.php old mode 100644 new mode 100755 index 5f42a83..5f42a83 --- a/backend/views/layouts/footer.php +++ b/backend/views/layouts/footer.php diff --git a/backend/views/layouts/header.php b/backend/views/layouts/header.php old mode 100644 new mode 100755 index 8a97ed1..8a97ed1 --- a/backend/views/layouts/header.php +++ b/backend/views/layouts/header.php diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php old mode 100644 new mode 100755 index 7f98a6a..a144b40 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -35,6 +35,14 @@ use yii\widgets\Menu; ] ], [ + 'label' => 'Слайдер/Банеры', + 'template'=>' {label}', + 'items' => [ + ['label' => 'Слайдер', 'url' => ['/slider/index']], + ['label' => 'Банер', 'url' => ['/banner/index']], + ] + ], + [ 'label' => 'Характеристики', 'template'=>' {label}', 'url' => ['/rubrication/tax-group'], diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php old mode 100644 new mode 100755 index cb4d7d8..cb4d7d8 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php diff --git a/backend/views/layouts/none.php b/backend/views/layouts/none.php old mode 100644 new mode 100755 index aae13c7..aae13c7 --- a/backend/views/layouts/none.php +++ b/backend/views/layouts/none.php diff --git a/backend/views/orders/_form.php b/backend/views/orders/_form.php old mode 100644 new mode 100755 index 071eb17..071eb17 --- a/backend/views/orders/_form.php +++ b/backend/views/orders/_form.php diff --git a/backend/views/orders/_search.php b/backend/views/orders/_search.php old mode 100644 new mode 100755 index 35018d8..35018d8 --- a/backend/views/orders/_search.php +++ b/backend/views/orders/_search.php diff --git a/backend/views/orders/create.php b/backend/views/orders/create.php old mode 100644 new mode 100755 index 2862711..2862711 --- a/backend/views/orders/create.php +++ b/backend/views/orders/create.php diff --git a/backend/views/orders/index.php b/backend/views/orders/index.php old mode 100644 new mode 100755 index bd1a359..bd1a359 --- a/backend/views/orders/index.php +++ b/backend/views/orders/index.php diff --git a/backend/views/orders/update.php b/backend/views/orders/update.php old mode 100644 new mode 100755 index 2f0f5d7..2f0f5d7 --- a/backend/views/orders/update.php +++ b/backend/views/orders/update.php diff --git a/backend/views/orders/view.php b/backend/views/orders/view.php old mode 100644 new mode 100755 index f6ab9ae..f6ab9ae --- a/backend/views/orders/view.php +++ b/backend/views/orders/view.php diff --git a/backend/views/site/error.php b/backend/views/site/error.php old mode 100644 new mode 100755 index 0ba2574..0ba2574 --- a/backend/views/site/error.php +++ b/backend/views/site/error.php diff --git a/backend/views/site/index.php b/backend/views/site/index.php old mode 100644 new mode 100755 index e69de29..e69de29 --- a/backend/views/site/index.php +++ b/backend/views/site/index.php diff --git a/backend/views/site/login.php b/backend/views/site/login.php old mode 100644 new mode 100755 index 20f3f78..20f3f78 --- a/backend/views/site/login.php +++ b/backend/views/site/login.php diff --git a/backend/views/slider/_form.php b/backend/views/slider/_form.php new file mode 100755 index 0000000..e4cfe14 --- /dev/null +++ b/backend/views/slider/_form.php @@ -0,0 +1,44 @@ + + +
+ + + + field($model, 'speed')->textInput() ?> + + field($model, 'duration')->textInput() ?> + + field($model, 'title')->textInput(['maxlength' => true]) ?> + + + field($model, 'width')->textInput(['maxlength' => true]) ?> + + field($model, 'height')->textInput(['maxlength' => true]) ?> + + + field($model, 'status')->widget(Select2::className(),([ + 'name' => 'status', + 'hideSearch' => true, + 'data' => [1 => 'Active', 2 => 'Inactive'], + 'options' => ['placeholder' => 'Select status...'], + 'pluginOptions' => [ + 'allowClear' => true + ] + ])) ?> + +
+ isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> +
+ + + +
diff --git a/backend/views/slider/_search.php b/backend/views/slider/_search.php new file mode 100755 index 0000000..e3c306e --- /dev/null +++ b/backend/views/slider/_search.php @@ -0,0 +1,36 @@ + + +
+ + ['index'], + 'method' => 'get', + ]); ?> + + field($model, 'slider_id') ?> + + + field($model, 'speed') ?> + + field($model, 'duration') ?> + + field($model, 'title') ?> + + field($model, 'status') ?> + +
+ 'btn btn-primary']) ?> + 'btn btn-default']) ?> +
+ + + +
diff --git a/backend/views/slider/create.php b/backend/views/slider/create.php new file mode 100755 index 0000000..ea147e3 --- /dev/null +++ b/backend/views/slider/create.php @@ -0,0 +1,21 @@ +title = Yii::t('app', 'Create Slider'); +$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Sliders'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/slider/index.php b/backend/views/slider/index.php new file mode 100755 index 0000000..fbc1319 --- /dev/null +++ b/backend/views/slider/index.php @@ -0,0 +1,82 @@ +title = Yii::t('app', 'Sliders'); +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

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

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

+ $dataProvider, + 'filterModel' => $searchModel, + 'columns' => [ + [ + 'attribute' => 'slider_id', + 'value' => 'slider_id', + 'contentOptions' => ['style' => 'width: 70px;'], + ], + [ + 'attribute' => 'title', + 'value' => 'title', + ], + + [ + 'attribute' => 'status', + 'value' => function ($model) + { + return ($model->status == 0) ? 'Скрыто' : 'Показать'; + }, + ], + [ + 'class' => 'yii\grid\ActionColumn', + 'template' => '{update} {image} {delete}', + 'buttons' => [ + 'update' => function ($url, $model) + { + return Html::a ( + '', + Url::toRoute(['slider/update', 'id' => $model->slider_id]), + [ + 'title' => "Редактировать", + ] + ); + }, + 'image' => function ($url, $model) + { + return Html::a ( + '', + Url::toRoute(['slider-image/index', 'slider_id' => $model->slider_id]), + [ + 'title' => "слайды", + ] + ); + }, + 'delete' => function ($url, $model) + { + return Html::a ( + '', + Url::toRoute(['slider/delete', 'id' => $model->slider_id]), + [ + 'title' => "Удалить", + ] + ); + }, + ], + 'contentOptions' => ['style' => 'width: 70px;'], + ], + ], + ]); ?> +
diff --git a/backend/views/slider/update.php b/backend/views/slider/update.php new file mode 100755 index 0000000..57624ff --- /dev/null +++ b/backend/views/slider/update.php @@ -0,0 +1,23 @@ +title = Yii::t('app', 'Update {modelClass}: ', [ + 'modelClass' => 'Slider', +]) . $model->title; +$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Sliders'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->title, 'url' => ['view', 'id' => $model->slider_id]]; +$this->params['breadcrumbs'][] = Yii::t('app', 'Update'); +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/slider/view.php b/backend/views/slider/view.php new file mode 100755 index 0000000..c0ed787 --- /dev/null +++ b/backend/views/slider/view.php @@ -0,0 +1,39 @@ +title = $model->title; +$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Sliders'), 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ +

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

+ + $model, + 'attributes' => [ + 'slider_id', + 'speed', + 'duration', + 'title', + 'status', + ], + ]) ?> + +
diff --git a/backend/web/.gitignore b/backend/web/.gitignore old mode 100644 new mode 100755 index 25c74e6..25c74e6 --- a/backend/web/.gitignore +++ b/backend/web/.gitignore diff --git a/backend/web/assets/.gitignore b/backend/web/assets/.gitignore old mode 100644 new mode 100755 index d6b7ef3..d6b7ef3 --- a/backend/web/assets/.gitignore +++ b/backend/web/assets/.gitignore diff --git a/backend/web/css/site.css b/backend/web/css/site.css old mode 100644 new mode 100755 index 324663d..324663d --- a/backend/web/css/site.css +++ b/backend/web/css/site.css diff --git a/backend/web/favicon.ico b/backend/web/favicon.ico old mode 100644 new mode 100755 index 580ed73..580ed73 Binary files a/backend/web/favicon.ico and b/backend/web/favicon.ico differ diff --git a/backend/web/index-test.php b/backend/web/index-test.php old mode 100644 new mode 100755 index 8b96707..8b96707 --- a/backend/web/index-test.php +++ b/backend/web/index-test.php diff --git a/backend/web/index.php b/backend/web/index.php old mode 100644 new mode 100755 index 99030fa..99030fa --- a/backend/web/index.php +++ b/backend/web/index.php diff --git a/backend/web/js/fieldWidget.js b/backend/web/js/fieldWidget.js old mode 100644 new mode 100755 index 575b7b5..575b7b5 --- a/backend/web/js/fieldWidget.js +++ b/backend/web/js/fieldWidget.js diff --git a/backend/web/robots.txt b/backend/web/robots.txt old mode 100644 new mode 100755 index 1f53798..1f53798 --- a/backend/web/robots.txt +++ b/backend/web/robots.txt diff --git a/codeception.yml b/codeception.yml new file mode 100755 index 0000000..3a8fca8 --- /dev/null +++ b/codeception.yml @@ -0,0 +1,21 @@ +actor: Tester +paths: + tests: tests + log: tests/_output + data: tests/_data + support: tests/_support + envs: tests/_envs +settings: + bootstrap: _bootstrap.php + colors: true + memory_limit: 1024M +extensions: + enabled: + - Codeception\Extension\RunFailed +modules: + config: + Db: + dsn: '' + user: '' + password: '' + dump: tests/_data/dump.sql diff --git a/common/behaviors/RuSlug.php b/common/behaviors/RuSlug.php old mode 100644 new mode 100755 index d2b8f73..d2b8f73 --- a/common/behaviors/RuSlug.php +++ b/common/behaviors/RuSlug.php diff --git a/common/behaviors/ShowImage.php b/common/behaviors/ShowImage.php old mode 100644 new mode 100755 index 4960eea..4960eea --- a/common/behaviors/ShowImage.php +++ b/common/behaviors/ShowImage.php diff --git a/common/behaviors/Slug.php b/common/behaviors/Slug.php old mode 100644 new mode 100755 index 9f13615..9f13615 --- a/common/behaviors/Slug.php +++ b/common/behaviors/Slug.php diff --git a/common/components/LangRequest.php b/common/components/LangRequest.php old mode 100644 new mode 100755 index 9b5ab3f..9b5ab3f --- a/common/components/LangRequest.php +++ b/common/components/LangRequest.php diff --git a/common/components/LangUrlManager.php b/common/components/LangUrlManager.php old mode 100644 new mode 100755 index 2170b02..2170b02 --- a/common/components/LangUrlManager.php +++ b/common/components/LangUrlManager.php diff --git a/common/components/Request.php b/common/components/Request.php old mode 100644 new mode 100755 index f3a4f37..f3a4f37 --- a/common/components/Request.php +++ b/common/components/Request.php diff --git a/common/components/artboxtree/ArtboxTreeBehavior.php b/common/components/artboxtree/ArtboxTreeBehavior.php old mode 100644 new mode 100755 index 3542deb..3542deb --- a/common/components/artboxtree/ArtboxTreeBehavior.php +++ b/common/components/artboxtree/ArtboxTreeBehavior.php diff --git a/common/components/artboxtree/ArtboxTreeHelper.php b/common/components/artboxtree/ArtboxTreeHelper.php old mode 100644 new mode 100755 index d5da465..d5da465 --- a/common/components/artboxtree/ArtboxTreeHelper.php +++ b/common/components/artboxtree/ArtboxTreeHelper.php diff --git a/common/components/artboxtree/ArtboxTreeQueryTrait.php b/common/components/artboxtree/ArtboxTreeQueryTrait.php old mode 100644 new mode 100755 index 635812b..635812b --- a/common/components/artboxtree/ArtboxTreeQueryTrait.php +++ b/common/components/artboxtree/ArtboxTreeQueryTrait.php diff --git a/common/components/artboxtree/ArtboxTreeWidget.php b/common/components/artboxtree/ArtboxTreeWidget.php old mode 100644 new mode 100755 index fafa4a6..fafa4a6 --- a/common/components/artboxtree/ArtboxTreeWidget.php +++ b/common/components/artboxtree/ArtboxTreeWidget.php diff --git a/common/components/artboxtree/treegrid/TreeGridColumn.php b/common/components/artboxtree/treegrid/TreeGridColumn.php old mode 100644 new mode 100755 index f7e2132..f7e2132 --- a/common/components/artboxtree/treegrid/TreeGridColumn.php +++ b/common/components/artboxtree/treegrid/TreeGridColumn.php diff --git a/common/components/artboxtree/treegrid/TreeGridWidget.php b/common/components/artboxtree/treegrid/TreeGridWidget.php old mode 100644 new mode 100755 index 908ba69..908ba69 --- a/common/components/artboxtree/treegrid/TreeGridWidget.php +++ b/common/components/artboxtree/treegrid/TreeGridWidget.php diff --git a/common/components/artboxtree/treelist/TreeListWidget.php b/common/components/artboxtree/treelist/TreeListWidget.php old mode 100644 new mode 100755 index 868e82e..868e82e --- a/common/components/artboxtree/treelist/TreeListWidget.php +++ b/common/components/artboxtree/treelist/TreeListWidget.php diff --git a/common/components/artboxtree/treemenu/TreeMenuWidget.php b/common/components/artboxtree/treemenu/TreeMenuWidget.php old mode 100644 new mode 100755 index 381cb91..381cb91 --- a/common/components/artboxtree/treemenu/TreeMenuWidget.php +++ b/common/components/artboxtree/treemenu/TreeMenuWidget.php diff --git a/common/config/.gitignore b/common/config/.gitignore old mode 100644 new mode 100755 index 97c0f01..97c0f01 --- a/common/config/.gitignore +++ b/common/config/.gitignore diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php old mode 100644 new mode 100755 index fb64fc7..fb64fc7 --- a/common/config/bootstrap.php +++ b/common/config/bootstrap.php diff --git a/common/config/main.php b/common/config/main.php old mode 100644 new mode 100755 index 3a6bf4e..3a6bf4e --- a/common/config/main.php +++ b/common/config/main.php diff --git a/common/config/params.php b/common/config/params.php old mode 100644 new mode 100755 index 4ec9ba6..4ec9ba6 --- a/common/config/params.php +++ b/common/config/params.php diff --git a/common/mail/layouts/html.php b/common/mail/layouts/html.php old mode 100644 new mode 100755 index bddbc61..bddbc61 --- a/common/mail/layouts/html.php +++ b/common/mail/layouts/html.php diff --git a/common/mail/layouts/text.php b/common/mail/layouts/text.php old mode 100644 new mode 100755 index 7087cea..7087cea --- a/common/mail/layouts/text.php +++ b/common/mail/layouts/text.php diff --git a/common/mail/passwordResetToken-html.php b/common/mail/passwordResetToken-html.php old mode 100644 new mode 100755 index f3daf49..f3daf49 --- a/common/mail/passwordResetToken-html.php +++ b/common/mail/passwordResetToken-html.php diff --git a/common/mail/passwordResetToken-text.php b/common/mail/passwordResetToken-text.php old mode 100644 new mode 100755 index 244c0cb..244c0cb --- a/common/mail/passwordResetToken-text.php +++ b/common/mail/passwordResetToken-text.php diff --git a/common/models/Banner.php b/common/models/Banner.php new file mode 100644 index 0000000..74be80c --- /dev/null +++ b/common/models/Banner.php @@ -0,0 +1,60 @@ + 255], + [['width', 'height'], 'required'], + ['title', 'unique', 'targetClass' => '\common\models\Slider', 'message' => Yii::t('app','message',[ + 'field' => 'Title' + ])], + ]; + } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'banner_id' => Yii::t('app', 'Banner ID'), + 'image' => Yii::t('app', 'Image'), + 'alt' => Yii::t('app', 'Alt'), + 'title' => Yii::t('app', 'Title'), + 'url' => Yii::t('app', 'Url'), + 'status' => Yii::t('app', 'Status'), + 'width' => Yii::t('app', 'Width'), + 'height' => Yii::t('app', 'Height'), + ]; + } +} diff --git a/common/models/BannerSearch.php b/common/models/BannerSearch.php new file mode 100755 index 0000000..bab6809 --- /dev/null +++ b/common/models/BannerSearch.php @@ -0,0 +1,73 @@ + $query, + ]); + + $this->load($params); + + if (!$this->validate()) { + // uncomment the following line if you do not want to return any records when validation fails + // $query->where('0=1'); + return $dataProvider; + } + + // grid filtering conditions + $query->andFilterWhere([ + 'banner_id' => $this->banner_id, + 'status' => $this->status, + ]); + + $query->andFilterWhere(['like', 'image', $this->image]) + ->andFilterWhere(['like', 'alt', $this->alt]) + ->andFilterWhere(['like', 'title', $this->title]) + ->andFilterWhere(['like', 'url', $this->url]); + + return $dataProvider; + } +} diff --git a/common/models/Blog.php b/common/models/Blog.php old mode 100644 new mode 100755 index 1547b6b..1547b6b --- a/common/models/Blog.php +++ b/common/models/Blog.php diff --git a/common/models/BlogSearch.php b/common/models/BlogSearch.php old mode 100644 new mode 100755 index 8faadac..8faadac --- a/common/models/BlogSearch.php +++ b/common/models/BlogSearch.php diff --git a/common/models/Customers.php b/common/models/Customers.php old mode 100644 new mode 100755 index fc01726..fc01726 --- a/common/models/Customers.php +++ b/common/models/Customers.php diff --git a/common/models/Fields.php b/common/models/Fields.php old mode 100644 new mode 100755 index dcd60fc..dcd60fc --- a/common/models/Fields.php +++ b/common/models/Fields.php diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php old mode 100644 new mode 100755 index 11b4ec5..11b4ec5 --- a/common/models/LoginForm.php +++ b/common/models/LoginForm.php diff --git a/common/models/OrderItems.php b/common/models/OrderItems.php old mode 100644 new mode 100755 index e148f5d..e148f5d --- a/common/models/OrderItems.php +++ b/common/models/OrderItems.php diff --git a/common/models/Orders.php b/common/models/Orders.php old mode 100644 new mode 100755 index ea746ef..ea746ef --- a/common/models/Orders.php +++ b/common/models/Orders.php diff --git a/common/models/OrdersSearch.php b/common/models/OrdersSearch.php old mode 100644 new mode 100755 index 48efed8..48efed8 --- a/common/models/OrdersSearch.php +++ b/common/models/OrdersSearch.php diff --git a/common/models/Slider.php b/common/models/Slider.php new file mode 100755 index 0000000..e3e8b54 --- /dev/null +++ b/common/models/Slider.php @@ -0,0 +1,68 @@ + 200], + [['width', 'height'], 'required'], + ['title', 'unique', 'targetClass' => '\common\models\Slider', 'message' => Yii::t('app','message',[ + 'field' => 'Title' + ])], + ]; + } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'slider_id' => Yii::t('app', 'Slider ID'), + 'speed' => Yii::t('app', 'Speed'), + 'duration' => Yii::t('app', 'Duration'), + 'title' => Yii::t('app', 'Title'), + 'status' => Yii::t('app', 'Status'), + 'width' => Yii::t('app', 'Width'), + 'height' => Yii::t('app', 'Height'), + ]; + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getSliderImage() + { + return $this->hasMany(SliderImage::className(), ['slider_id' => 'slider_id']); + } +} diff --git a/common/models/SliderSearch.php b/common/models/SliderSearch.php new file mode 100755 index 0000000..91a9edc --- /dev/null +++ b/common/models/SliderSearch.php @@ -0,0 +1,74 @@ + $query, + ]); + + $this->load($params); + + if (!$this->validate()) { + // uncomment the following line if you do not want to return any records when validation fails + // $query->where('0=1'); + return $dataProvider; + } + + // grid filtering conditions + $query->andFilterWhere([ + 'slider_id' => $this->slider_id, + 'speed' => $this->speed, + 'duration' => $this->duration, + 'status' => $this->status, + + ]); + + $query->andFilterWhere(['like', 'title', $this->title]); + + return $dataProvider; + } +} diff --git a/common/models/TemplateLocation.php b/common/models/TemplateLocation.php old mode 100644 new mode 100755 index c00d5c9..bee29b1 --- a/common/models/TemplateLocation.php +++ b/common/models/TemplateLocation.php @@ -1,40 +1,76 @@ 255], + ]; + } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'template_location_id' => Yii::t('app', 'Template Location ID'), + 'template_location_name' => Yii::t('app', 'Template Location Name'), + 'template_location_title' => Yii::t('app', 'Template Location Title'), + 'width' => Yii::t('app', 'Width'), + 'height' => Yii::t('app', 'Height'), + 'sort' => Yii::t('app', 'Sort'), + 'is_slider' => Yii::t('app', 'Is Slider'), + 'is_banner' => Yii::t('app', 'Is Banner'), + ]; + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getBanners() { - return TemplateLocation::find() - ->where(' - template_location_id NOT IN - ( - SELECT template_location_id - FROM banner - '.($template_location_id ? 'WHERE template_location_id != '.$template_location_id : '').' - ) - AND is_banner = 1 - ') - ->all(); + return $this->hasMany(Banner::className(), ['template_location_id' => 'template_location_id']); } - public function findFreeLocationForSlider () + /** + * @return \yii\db\ActiveQuery + */ + public function getSliders() { - return TemplateLocation::find() - ->where(' - template_location_id NOT IN - ( - SELECT template_location_id - FROM slider - ) - AND is_slider = 1 - ') - ->all(); + return $this->hasMany(Slider::className(), ['template_location_id' => 'template_location_id']); } -} \ No newline at end of file +} diff --git a/common/models/TemplateLocationSearch.php b/common/models/TemplateLocationSearch.php new file mode 100755 index 0000000..f5d430f --- /dev/null +++ b/common/models/TemplateLocationSearch.php @@ -0,0 +1,75 @@ + $query, + ]); + + $this->load($params); + + if (!$this->validate()) { + // uncomment the following line if you do not want to return any records when validation fails + // $query->where('0=1'); + return $dataProvider; + } + + // grid filtering conditions + $query->andFilterWhere([ + 'template_location_id' => $this->template_location_id, + 'width' => $this->width, + 'height' => $this->height, + 'sort' => $this->sort, + 'is_slider' => $this->is_slider, + 'is_banner' => $this->is_banner, + ]); + + $query->andFilterWhere(['like', 'template_location_name', $this->template_location_name]) + ->andFilterWhere(['like', 'template_location_title', $this->template_location_title]); + + return $dataProvider; + } +} diff --git a/common/models/User.php b/common/models/User.php old mode 100644 new mode 100755 index ce78fcd..ce78fcd --- a/common/models/User.php +++ b/common/models/User.php diff --git a/common/modules/blog/Module.php b/common/modules/blog/Module.php old mode 100644 new mode 100755 index 8752f7e..8752f7e --- a/common/modules/blog/Module.php +++ b/common/modules/blog/Module.php diff --git a/common/modules/blog/behaviors/Autocomplete.php b/common/modules/blog/behaviors/Autocomplete.php old mode 100644 new mode 100755 index f326557..f326557 --- a/common/modules/blog/behaviors/Autocomplete.php +++ b/common/modules/blog/behaviors/Autocomplete.php diff --git a/common/modules/blog/config.php b/common/modules/blog/config.php old mode 100644 new mode 100755 index f528ffb..f528ffb --- a/common/modules/blog/config.php +++ b/common/modules/blog/config.php diff --git a/common/modules/blog/controllers/AjaxController.php b/common/modules/blog/controllers/AjaxController.php old mode 100644 new mode 100755 index 8da349f..8da349f --- a/common/modules/blog/controllers/AjaxController.php +++ b/common/modules/blog/controllers/AjaxController.php diff --git a/common/modules/blog/controllers/ArticleController.php b/common/modules/blog/controllers/ArticleController.php old mode 100644 new mode 100755 index 5061555..5061555 --- a/common/modules/blog/controllers/ArticleController.php +++ b/common/modules/blog/controllers/ArticleController.php diff --git a/common/modules/blog/controllers/CategoryController.php b/common/modules/blog/controllers/CategoryController.php old mode 100644 new mode 100755 index 7759416..7759416 --- a/common/modules/blog/controllers/CategoryController.php +++ b/common/modules/blog/controllers/CategoryController.php diff --git a/common/modules/blog/controllers/DefaultController.php b/common/modules/blog/controllers/DefaultController.php old mode 100644 new mode 100755 index 3e2294c..3e2294c --- a/common/modules/blog/controllers/DefaultController.php +++ b/common/modules/blog/controllers/DefaultController.php diff --git a/common/modules/blog/controllers/MediaController.php b/common/modules/blog/controllers/MediaController.php old mode 100644 new mode 100755 index e1d91f5..e1d91f5 --- a/common/modules/blog/controllers/MediaController.php +++ b/common/modules/blog/controllers/MediaController.php diff --git a/common/modules/blog/controllers/TestController.php b/common/modules/blog/controllers/TestController.php old mode 100644 new mode 100755 index 5f77485..5f77485 --- a/common/modules/blog/controllers/TestController.php +++ b/common/modules/blog/controllers/TestController.php diff --git a/common/modules/blog/models/Article.php b/common/modules/blog/models/Article.php old mode 100644 new mode 100755 index 85584b1..85584b1 --- a/common/modules/blog/models/Article.php +++ b/common/modules/blog/models/Article.php diff --git a/common/modules/blog/models/ArticleCategory.php b/common/modules/blog/models/ArticleCategory.php old mode 100644 new mode 100755 index f91721f..f91721f --- a/common/modules/blog/models/ArticleCategory.php +++ b/common/modules/blog/models/ArticleCategory.php diff --git a/common/modules/blog/models/ArticleCategoryLang.php b/common/modules/blog/models/ArticleCategoryLang.php old mode 100644 new mode 100755 index 1851437..1851437 --- a/common/modules/blog/models/ArticleCategoryLang.php +++ b/common/modules/blog/models/ArticleCategoryLang.php diff --git a/common/modules/blog/models/ArticleCategoryMedia.php b/common/modules/blog/models/ArticleCategoryMedia.php old mode 100644 new mode 100755 index a923910..a923910 --- a/common/modules/blog/models/ArticleCategoryMedia.php +++ b/common/modules/blog/models/ArticleCategoryMedia.php diff --git a/common/modules/blog/models/ArticleLang.php b/common/modules/blog/models/ArticleLang.php old mode 100644 new mode 100755 index 378b266..378b266 --- a/common/modules/blog/models/ArticleLang.php +++ b/common/modules/blog/models/ArticleLang.php diff --git a/common/modules/blog/models/ArticleMedia.php b/common/modules/blog/models/ArticleMedia.php old mode 100644 new mode 100755 index 42ccfa0..42ccfa0 --- a/common/modules/blog/models/ArticleMedia.php +++ b/common/modules/blog/models/ArticleMedia.php diff --git a/common/modules/blog/models/ArticleToCategory.php b/common/modules/blog/models/ArticleToCategory.php old mode 100644 new mode 100755 index f665d84..f665d84 --- a/common/modules/blog/models/ArticleToCategory.php +++ b/common/modules/blog/models/ArticleToCategory.php diff --git a/common/modules/blog/views/ajax/_article_form.php b/common/modules/blog/views/ajax/_article_form.php old mode 100644 new mode 100755 index 47e23d4..47e23d4 --- a/common/modules/blog/views/ajax/_article_form.php +++ b/common/modules/blog/views/ajax/_article_form.php diff --git a/common/modules/blog/views/ajax/_article_form_test.php b/common/modules/blog/views/ajax/_article_form_test.php old mode 100644 new mode 100755 index fbadb64..fbadb64 --- a/common/modules/blog/views/ajax/_article_form_test.php +++ b/common/modules/blog/views/ajax/_article_form_test.php diff --git a/common/modules/blog/views/ajax/_article_media_form.php b/common/modules/blog/views/ajax/_article_media_form.php old mode 100644 new mode 100755 index 8ff29f3..8ff29f3 --- a/common/modules/blog/views/ajax/_article_media_form.php +++ b/common/modules/blog/views/ajax/_article_media_form.php diff --git a/common/modules/blog/views/ajax/_category_form.php b/common/modules/blog/views/ajax/_category_form.php old mode 100644 new mode 100755 index 521317b..521317b --- a/common/modules/blog/views/ajax/_category_form.php +++ b/common/modules/blog/views/ajax/_category_form.php diff --git a/common/modules/blog/views/article/_form.php b/common/modules/blog/views/article/_form.php old mode 100644 new mode 100755 index 30eb077..30eb077 --- a/common/modules/blog/views/article/_form.php +++ b/common/modules/blog/views/article/_form.php diff --git a/common/modules/blog/views/article/create.php b/common/modules/blog/views/article/create.php old mode 100644 new mode 100755 index 6cd9da6..6cd9da6 --- a/common/modules/blog/views/article/create.php +++ b/common/modules/blog/views/article/create.php diff --git a/common/modules/blog/views/article/index.php b/common/modules/blog/views/article/index.php old mode 100644 new mode 100755 index ce83f97..ce83f97 --- a/common/modules/blog/views/article/index.php +++ b/common/modules/blog/views/article/index.php diff --git a/common/modules/blog/views/article/update.php b/common/modules/blog/views/article/update.php old mode 100644 new mode 100755 index 4458a2b..4458a2b --- a/common/modules/blog/views/article/update.php +++ b/common/modules/blog/views/article/update.php diff --git a/common/modules/blog/views/category/_form.php b/common/modules/blog/views/category/_form.php old mode 100644 new mode 100755 index 001da73..001da73 --- a/common/modules/blog/views/category/_form.php +++ b/common/modules/blog/views/category/_form.php diff --git a/common/modules/blog/views/category/create.php b/common/modules/blog/views/category/create.php old mode 100644 new mode 100755 index 265a30d..265a30d --- a/common/modules/blog/views/category/create.php +++ b/common/modules/blog/views/category/create.php diff --git a/common/modules/blog/views/category/index.php b/common/modules/blog/views/category/index.php old mode 100644 new mode 100755 index f5e1d9e..f5e1d9e --- a/common/modules/blog/views/category/index.php +++ b/common/modules/blog/views/category/index.php diff --git a/common/modules/blog/views/category/update.php b/common/modules/blog/views/category/update.php old mode 100644 new mode 100755 index 353c73e..353c73e --- a/common/modules/blog/views/category/update.php +++ b/common/modules/blog/views/category/update.php diff --git a/common/modules/blog/views/default/index.php b/common/modules/blog/views/default/index.php old mode 100644 new mode 100755 index 17d1a81..17d1a81 --- a/common/modules/blog/views/default/index.php +++ b/common/modules/blog/views/default/index.php diff --git a/common/modules/blog/views/media/index.php b/common/modules/blog/views/media/index.php old mode 100644 new mode 100755 index b931b6b..b931b6b --- a/common/modules/blog/views/media/index.php +++ b/common/modules/blog/views/media/index.php diff --git a/common/modules/blog/views/test/index.php b/common/modules/blog/views/test/index.php old mode 100644 new mode 100755 index 7244adf..7244adf --- a/common/modules/blog/views/test/index.php +++ b/common/modules/blog/views/test/index.php diff --git a/common/modules/comment/Controller.php b/common/modules/comment/Controller.php old mode 100644 new mode 100755 index d0ce56f..d0ce56f --- a/common/modules/comment/Controller.php +++ b/common/modules/comment/Controller.php diff --git a/common/modules/comment/Module.php b/common/modules/comment/Module.php old mode 100644 new mode 100755 index 6a18e72..6a18e72 --- a/common/modules/comment/Module.php +++ b/common/modules/comment/Module.php diff --git a/common/modules/comment/Permissions.php b/common/modules/comment/Permissions.php old mode 100644 new mode 100755 index 965f0f4..965f0f4 --- a/common/modules/comment/Permissions.php +++ b/common/modules/comment/Permissions.php diff --git a/common/modules/comment/assets/CommentAsset.php b/common/modules/comment/assets/CommentAsset.php old mode 100644 new mode 100755 index edf61a8..edf61a8 --- a/common/modules/comment/assets/CommentAsset.php +++ b/common/modules/comment/assets/CommentAsset.php diff --git a/common/modules/comment/commands/RbacController.php b/common/modules/comment/commands/RbacController.php old mode 100644 new mode 100755 index cd9d130..cd9d130 --- a/common/modules/comment/commands/RbacController.php +++ b/common/modules/comment/commands/RbacController.php diff --git a/common/modules/comment/interfaces/CommentInterface.php b/common/modules/comment/interfaces/CommentInterface.php old mode 100644 new mode 100755 index 471dddf..471dddf --- a/common/modules/comment/interfaces/CommentInterface.php +++ b/common/modules/comment/interfaces/CommentInterface.php diff --git a/common/modules/comment/models/Comment.php b/common/modules/comment/models/Comment.php old mode 100644 new mode 100755 index 8796389..8796389 --- a/common/modules/comment/models/Comment.php +++ b/common/modules/comment/models/Comment.php diff --git a/common/modules/comment/models/CommentProject.php b/common/modules/comment/models/CommentProject.php old mode 100644 new mode 100755 index 7cc3793..7cc3793 --- a/common/modules/comment/models/CommentProject.php +++ b/common/modules/comment/models/CommentProject.php diff --git a/common/modules/comment/models/Rating.php b/common/modules/comment/models/Rating.php old mode 100644 new mode 100755 index 3222732..3222732 --- a/common/modules/comment/models/Rating.php +++ b/common/modules/comment/models/Rating.php diff --git a/common/modules/comment/rbac/ArtboxCommentCreateRule.php b/common/modules/comment/rbac/ArtboxCommentCreateRule.php old mode 100644 new mode 100755 index 6f481fc..6f481fc --- a/common/modules/comment/rbac/ArtboxCommentCreateRule.php +++ b/common/modules/comment/rbac/ArtboxCommentCreateRule.php diff --git a/common/modules/comment/rbac/ArtboxCommentDeleteOwnRule.php b/common/modules/comment/rbac/ArtboxCommentDeleteOwnRule.php old mode 100644 new mode 100755 index e1c55c2..e1c55c2 --- a/common/modules/comment/rbac/ArtboxCommentDeleteOwnRule.php +++ b/common/modules/comment/rbac/ArtboxCommentDeleteOwnRule.php diff --git a/common/modules/comment/rbac/ArtboxCommentDeleteRule.php b/common/modules/comment/rbac/ArtboxCommentDeleteRule.php old mode 100644 new mode 100755 index 283e297..283e297 --- a/common/modules/comment/rbac/ArtboxCommentDeleteRule.php +++ b/common/modules/comment/rbac/ArtboxCommentDeleteRule.php diff --git a/common/modules/comment/rbac/ArtboxCommentUpdateOwnRule.php b/common/modules/comment/rbac/ArtboxCommentUpdateOwnRule.php old mode 100644 new mode 100755 index 27d8b11..27d8b11 --- a/common/modules/comment/rbac/ArtboxCommentUpdateOwnRule.php +++ b/common/modules/comment/rbac/ArtboxCommentUpdateOwnRule.php diff --git a/common/modules/comment/rbac/ArtboxCommentUpdateRule.php b/common/modules/comment/rbac/ArtboxCommentUpdateRule.php old mode 100644 new mode 100755 index 2b14e44..2b14e44 --- a/common/modules/comment/rbac/ArtboxCommentUpdateRule.php +++ b/common/modules/comment/rbac/ArtboxCommentUpdateRule.php diff --git a/common/modules/comment/resources/comment.css b/common/modules/comment/resources/comment.css old mode 100644 new mode 100755 index 2577fa1..2577fa1 --- a/common/modules/comment/resources/comment.css +++ b/common/modules/comment/resources/comment.css diff --git a/common/modules/comment/resources/comment.js b/common/modules/comment/resources/comment.js old mode 100644 new mode 100755 index f853007..f853007 --- a/common/modules/comment/resources/comment.js +++ b/common/modules/comment/resources/comment.js diff --git a/common/modules/comment/resources/delete-ico.png b/common/modules/comment/resources/delete-ico.png old mode 100644 new mode 100755 index 52c3718..52c3718 Binary files a/common/modules/comment/resources/delete-ico.png and b/common/modules/comment/resources/delete-ico.png differ diff --git a/common/modules/comment/views/comment_form.php b/common/modules/comment/views/comment_form.php old mode 100644 new mode 100755 index 717dcc1..717dcc1 --- a/common/modules/comment/views/comment_form.php +++ b/common/modules/comment/views/comment_form.php diff --git a/common/modules/comment/widgets/CommentWidget.php b/common/modules/comment/widgets/CommentWidget.php old mode 100644 new mode 100755 index 52c316f..52c316f --- a/common/modules/comment/widgets/CommentWidget.php +++ b/common/modules/comment/widgets/CommentWidget.php diff --git a/common/modules/comment/widgets/views/_project_comment_view.php b/common/modules/comment/widgets/views/_project_comment_view.php old mode 100644 new mode 100755 index 8e3c04f..8e3c04f --- a/common/modules/comment/widgets/views/_project_comment_view.php +++ b/common/modules/comment/widgets/views/_project_comment_view.php diff --git a/common/modules/comment/widgets/views/form-comment.php b/common/modules/comment/widgets/views/form-comment.php old mode 100644 new mode 100755 index 9262ebc..9262ebc --- a/common/modules/comment/widgets/views/form-comment.php +++ b/common/modules/comment/widgets/views/form-comment.php diff --git a/common/modules/comment/widgets/views/form-project-comment.php b/common/modules/comment/widgets/views/form-project-comment.php old mode 100644 new mode 100755 index 240d241..240d241 --- a/common/modules/comment/widgets/views/form-project-comment.php +++ b/common/modules/comment/widgets/views/form-project-comment.php diff --git a/common/modules/comment/widgets/views/list-comment.php b/common/modules/comment/widgets/views/list-comment.php old mode 100644 new mode 100755 index 4f37738..4f37738 --- a/common/modules/comment/widgets/views/list-comment.php +++ b/common/modules/comment/widgets/views/list-comment.php diff --git a/common/modules/comment/widgets/views/list-project-comment.php b/common/modules/comment/widgets/views/list-project-comment.php old mode 100644 new mode 100755 index f592675..f592675 --- a/common/modules/comment/widgets/views/list-project-comment.php +++ b/common/modules/comment/widgets/views/list-project-comment.php diff --git a/common/modules/comment/widgets/views/project_comment_view.php b/common/modules/comment/widgets/views/project_comment_view.php old mode 100644 new mode 100755 index c5cf8a4..c5cf8a4 --- a/common/modules/comment/widgets/views/project_comment_view.php +++ b/common/modules/comment/widgets/views/project_comment_view.php diff --git a/common/modules/file/FileUploadAsset.php b/common/modules/file/FileUploadAsset.php old mode 100644 new mode 100755 index 7ad2791..7ad2791 --- a/common/modules/file/FileUploadAsset.php +++ b/common/modules/file/FileUploadAsset.php diff --git a/common/modules/file/Module.php b/common/modules/file/Module.php old mode 100644 new mode 100755 index f0ac4c1..f0ac4c1 --- a/common/modules/file/Module.php +++ b/common/modules/file/Module.php diff --git a/common/modules/file/assets/css/fileupload/style.css b/common/modules/file/assets/css/fileupload/style.css old mode 100644 new mode 100755 index 88e39ee..88e39ee --- a/common/modules/file/assets/css/fileupload/style.css +++ b/common/modules/file/assets/css/fileupload/style.css diff --git a/common/modules/file/assets/css/jquery.fileupload-noscript.css b/common/modules/file/assets/css/jquery.fileupload-noscript.css old mode 100644 new mode 100755 index d0dda3a..d0dda3a --- a/common/modules/file/assets/css/jquery.fileupload-noscript.css +++ b/common/modules/file/assets/css/jquery.fileupload-noscript.css diff --git a/common/modules/file/assets/css/jquery.fileupload-ui-noscript.css b/common/modules/file/assets/css/jquery.fileupload-ui-noscript.css old mode 100644 new mode 100755 index 6ad2ad6..6ad2ad6 --- a/common/modules/file/assets/css/jquery.fileupload-ui-noscript.css +++ b/common/modules/file/assets/css/jquery.fileupload-ui-noscript.css diff --git a/common/modules/file/assets/css/jquery.fileupload-ui.css b/common/modules/file/assets/css/jquery.fileupload-ui.css old mode 100644 new mode 100755 index 95cca15..95cca15 --- a/common/modules/file/assets/css/jquery.fileupload-ui.css +++ b/common/modules/file/assets/css/jquery.fileupload-ui.css diff --git a/common/modules/file/assets/css/jquery.fileupload.css b/common/modules/file/assets/css/jquery.fileupload.css old mode 100644 new mode 100755 index ce7e422..ce7e422 --- a/common/modules/file/assets/css/jquery.fileupload.css +++ b/common/modules/file/assets/css/jquery.fileupload.css diff --git a/common/modules/file/assets/img/loading.gif b/common/modules/file/assets/img/loading.gif old mode 100644 new mode 100755 index 90f28cb..90f28cb Binary files a/common/modules/file/assets/img/loading.gif and b/common/modules/file/assets/img/loading.gif differ diff --git a/common/modules/file/assets/img/progressbar.gif b/common/modules/file/assets/img/progressbar.gif old mode 100644 new mode 100755 index fbcce6b..fbcce6b Binary files a/common/modules/file/assets/img/progressbar.gif and b/common/modules/file/assets/img/progressbar.gif differ diff --git a/common/modules/file/assets/js/cors/jquery.postmessage-transport.js b/common/modules/file/assets/js/cors/jquery.postmessage-transport.js old mode 100644 new mode 100755 index 4874a8c..4874a8c --- a/common/modules/file/assets/js/cors/jquery.postmessage-transport.js +++ b/common/modules/file/assets/js/cors/jquery.postmessage-transport.js diff --git a/common/modules/file/assets/js/cors/jquery.xdr-transport.js b/common/modules/file/assets/js/cors/jquery.xdr-transport.js old mode 100644 new mode 100755 index 5b9c6ca..5b9c6ca --- a/common/modules/file/assets/js/cors/jquery.xdr-transport.js +++ b/common/modules/file/assets/js/cors/jquery.xdr-transport.js diff --git a/common/modules/file/assets/js/jquery.fileupload-angular.js b/common/modules/file/assets/js/jquery.fileupload-angular.js old mode 100644 new mode 100755 index f7ba07b..f7ba07b --- a/common/modules/file/assets/js/jquery.fileupload-angular.js +++ b/common/modules/file/assets/js/jquery.fileupload-angular.js diff --git a/common/modules/file/assets/js/jquery.fileupload-audio.js b/common/modules/file/assets/js/jquery.fileupload-audio.js old mode 100644 new mode 100755 index 1a746f9..1a746f9 --- a/common/modules/file/assets/js/jquery.fileupload-audio.js +++ b/common/modules/file/assets/js/jquery.fileupload-audio.js diff --git a/common/modules/file/assets/js/jquery.fileupload-image.js b/common/modules/file/assets/js/jquery.fileupload-image.js old mode 100644 new mode 100755 index 0b91fbb..0b91fbb --- a/common/modules/file/assets/js/jquery.fileupload-image.js +++ b/common/modules/file/assets/js/jquery.fileupload-image.js diff --git a/common/modules/file/assets/js/jquery.fileupload-jquery-ui.js b/common/modules/file/assets/js/jquery.fileupload-jquery-ui.js old mode 100644 new mode 100755 index 4f239fa..4f239fa --- a/common/modules/file/assets/js/jquery.fileupload-jquery-ui.js +++ b/common/modules/file/assets/js/jquery.fileupload-jquery-ui.js diff --git a/common/modules/file/assets/js/jquery.fileupload-process.js b/common/modules/file/assets/js/jquery.fileupload-process.js old mode 100644 new mode 100755 index ce914df..ce914df --- a/common/modules/file/assets/js/jquery.fileupload-process.js +++ b/common/modules/file/assets/js/jquery.fileupload-process.js diff --git a/common/modules/file/assets/js/jquery.fileupload-ui.js b/common/modules/file/assets/js/jquery.fileupload-ui.js old mode 100644 new mode 100755 index 8154218..8154218 --- a/common/modules/file/assets/js/jquery.fileupload-ui.js +++ b/common/modules/file/assets/js/jquery.fileupload-ui.js diff --git a/common/modules/file/assets/js/jquery.fileupload-validate.js b/common/modules/file/assets/js/jquery.fileupload-validate.js old mode 100644 new mode 100755 index d6f754c..d6f754c --- a/common/modules/file/assets/js/jquery.fileupload-validate.js +++ b/common/modules/file/assets/js/jquery.fileupload-validate.js diff --git a/common/modules/file/assets/js/jquery.fileupload-video.js b/common/modules/file/assets/js/jquery.fileupload-video.js old mode 100644 new mode 100755 index 8067ca1..8067ca1 --- a/common/modules/file/assets/js/jquery.fileupload-video.js +++ b/common/modules/file/assets/js/jquery.fileupload-video.js diff --git a/common/modules/file/assets/js/jquery.fileupload.js b/common/modules/file/assets/js/jquery.fileupload.js old mode 100644 new mode 100755 index 91b7254..91b7254 --- a/common/modules/file/assets/js/jquery.fileupload.js +++ b/common/modules/file/assets/js/jquery.fileupload.js diff --git a/common/modules/file/assets/js/jquery.iframe-transport.js b/common/modules/file/assets/js/jquery.iframe-transport.js old mode 100644 new mode 100755 index a7d34e0..a7d34e0 --- a/common/modules/file/assets/js/jquery.iframe-transport.js +++ b/common/modules/file/assets/js/jquery.iframe-transport.js diff --git a/common/modules/file/assets/js/vendor/jquery.ui.widget.js b/common/modules/file/assets/js/vendor/jquery.ui.widget.js old mode 100644 new mode 100755 index e08df3f..e08df3f --- a/common/modules/file/assets/js/vendor/jquery.ui.widget.js +++ b/common/modules/file/assets/js/vendor/jquery.ui.widget.js diff --git a/common/modules/file/config.php b/common/modules/file/config.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/common/modules/file/config.php +++ b/common/modules/file/config.php diff --git a/common/modules/file/controllers/UploaderController.php b/common/modules/file/controllers/UploaderController.php old mode 100644 new mode 100755 index 1f88032..1f88032 --- a/common/modules/file/controllers/UploaderController.php +++ b/common/modules/file/controllers/UploaderController.php diff --git a/common/modules/file/models/ImageSizerForm.php b/common/modules/file/models/ImageSizerForm.php old mode 100644 new mode 100755 index 4f141fb..4f141fb --- a/common/modules/file/models/ImageSizerForm.php +++ b/common/modules/file/models/ImageSizerForm.php diff --git a/common/modules/file/views/_gallery_item.php b/common/modules/file/views/_gallery_item.php old mode 100644 new mode 100755 index f04a44d..f04a44d --- a/common/modules/file/views/_gallery_item.php +++ b/common/modules/file/views/_gallery_item.php diff --git a/common/modules/file/views/_one_item.php b/common/modules/file/views/_one_item.php old mode 100644 new mode 100755 index 4534483..4534483 --- a/common/modules/file/views/_one_item.php +++ b/common/modules/file/views/_one_item.php diff --git a/common/modules/file/widgets/ImageUploader.php b/common/modules/file/widgets/ImageUploader.php old mode 100644 new mode 100755 index 48d7787..48d7787 --- a/common/modules/file/widgets/ImageUploader.php +++ b/common/modules/file/widgets/ImageUploader.php diff --git a/common/modules/file/widgets/views/image_sizer.php b/common/modules/file/widgets/views/image_sizer.php old mode 100644 new mode 100755 index 510f883..8e7c087 --- a/common/modules/file/widgets/views/image_sizer.php +++ b/common/modules/file/widgets/views/image_sizer.php @@ -11,9 +11,9 @@ use yii\helpers\Html; $id = $model->tableSchema->primaryKey[0]; ?> -
- + +
"{$field}_picture_link"]) ?> diff --git a/common/modules/product/Module.php b/common/modules/product/Module.php old mode 100644 new mode 100755 index 4cc65a6..4cc65a6 --- a/common/modules/product/Module.php +++ b/common/modules/product/Module.php diff --git a/common/modules/product/config.php b/common/modules/product/config.php old mode 100644 new mode 100755 index 1c659ba..1c659ba --- a/common/modules/product/config.php +++ b/common/modules/product/config.php diff --git a/common/modules/product/controllers/DefaultController.php b/common/modules/product/controllers/DefaultController.php old mode 100644 new mode 100755 index 609a4c4..609a4c4 --- a/common/modules/product/controllers/DefaultController.php +++ b/common/modules/product/controllers/DefaultController.php diff --git a/common/modules/product/controllers/ManageController.php b/common/modules/product/controllers/ManageController.php old mode 100644 new mode 100755 index f7bb879..f7bb879 --- a/common/modules/product/controllers/ManageController.php +++ b/common/modules/product/controllers/ManageController.php diff --git a/common/modules/product/helpers/ProductHelper.php b/common/modules/product/helpers/ProductHelper.php old mode 100644 new mode 100755 index 6662870..6662870 --- a/common/modules/product/helpers/ProductHelper.php +++ b/common/modules/product/helpers/ProductHelper.php diff --git a/common/modules/product/models/Brand.php b/common/modules/product/models/Brand.php old mode 100644 new mode 100755 index 1e0c7f4..1e0c7f4 --- a/common/modules/product/models/Brand.php +++ b/common/modules/product/models/Brand.php diff --git a/common/modules/product/models/BrandName.php b/common/modules/product/models/BrandName.php old mode 100644 new mode 100755 index 5bab547..5bab547 --- a/common/modules/product/models/BrandName.php +++ b/common/modules/product/models/BrandName.php diff --git a/common/modules/product/models/BrandQuery.php b/common/modules/product/models/BrandQuery.php old mode 100644 new mode 100755 index 833357d..833357d --- a/common/modules/product/models/BrandQuery.php +++ b/common/modules/product/models/BrandQuery.php diff --git a/common/modules/product/models/BrandSearch.php b/common/modules/product/models/BrandSearch.php old mode 100644 new mode 100755 index 711aabf..711aabf --- a/common/modules/product/models/BrandSearch.php +++ b/common/modules/product/models/BrandSearch.php diff --git a/common/modules/product/models/Category.php b/common/modules/product/models/Category.php old mode 100644 new mode 100755 index e76dbe5..e76dbe5 --- a/common/modules/product/models/Category.php +++ b/common/modules/product/models/Category.php diff --git a/common/modules/product/models/CategoryName.php b/common/modules/product/models/CategoryName.php old mode 100644 new mode 100755 index 6c84f3e..6c84f3e --- a/common/modules/product/models/CategoryName.php +++ b/common/modules/product/models/CategoryName.php diff --git a/common/modules/product/models/CategoryQuery.php b/common/modules/product/models/CategoryQuery.php old mode 100644 new mode 100755 index 5ccb07d..5ccb07d --- a/common/modules/product/models/CategoryQuery.php +++ b/common/modules/product/models/CategoryQuery.php diff --git a/common/modules/product/models/CategorySearch.php b/common/modules/product/models/CategorySearch.php old mode 100644 new mode 100755 index 1155ea2..1155ea2 --- a/common/modules/product/models/CategorySearch.php +++ b/common/modules/product/models/CategorySearch.php diff --git a/common/modules/product/models/Product.php b/common/modules/product/models/Product.php old mode 100644 new mode 100755 index e866f0b..e866f0b --- a/common/modules/product/models/Product.php +++ b/common/modules/product/models/Product.php diff --git a/common/modules/product/models/ProductCategory.php b/common/modules/product/models/ProductCategory.php old mode 100644 new mode 100755 index e95649a..e95649a --- a/common/modules/product/models/ProductCategory.php +++ b/common/modules/product/models/ProductCategory.php diff --git a/common/modules/product/models/ProductImage.php b/common/modules/product/models/ProductImage.php old mode 100644 new mode 100755 index 87ce4d9..87ce4d9 --- a/common/modules/product/models/ProductImage.php +++ b/common/modules/product/models/ProductImage.php diff --git a/common/modules/product/models/ProductImageQuery.php b/common/modules/product/models/ProductImageQuery.php old mode 100644 new mode 100755 index 0238443..0238443 --- a/common/modules/product/models/ProductImageQuery.php +++ b/common/modules/product/models/ProductImageQuery.php diff --git a/common/modules/product/models/ProductOption.php b/common/modules/product/models/ProductOption.php old mode 100644 new mode 100755 index 02d1601..02d1601 --- a/common/modules/product/models/ProductOption.php +++ b/common/modules/product/models/ProductOption.php diff --git a/common/modules/product/models/ProductQuery.php b/common/modules/product/models/ProductQuery.php old mode 100644 new mode 100755 index faa8595..faa8595 --- a/common/modules/product/models/ProductQuery.php +++ b/common/modules/product/models/ProductQuery.php diff --git a/common/modules/product/models/ProductSearch.php b/common/modules/product/models/ProductSearch.php old mode 100644 new mode 100755 index f59ea6a..f59ea6a --- a/common/modules/product/models/ProductSearch.php +++ b/common/modules/product/models/ProductSearch.php diff --git a/common/modules/product/models/ProductUnit.php b/common/modules/product/models/ProductUnit.php old mode 100644 new mode 100755 index 6b5eaff..6b5eaff --- a/common/modules/product/models/ProductUnit.php +++ b/common/modules/product/models/ProductUnit.php diff --git a/common/modules/product/models/ProductVariant.php b/common/modules/product/models/ProductVariant.php old mode 100644 new mode 100755 index e63190a..e63190a --- a/common/modules/product/models/ProductVariant.php +++ b/common/modules/product/models/ProductVariant.php diff --git a/common/modules/product/models/ProductVariantQuery.php b/common/modules/product/models/ProductVariantQuery.php old mode 100644 new mode 100755 index 69a2883..69a2883 --- a/common/modules/product/models/ProductVariantQuery.php +++ b/common/modules/product/models/ProductVariantQuery.php diff --git a/common/modules/product/views/default/index.php b/common/modules/product/views/default/index.php old mode 100644 new mode 100755 index 218cc44..218cc44 --- a/common/modules/product/views/default/index.php +++ b/common/modules/product/views/default/index.php diff --git a/common/modules/product/views/manage/_form.php b/common/modules/product/views/manage/_form.php old mode 100644 new mode 100755 index fe71e38..fe71e38 --- a/common/modules/product/views/manage/_form.php +++ b/common/modules/product/views/manage/_form.php diff --git a/common/modules/product/views/manage/_search.php b/common/modules/product/views/manage/_search.php old mode 100644 new mode 100755 index 00015dc..00015dc --- a/common/modules/product/views/manage/_search.php +++ b/common/modules/product/views/manage/_search.php diff --git a/common/modules/product/views/manage/create.php b/common/modules/product/views/manage/create.php old mode 100644 new mode 100755 index e5f7902..e5f7902 --- a/common/modules/product/views/manage/create.php +++ b/common/modules/product/views/manage/create.php diff --git a/common/modules/product/views/manage/index.php b/common/modules/product/views/manage/index.php old mode 100644 new mode 100755 index 0b5e061..0b5e061 --- a/common/modules/product/views/manage/index.php +++ b/common/modules/product/views/manage/index.php diff --git a/common/modules/product/views/manage/update.php b/common/modules/product/views/manage/update.php old mode 100644 new mode 100755 index 9e6060e..9e6060e --- a/common/modules/product/views/manage/update.php +++ b/common/modules/product/views/manage/update.php diff --git a/common/modules/product/views/manage/view.php b/common/modules/product/views/manage/view.php old mode 100644 new mode 100755 index 9cb1d2a..9cb1d2a --- a/common/modules/product/views/manage/view.php +++ b/common/modules/product/views/manage/view.php diff --git a/common/modules/product/widgets/brandsCarouselWidget.php b/common/modules/product/widgets/brandsCarouselWidget.php old mode 100644 new mode 100755 index f047e2f..f047e2f --- a/common/modules/product/widgets/brandsCarouselWidget.php +++ b/common/modules/product/widgets/brandsCarouselWidget.php diff --git a/common/modules/product/widgets/catalogSubmenuWidget.php b/common/modules/product/widgets/catalogSubmenuWidget.php old mode 100644 new mode 100755 index feade10..feade10 --- a/common/modules/product/widgets/catalogSubmenuWidget.php +++ b/common/modules/product/widgets/catalogSubmenuWidget.php diff --git a/common/modules/product/widgets/views/brandsCarousel.php b/common/modules/product/widgets/views/brandsCarousel.php old mode 100644 new mode 100755 index 1c46693..1c46693 --- a/common/modules/product/widgets/views/brandsCarousel.php +++ b/common/modules/product/widgets/views/brandsCarousel.php diff --git a/common/modules/product/widgets/views/submenu.php b/common/modules/product/widgets/views/submenu.php old mode 100644 new mode 100755 index dda048d..dda048d --- a/common/modules/product/widgets/views/submenu.php +++ b/common/modules/product/widgets/views/submenu.php diff --git a/common/modules/relation/Module.php b/common/modules/relation/Module.php old mode 100644 new mode 100755 index b4f79b1..b4f79b1 --- a/common/modules/relation/Module.php +++ b/common/modules/relation/Module.php diff --git a/common/modules/relation/controllers/DefaultController.php b/common/modules/relation/controllers/DefaultController.php old mode 100644 new mode 100755 index 73e9484..73e9484 --- a/common/modules/relation/controllers/DefaultController.php +++ b/common/modules/relation/controllers/DefaultController.php diff --git a/common/modules/relation/controllers/ManageController.php b/common/modules/relation/controllers/ManageController.php old mode 100644 new mode 100755 index 23ee671..23ee671 --- a/common/modules/relation/controllers/ManageController.php +++ b/common/modules/relation/controllers/ManageController.php diff --git a/common/modules/relation/models/Relation.php b/common/modules/relation/models/Relation.php old mode 100644 new mode 100755 index bfe287f..bfe287f --- a/common/modules/relation/models/Relation.php +++ b/common/modules/relation/models/Relation.php diff --git a/common/modules/relation/models/RelationQuery.php b/common/modules/relation/models/RelationQuery.php old mode 100644 new mode 100755 index 9a04c33..9a04c33 --- a/common/modules/relation/models/RelationQuery.php +++ b/common/modules/relation/models/RelationQuery.php diff --git a/common/modules/relation/relationBehavior.php b/common/modules/relation/relationBehavior.php old mode 100644 new mode 100755 index 296cf4b..296cf4b --- a/common/modules/relation/relationBehavior.php +++ b/common/modules/relation/relationBehavior.php diff --git a/common/modules/relation/relationHelper.php b/common/modules/relation/relationHelper.php old mode 100644 new mode 100755 index bdb6991..bdb6991 --- a/common/modules/relation/relationHelper.php +++ b/common/modules/relation/relationHelper.php diff --git a/common/modules/relation/relationObject.php b/common/modules/relation/relationObject.php old mode 100644 new mode 100755 index 9dce6fa..9dce6fa --- a/common/modules/relation/relationObject.php +++ b/common/modules/relation/relationObject.php diff --git a/common/modules/relation/relationQueryTrait.php b/common/modules/relation/relationQueryTrait.php old mode 100644 new mode 100755 index aed2d0c..aed2d0c --- a/common/modules/relation/relationQueryTrait.php +++ b/common/modules/relation/relationQueryTrait.php diff --git a/common/modules/relation/views/default/index.php b/common/modules/relation/views/default/index.php old mode 100644 new mode 100755 index e8f0a30..e8f0a30 --- a/common/modules/relation/views/default/index.php +++ b/common/modules/relation/views/default/index.php diff --git a/common/modules/relation/views/manage/_form.php b/common/modules/relation/views/manage/_form.php old mode 100644 new mode 100755 index 4a92db8..4a92db8 --- a/common/modules/relation/views/manage/_form.php +++ b/common/modules/relation/views/manage/_form.php diff --git a/common/modules/relation/views/manage/create.php b/common/modules/relation/views/manage/create.php old mode 100644 new mode 100755 index 863f0f7..863f0f7 --- a/common/modules/relation/views/manage/create.php +++ b/common/modules/relation/views/manage/create.php diff --git a/common/modules/relation/views/manage/pars.php b/common/modules/relation/views/manage/pars.php old mode 100644 new mode 100755 index c82accf..c82accf --- a/common/modules/relation/views/manage/pars.php +++ b/common/modules/relation/views/manage/pars.php diff --git a/common/modules/relation/views/manage/relations.php b/common/modules/relation/views/manage/relations.php old mode 100644 new mode 100755 index 46950ab..46950ab --- a/common/modules/relation/views/manage/relations.php +++ b/common/modules/relation/views/manage/relations.php diff --git a/common/modules/relation/views/manage/update.php b/common/modules/relation/views/manage/update.php old mode 100644 new mode 100755 index 10b28f0..10b28f0 --- a/common/modules/relation/views/manage/update.php +++ b/common/modules/relation/views/manage/update.php diff --git a/common/modules/rubrication/Module.php b/common/modules/rubrication/Module.php old mode 100644 new mode 100755 index 95b57bd..95b57bd --- a/common/modules/rubrication/Module.php +++ b/common/modules/rubrication/Module.php diff --git a/common/modules/rubrication/behaviors/ArtboxSynonymBehavior.php b/common/modules/rubrication/behaviors/ArtboxSynonymBehavior.php old mode 100644 new mode 100755 index 0775d69..0775d69 --- a/common/modules/rubrication/behaviors/ArtboxSynonymBehavior.php +++ b/common/modules/rubrication/behaviors/ArtboxSynonymBehavior.php diff --git a/common/modules/rubrication/controllers/DefaultController.php b/common/modules/rubrication/controllers/DefaultController.php old mode 100644 new mode 100755 index 4484442..4484442 --- a/common/modules/rubrication/controllers/DefaultController.php +++ b/common/modules/rubrication/controllers/DefaultController.php diff --git a/common/modules/rubrication/controllers/TaxGroupController.php b/common/modules/rubrication/controllers/TaxGroupController.php old mode 100644 new mode 100755 index f112d9c..f112d9c --- a/common/modules/rubrication/controllers/TaxGroupController.php +++ b/common/modules/rubrication/controllers/TaxGroupController.php diff --git a/common/modules/rubrication/controllers/TaxOptionController.php b/common/modules/rubrication/controllers/TaxOptionController.php old mode 100644 new mode 100755 index 3ca7b29..3ca7b29 --- a/common/modules/rubrication/controllers/TaxOptionController.php +++ b/common/modules/rubrication/controllers/TaxOptionController.php diff --git a/common/modules/rubrication/helpers/RubricationHelper.php b/common/modules/rubrication/helpers/RubricationHelper.php old mode 100644 new mode 100755 index 34c7717..34c7717 --- a/common/modules/rubrication/helpers/RubricationHelper.php +++ b/common/modules/rubrication/helpers/RubricationHelper.php diff --git a/common/modules/rubrication/models/TaxGroup.php b/common/modules/rubrication/models/TaxGroup.php old mode 100644 new mode 100755 index 6be9aac..6be9aac --- a/common/modules/rubrication/models/TaxGroup.php +++ b/common/modules/rubrication/models/TaxGroup.php diff --git a/common/modules/rubrication/models/TaxGroupToGroup.php b/common/modules/rubrication/models/TaxGroupToGroup.php old mode 100644 new mode 100755 index 6d3fe73..6d3fe73 --- a/common/modules/rubrication/models/TaxGroupToGroup.php +++ b/common/modules/rubrication/models/TaxGroupToGroup.php diff --git a/common/modules/rubrication/models/TaxOption.php b/common/modules/rubrication/models/TaxOption.php old mode 100644 new mode 100755 index 45d7f3a..45d7f3a --- a/common/modules/rubrication/models/TaxOption.php +++ b/common/modules/rubrication/models/TaxOption.php diff --git a/common/modules/rubrication/models/TaxOptionQuery.php b/common/modules/rubrication/models/TaxOptionQuery.php old mode 100644 new mode 100755 index 5113f13..5113f13 --- a/common/modules/rubrication/models/TaxOptionQuery.php +++ b/common/modules/rubrication/models/TaxOptionQuery.php diff --git a/common/modules/rubrication/models/TaxOptionRelation.php b/common/modules/rubrication/models/TaxOptionRelation.php old mode 100644 new mode 100755 index f80a7f1..f80a7f1 --- a/common/modules/rubrication/models/TaxOptionRelation.php +++ b/common/modules/rubrication/models/TaxOptionRelation.php diff --git a/common/modules/rubrication/models/TaxOptionSearch.php b/common/modules/rubrication/models/TaxOptionSearch.php old mode 100644 new mode 100755 index e31f86b..e31f86b --- a/common/modules/rubrication/models/TaxOptionSearch.php +++ b/common/modules/rubrication/models/TaxOptionSearch.php diff --git a/common/modules/rubrication/models/TaxValueFloat.php b/common/modules/rubrication/models/TaxValueFloat.php old mode 100644 new mode 100755 index df79b56..df79b56 --- a/common/modules/rubrication/models/TaxValueFloat.php +++ b/common/modules/rubrication/models/TaxValueFloat.php diff --git a/common/modules/rubrication/models/TaxValueInt.php b/common/modules/rubrication/models/TaxValueInt.php old mode 100644 new mode 100755 index 1fa9ea2..1fa9ea2 --- a/common/modules/rubrication/models/TaxValueInt.php +++ b/common/modules/rubrication/models/TaxValueInt.php diff --git a/common/modules/rubrication/models/TaxValueLink.php b/common/modules/rubrication/models/TaxValueLink.php old mode 100644 new mode 100755 index f2eb859..f2eb859 --- a/common/modules/rubrication/models/TaxValueLink.php +++ b/common/modules/rubrication/models/TaxValueLink.php diff --git a/common/modules/rubrication/models/TaxValueString.php b/common/modules/rubrication/models/TaxValueString.php old mode 100644 new mode 100755 index d9f617a..d9f617a --- a/common/modules/rubrication/models/TaxValueString.php +++ b/common/modules/rubrication/models/TaxValueString.php diff --git a/common/modules/rubrication/views/default/index.php b/common/modules/rubrication/views/default/index.php old mode 100644 new mode 100755 index 6b05acc..6b05acc --- a/common/modules/rubrication/views/default/index.php +++ b/common/modules/rubrication/views/default/index.php diff --git a/common/modules/rubrication/views/tax-group/_form.php b/common/modules/rubrication/views/tax-group/_form.php old mode 100644 new mode 100755 index 6efdff6..6efdff6 --- a/common/modules/rubrication/views/tax-group/_form.php +++ b/common/modules/rubrication/views/tax-group/_form.php diff --git a/common/modules/rubrication/views/tax-group/create.php b/common/modules/rubrication/views/tax-group/create.php old mode 100644 new mode 100755 index e671dd1..e671dd1 --- a/common/modules/rubrication/views/tax-group/create.php +++ b/common/modules/rubrication/views/tax-group/create.php diff --git a/common/modules/rubrication/views/tax-group/index.php b/common/modules/rubrication/views/tax-group/index.php old mode 100644 new mode 100755 index 5e266ad..5e266ad --- a/common/modules/rubrication/views/tax-group/index.php +++ b/common/modules/rubrication/views/tax-group/index.php diff --git a/common/modules/rubrication/views/tax-group/relations.php b/common/modules/rubrication/views/tax-group/relations.php old mode 100644 new mode 100755 index 2c0c884..2c0c884 --- a/common/modules/rubrication/views/tax-group/relations.php +++ b/common/modules/rubrication/views/tax-group/relations.php diff --git a/common/modules/rubrication/views/tax-group/update.php b/common/modules/rubrication/views/tax-group/update.php old mode 100644 new mode 100755 index 7f3feaa..7f3feaa --- a/common/modules/rubrication/views/tax-group/update.php +++ b/common/modules/rubrication/views/tax-group/update.php diff --git a/common/modules/rubrication/views/tax-group/view.php b/common/modules/rubrication/views/tax-group/view.php old mode 100644 new mode 100755 index 3074048..3074048 --- a/common/modules/rubrication/views/tax-group/view.php +++ b/common/modules/rubrication/views/tax-group/view.php diff --git a/common/modules/rubrication/views/tax-option/_form.php b/common/modules/rubrication/views/tax-option/_form.php old mode 100644 new mode 100755 index f29cdea..f29cdea --- a/common/modules/rubrication/views/tax-option/_form.php +++ b/common/modules/rubrication/views/tax-option/_form.php diff --git a/common/modules/rubrication/views/tax-option/_search.php b/common/modules/rubrication/views/tax-option/_search.php old mode 100644 new mode 100755 index 145b33d..145b33d --- a/common/modules/rubrication/views/tax-option/_search.php +++ b/common/modules/rubrication/views/tax-option/_search.php diff --git a/common/modules/rubrication/views/tax-option/create.php b/common/modules/rubrication/views/tax-option/create.php old mode 100644 new mode 100755 index 71c91d6..71c91d6 --- a/common/modules/rubrication/views/tax-option/create.php +++ b/common/modules/rubrication/views/tax-option/create.php diff --git a/common/modules/rubrication/views/tax-option/index.php b/common/modules/rubrication/views/tax-option/index.php old mode 100644 new mode 100755 index c4c3ffa..c4c3ffa --- a/common/modules/rubrication/views/tax-option/index.php +++ b/common/modules/rubrication/views/tax-option/index.php diff --git a/common/modules/rubrication/views/tax-option/update.php b/common/modules/rubrication/views/tax-option/update.php old mode 100644 new mode 100755 index 5c7164f..5c7164f --- a/common/modules/rubrication/views/tax-option/update.php +++ b/common/modules/rubrication/views/tax-option/update.php diff --git a/common/modules/rubrication/views/tax-option/value/_fields_float.php b/common/modules/rubrication/views/tax-option/value/_fields_float.php old mode 100644 new mode 100755 index 6a35b2f..6a35b2f --- a/common/modules/rubrication/views/tax-option/value/_fields_float.php +++ b/common/modules/rubrication/views/tax-option/value/_fields_float.php diff --git a/common/modules/rubrication/views/tax-option/value/_fields_int.php b/common/modules/rubrication/views/tax-option/value/_fields_int.php old mode 100644 new mode 100755 index 6a35b2f..6a35b2f --- a/common/modules/rubrication/views/tax-option/value/_fields_int.php +++ b/common/modules/rubrication/views/tax-option/value/_fields_int.php diff --git a/common/modules/rubrication/views/tax-option/value/_fields_link.php b/common/modules/rubrication/views/tax-option/value/_fields_link.php old mode 100644 new mode 100755 index faebf0c..faebf0c --- a/common/modules/rubrication/views/tax-option/value/_fields_link.php +++ b/common/modules/rubrication/views/tax-option/value/_fields_link.php diff --git a/common/modules/rubrication/views/tax-option/value/_fields_string.php b/common/modules/rubrication/views/tax-option/value/_fields_string.php old mode 100644 new mode 100755 index 6a35b2f..6a35b2f --- a/common/modules/rubrication/views/tax-option/value/_fields_string.php +++ b/common/modules/rubrication/views/tax-option/value/_fields_string.php diff --git a/common/modules/rubrication/views/tax-option/view.php b/common/modules/rubrication/views/tax-option/view.php old mode 100644 new mode 100755 index 5cdc66e..5cdc66e --- a/common/modules/rubrication/views/tax-option/view.php +++ b/common/modules/rubrication/views/tax-option/view.php diff --git a/common/translation/ru/app.php b/common/translation/ru/app.php old mode 100644 new mode 100755 index 9397773..9397773 --- a/common/translation/ru/app.php +++ b/common/translation/ru/app.php diff --git a/common/widgets/Alert.php b/common/widgets/Alert.php old mode 100644 new mode 100755 index 8f1e590..8f1e590 --- a/common/widgets/Alert.php +++ b/common/widgets/Alert.php diff --git a/common/widgets/BasketHead.php b/common/widgets/BasketHead.php old mode 100644 new mode 100755 index c0dcac6..c0dcac6 --- a/common/widgets/BasketHead.php +++ b/common/widgets/BasketHead.php diff --git a/common/widgets/BasketModal.php b/common/widgets/BasketModal.php old mode 100644 new mode 100755 index d810482..d810482 --- a/common/widgets/BasketModal.php +++ b/common/widgets/BasketModal.php diff --git a/common/widgets/FieldEditor.php b/common/widgets/FieldEditor.php old mode 100644 new mode 100755 index 62261a4..62261a4 --- a/common/widgets/FieldEditor.php +++ b/common/widgets/FieldEditor.php diff --git a/common/widgets/views/basket_head.php b/common/widgets/views/basket_head.php old mode 100644 new mode 100755 index 34f8043..34f8043 --- a/common/widgets/views/basket_head.php +++ b/common/widgets/views/basket_head.php diff --git a/common/widgets/views/basket_modal.php b/common/widgets/views/basket_modal.php old mode 100644 new mode 100755 index 2ed0e5f..2ed0e5f --- a/common/widgets/views/basket_modal.php +++ b/common/widgets/views/basket_modal.php diff --git a/common/widgets/views/education_field.php b/common/widgets/views/education_field.php old mode 100644 new mode 100755 index ca6ad41..ca6ad41 --- a/common/widgets/views/education_field.php +++ b/common/widgets/views/education_field.php diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 index a7b5861..6c3c7ad --- a/composer.json +++ b/composer.json @@ -33,7 +33,8 @@ "FortAwesome/Font-Awesome": "*", "kartik-v/yii2-widget-datepicker": "*", "unclead/yii2-multiple-input": "~1.0", - "codeception/codeception":"*" + "codeception/codeception":"*", + "fzaninotto/faker": "*" }, "require-dev": { "yiisoft/yii2-codeception": "*", diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 index dfb8f78..537c645 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a7d36c8cf4be5f624bef0426936b9594", - "content-hash": "1e53816a430c74ec792d83ade8eac412", + "hash": "4afb6efd9462d7849ba943cf2e1be7d4", + "content-hash": "8fd204b3f3357e11ad0224e0dd9bf878", "packages": [ { "name": "2amigos/yii2-transliterator-helper", @@ -739,7 +739,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a", "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, @@ -919,6 +919,56 @@ "time": "2016-03-23 12:04:52" }, { + "name": "fzaninotto/faker", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", + "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "ext-intl": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2016-03-29 16:49:43" + }, + { "name": "guzzlehttp/guzzle", "version": "dev-master", "source": { @@ -928,7 +978,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8e4e5ef9fbcc6ced335f398b32dcf2a0e4a24acb", "reference": "d094e337976dff9d8e2424e8485872194e768662", "shasum": "" }, @@ -1981,7 +2031,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a1b63266c046e1856fd03812a4e0ac2b51aa2d5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/78e05b2c945073d0cf59139b7e654aeec7b1ac1c", "reference": "1a1b63266c046e1856fd03812a4e0ac2b51aa2d5", "shasum": "" }, @@ -3533,56 +3583,6 @@ } }, { - "name": "fzaninotto/faker", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", - "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "time": "2016-03-29 16:49:43" - }, - { "name": "phpspec/php-diff", "version": "dev-master", "source": { diff --git a/console/config/.gitignore b/console/config/.gitignore old mode 100644 new mode 100755 index 20da318..20da318 --- a/console/config/.gitignore +++ b/console/config/.gitignore diff --git a/console/config/bootstrap.php b/console/config/bootstrap.php old mode 100644 new mode 100755 index a4abe2d..a4abe2d --- a/console/config/bootstrap.php +++ b/console/config/bootstrap.php diff --git a/console/config/main.php b/console/config/main.php old mode 100644 new mode 100755 index 2c7d7d4..2c7d7d4 --- a/console/config/main.php +++ b/console/config/main.php diff --git a/console/config/params.php b/console/config/params.php old mode 100644 new mode 100755 index 7f754b9..7f754b9 --- a/console/config/params.php +++ b/console/config/params.php diff --git a/console/controllers/.gitkeep b/console/controllers/.gitkeep old mode 100644 new mode 100755 index e69de29..e69de29 --- a/console/controllers/.gitkeep +++ b/console/controllers/.gitkeep diff --git a/console/migrations/m130524_201442_init.php b/console/migrations/m130524_201442_init.php old mode 100644 new mode 100755 index 6b649f4..6b649f4 --- a/console/migrations/m130524_201442_init.php +++ b/console/migrations/m130524_201442_init.php diff --git a/console/migrations/m160126_071717_rubrication.php b/console/migrations/m160126_071717_rubrication.php old mode 100644 new mode 100755 index 200cb49..200cb49 --- a/console/migrations/m160126_071717_rubrication.php +++ b/console/migrations/m160126_071717_rubrication.php diff --git a/console/migrations/m160128_101543_fields.php b/console/migrations/m160128_101543_fields.php old mode 100644 new mode 100755 index cb49e9e..cb49e9e --- a/console/migrations/m160128_101543_fields.php +++ b/console/migrations/m160128_101543_fields.php diff --git a/console/migrations/m160208_111900_blog.php b/console/migrations/m160208_111900_blog.php old mode 100644 new mode 100755 index ca88b1c..ca88b1c --- a/console/migrations/m160208_111900_blog.php +++ b/console/migrations/m160208_111900_blog.php diff --git a/console/migrations/m160304_054017_realtion.php b/console/migrations/m160304_054017_realtion.php old mode 100644 new mode 100755 index 4f5b11c..4f5b11c --- a/console/migrations/m160304_054017_realtion.php +++ b/console/migrations/m160304_054017_realtion.php diff --git a/console/migrations/m160304_065108_product.php b/console/migrations/m160304_065108_product.php old mode 100644 new mode 100755 index 48100e3..48100e3 --- a/console/migrations/m160304_065108_product.php +++ b/console/migrations/m160304_065108_product.php diff --git a/console/migrations/m160320_174258_customer.php b/console/migrations/m160320_174258_customer.php old mode 100644 new mode 100755 index f0b22ca..f0b22ca --- a/console/migrations/m160320_174258_customer.php +++ b/console/migrations/m160320_174258_customer.php diff --git a/console/migrations/m160321_232402_orders.php b/console/migrations/m160321_232402_orders.php old mode 100644 new mode 100755 index 2e03a91..2e03a91 --- a/console/migrations/m160321_232402_orders.php +++ b/console/migrations/m160321_232402_orders.php diff --git a/console/migrations/m160323_234304_product_image.php b/console/migrations/m160323_234304_product_image.php old mode 100644 new mode 100755 index 7ed44d0..7ed44d0 --- a/console/migrations/m160323_234304_product_image.php +++ b/console/migrations/m160323_234304_product_image.php diff --git a/console/migrations/m160324_075409_product_option.php b/console/migrations/m160324_075409_product_option.php old mode 100644 new mode 100755 index 4fab544..4fab544 --- a/console/migrations/m160324_075409_product_option.php +++ b/console/migrations/m160324_075409_product_option.php diff --git a/console/migrations/m160324_114404_orders_items_items_fk.php b/console/migrations/m160324_114404_orders_items_items_fk.php old mode 100644 new mode 100755 index e8a32cc..e8a32cc --- a/console/migrations/m160324_114404_orders_items_items_fk.php +++ b/console/migrations/m160324_114404_orders_items_items_fk.php diff --git a/console/migrations/m160331_122305_template_location.php b/console/migrations/m160331_122305_template_location.php deleted file mode 100644 index 92ea718..0000000 --- a/console/migrations/m160331_122305_template_location.php +++ /dev/null @@ -1,27 +0,0 @@ -createTable('{{%template_location}}', [ - 'template_location_id' => $this->primaryKey(), - 'template_location_name' => $this->string(255)->notNull(), - 'template_location_title' => $this->string(255), - 'width' => $this->integer(4)->notNull(), - 'height' => $this->integer(4)->notNull(), - 'sort' => $this->integer(6)->notNull(), - 'is_slider' => $this->smallInteger(1), - 'is_banner' => $this->smallInteger(1), - ]); - } - - public function down() - { - $this->dropTable('{{%template_location}}'); - } - - -} diff --git a/console/migrations/m160331_132149_slider.php b/console/migrations/m160331_132149_slider.php old mode 100644 new mode 100755 index c138b38..f14b08a --- a/console/migrations/m160331_132149_slider.php +++ b/console/migrations/m160331_132149_slider.php @@ -8,18 +8,17 @@ class m160331_132149_slider extends Migration { $this->createTable('{{%slider}}', [ 'slider_id' => $this->primaryKey(), - 'template_location_id' => $this->integer(4)->notNull(), 'speed' => $this->integer(4), 'duration' => $this->integer(4), 'title' => $this->string(200), 'status' => $this->smallInteger(1), + 'width' => $this->integer(4), + 'height' => $this->integer(4), ]); - $this->addForeignKey('template_location_slider_fk', 'template_location', 'template_location_id', 'slider', 'template_location_id', 'CASCADE', 'CASCADE'); } public function down() { - //$this->dropForeignKey('template_location_slider_fk', '{{%template_location}}'); $this->dropTable('{{%slider}}'); } diff --git a/console/migrations/m160404_081649_banner.php b/console/migrations/m160404_081649_banner.php new file mode 100755 index 0000000..c12782f --- /dev/null +++ b/console/migrations/m160404_081649_banner.php @@ -0,0 +1,26 @@ +createTable('{{%banner}}', [ + 'banner_id' => $this->primaryKey(), + 'image' => $this->string(255), + 'alt' => $this->string(255), + 'title' => $this->string(255), + 'url' => $this->string(255), + 'status' => $this->smallInteger(1), + 'width' => $this->integer(4), + 'height' => $this->integer(4), + ]); + } + + public function down() + { + $this->dropTable('{{%banner}}'); + } + +} diff --git a/console/migrations/m160405_101056_create_slider_images.php b/console/migrations/m160405_101056_create_slider_images.php new file mode 100755 index 0000000..1093157 --- /dev/null +++ b/console/migrations/m160405_101056_create_slider_images.php @@ -0,0 +1,36 @@ +createTable('slider_image', [ + 'slider_image_id' => $this->primaryKey(), + 'slider_id' => $this->integer(), + 'image' => $this->string(255), + 'alt' => $this->string(255), + 'title' => $this->string(255), + 'url' => $this->string(255), + 'status' => $this->smallInteger(1), + 'sort' => $this->integer(6), + ]); + $this->addForeignKey('slider_slider_image_fk', 'slider_image', 'slider_id', 'slider', 'slider_id', 'CASCADE', 'CASCADE'); + } + + /** + * @inheritdoc + */ + public function down() + { + $this->dropForeignKey('slider_slider_image_fk', '{{%slider_image}}'); + $this->dropTable('slider_image'); + } +} diff --git a/console/models/.gitkeep b/console/models/.gitkeep old mode 100644 new mode 100755 index 72e8ffc..72e8ffc --- a/console/models/.gitkeep +++ b/console/models/.gitkeep diff --git a/console/runtime/.gitignore b/console/runtime/.gitignore old mode 100644 new mode 100755 index c96a04f..c96a04f --- a/console/runtime/.gitignore +++ b/console/runtime/.gitignore diff --git a/environments/dev/backend/config/main-local.php b/environments/dev/backend/config/main-local.php old mode 100644 new mode 100755 index d9a8ceb..d9a8ceb --- a/environments/dev/backend/config/main-local.php +++ b/environments/dev/backend/config/main-local.php diff --git a/environments/dev/backend/config/params-local.php b/environments/dev/backend/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/dev/backend/config/params-local.php +++ b/environments/dev/backend/config/params-local.php diff --git a/environments/dev/backend/web/index-test.php b/environments/dev/backend/web/index-test.php old mode 100644 new mode 100755 index 8b96707..8b96707 --- a/environments/dev/backend/web/index-test.php +++ b/environments/dev/backend/web/index-test.php diff --git a/environments/dev/backend/web/index.php b/environments/dev/backend/web/index.php old mode 100644 new mode 100755 index 6038167..6038167 --- a/environments/dev/backend/web/index.php +++ b/environments/dev/backend/web/index.php diff --git a/environments/dev/common/config/main-local.php b/environments/dev/common/config/main-local.php old mode 100644 new mode 100755 index 43db30e..43db30e --- a/environments/dev/common/config/main-local.php +++ b/environments/dev/common/config/main-local.php diff --git a/environments/dev/common/config/params-local.php b/environments/dev/common/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/dev/common/config/params-local.php +++ b/environments/dev/common/config/params-local.php diff --git a/environments/dev/console/config/main-local.php b/environments/dev/console/config/main-local.php old mode 100644 new mode 100755 index 1d2118f..1d2118f --- a/environments/dev/console/config/main-local.php +++ b/environments/dev/console/config/main-local.php diff --git a/environments/dev/console/config/params-local.php b/environments/dev/console/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/dev/console/config/params-local.php +++ b/environments/dev/console/config/params-local.php diff --git a/environments/dev/frontend/config/main-local.php b/environments/dev/frontend/config/main-local.php old mode 100644 new mode 100755 index 5aea03e..5aea03e --- a/environments/dev/frontend/config/main-local.php +++ b/environments/dev/frontend/config/main-local.php diff --git a/environments/dev/frontend/config/params-local.php b/environments/dev/frontend/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/dev/frontend/config/params-local.php +++ b/environments/dev/frontend/config/params-local.php diff --git a/environments/dev/frontend/web/index-test.php b/environments/dev/frontend/web/index-test.php old mode 100644 new mode 100755 index 66a9520..66a9520 --- a/environments/dev/frontend/web/index-test.php +++ b/environments/dev/frontend/web/index-test.php diff --git a/environments/dev/frontend/web/index.php b/environments/dev/frontend/web/index.php old mode 100644 new mode 100755 index 6038167..6038167 --- a/environments/dev/frontend/web/index.php +++ b/environments/dev/frontend/web/index.php diff --git a/environments/dev/yii b/environments/dev/yii old mode 100644 new mode 100755 index 6f0c6d2..6f0c6d2 --- a/environments/dev/yii +++ b/environments/dev/yii diff --git a/environments/index.php b/environments/index.php old mode 100644 new mode 100755 index 19c989d..19c989d --- a/environments/index.php +++ b/environments/index.php diff --git a/environments/prod/backend/config/main-local.php b/environments/prod/backend/config/main-local.php old mode 100644 new mode 100755 index af46ba3..af46ba3 --- a/environments/prod/backend/config/main-local.php +++ b/environments/prod/backend/config/main-local.php diff --git a/environments/prod/backend/config/params-local.php b/environments/prod/backend/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/prod/backend/config/params-local.php +++ b/environments/prod/backend/config/params-local.php diff --git a/environments/prod/backend/web/index.php b/environments/prod/backend/web/index.php old mode 100644 new mode 100755 index 674803a..674803a --- a/environments/prod/backend/web/index.php +++ b/environments/prod/backend/web/index.php diff --git a/environments/prod/common/config/main-local.php b/environments/prod/common/config/main-local.php old mode 100644 new mode 100755 index 84c4d9f..84c4d9f --- a/environments/prod/common/config/main-local.php +++ b/environments/prod/common/config/main-local.php diff --git a/environments/prod/common/config/params-local.php b/environments/prod/common/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/prod/common/config/params-local.php +++ b/environments/prod/common/config/params-local.php diff --git a/environments/prod/console/config/main-local.php b/environments/prod/console/config/main-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/prod/console/config/main-local.php +++ b/environments/prod/console/config/main-local.php diff --git a/environments/prod/console/config/params-local.php b/environments/prod/console/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/prod/console/config/params-local.php +++ b/environments/prod/console/config/params-local.php diff --git a/environments/prod/frontend/config/main-local.php b/environments/prod/frontend/config/main-local.php old mode 100644 new mode 100755 index af46ba3..af46ba3 --- a/environments/prod/frontend/config/main-local.php +++ b/environments/prod/frontend/config/main-local.php diff --git a/environments/prod/frontend/config/params-local.php b/environments/prod/frontend/config/params-local.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/environments/prod/frontend/config/params-local.php +++ b/environments/prod/frontend/config/params-local.php diff --git a/environments/prod/frontend/web/index.php b/environments/prod/frontend/web/index.php old mode 100644 new mode 100755 index 674803a..674803a --- a/environments/prod/frontend/web/index.php +++ b/environments/prod/frontend/web/index.php diff --git a/environments/prod/yii b/environments/prod/yii old mode 100644 new mode 100755 index 1fe0342..1fe0342 --- a/environments/prod/yii +++ b/environments/prod/yii diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php old mode 100644 new mode 100755 index c8d1046..c8d1046 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php diff --git a/frontend/assets/IeAsset.php b/frontend/assets/IeAsset.php old mode 100644 new mode 100755 index 8b4afae..8b4afae --- a/frontend/assets/IeAsset.php +++ b/frontend/assets/IeAsset.php diff --git a/frontend/config/.gitignore b/frontend/config/.gitignore old mode 100644 new mode 100755 index 20da318..20da318 --- a/frontend/config/.gitignore +++ b/frontend/config/.gitignore diff --git a/frontend/config/bootstrap.php b/frontend/config/bootstrap.php old mode 100644 new mode 100755 index b3d9bbc..b3d9bbc --- a/frontend/config/bootstrap.php +++ b/frontend/config/bootstrap.php diff --git a/frontend/config/main.php b/frontend/config/main.php old mode 100644 new mode 100755 index 8509b79..8509b79 --- a/frontend/config/main.php +++ b/frontend/config/main.php diff --git a/frontend/config/params.php b/frontend/config/params.php old mode 100644 new mode 100755 index 7f754b9..7f754b9 --- a/frontend/config/params.php +++ b/frontend/config/params.php diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php old mode 100644 new mode 100755 index e60d215..e60d215 --- a/frontend/controllers/CabinetController.php +++ b/frontend/controllers/CabinetController.php diff --git a/frontend/controllers/CatalogController.php b/frontend/controllers/CatalogController.php old mode 100644 new mode 100755 index 1db1fe3..1db1fe3 --- a/frontend/controllers/CatalogController.php +++ b/frontend/controllers/CatalogController.php diff --git a/frontend/controllers/OrdersController.php b/frontend/controllers/OrdersController.php old mode 100644 new mode 100755 index ab576bd..ab576bd --- a/frontend/controllers/OrdersController.php +++ b/frontend/controllers/OrdersController.php diff --git a/frontend/controllers/PostController.php b/frontend/controllers/PostController.php old mode 100644 new mode 100755 index 8935ca7..8935ca7 --- a/frontend/controllers/PostController.php +++ b/frontend/controllers/PostController.php diff --git a/frontend/controllers/PuttyController.php b/frontend/controllers/PuttyController.php old mode 100644 new mode 100755 index a066df0..a066df0 --- a/frontend/controllers/PuttyController.php +++ b/frontend/controllers/PuttyController.php diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php old mode 100644 new mode 100755 index b6b60fb..b6b60fb --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php diff --git a/frontend/models/ContactForm.php b/frontend/models/ContactForm.php old mode 100644 new mode 100755 index 613abb5..613abb5 --- a/frontend/models/ContactForm.php +++ b/frontend/models/ContactForm.php diff --git a/frontend/models/PasswordResetRequestForm.php b/frontend/models/PasswordResetRequestForm.php old mode 100644 new mode 100755 index c09f6f7..c09f6f7 --- a/frontend/models/PasswordResetRequestForm.php +++ b/frontend/models/PasswordResetRequestForm.php diff --git a/frontend/models/ResetPasswordForm.php b/frontend/models/ResetPasswordForm.php old mode 100644 new mode 100755 index dd48f52..dd48f52 --- a/frontend/models/ResetPasswordForm.php +++ b/frontend/models/ResetPasswordForm.php diff --git a/frontend/models/SignupForm.php b/frontend/models/SignupForm.php old mode 100644 new mode 100755 index dca4b88..dca4b88 --- a/frontend/models/SignupForm.php +++ b/frontend/models/SignupForm.php diff --git a/frontend/runtime/.gitignore b/frontend/runtime/.gitignore old mode 100644 new mode 100755 index c96a04f..c96a04f --- a/frontend/runtime/.gitignore +++ b/frontend/runtime/.gitignore diff --git a/frontend/views/cabinet/bookmarks.php b/frontend/views/cabinet/bookmarks.php old mode 100644 new mode 100755 index 804d20d..804d20d --- a/frontend/views/cabinet/bookmarks.php +++ b/frontend/views/cabinet/bookmarks.php diff --git a/frontend/views/cabinet/index.php b/frontend/views/cabinet/index.php old mode 100644 new mode 100755 index 0cd910e..0cd910e --- a/frontend/views/cabinet/index.php +++ b/frontend/views/cabinet/index.php diff --git a/frontend/views/cabinet/my-orders.php b/frontend/views/cabinet/my-orders.php old mode 100644 new mode 100755 index 72f32c9..72f32c9 --- a/frontend/views/cabinet/my-orders.php +++ b/frontend/views/cabinet/my-orders.php diff --git a/frontend/views/cabinet/update.php b/frontend/views/cabinet/update.php old mode 100644 new mode 100755 index dbb8439..dbb8439 --- a/frontend/views/cabinet/update.php +++ b/frontend/views/cabinet/update.php diff --git a/frontend/views/catalog/categories.php b/frontend/views/catalog/categories.php old mode 100644 new mode 100755 index cefd71b..cefd71b --- a/frontend/views/catalog/categories.php +++ b/frontend/views/catalog/categories.php diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php old mode 100644 new mode 100755 index 9b5d9da..9b5d9da --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php diff --git a/frontend/views/catalog/product_item.php b/frontend/views/catalog/product_item.php old mode 100644 new mode 100755 index 29b4c36..29b4c36 --- a/frontend/views/catalog/product_item.php +++ b/frontend/views/catalog/product_item.php diff --git a/frontend/views/catalog/products.php b/frontend/views/catalog/products.php old mode 100644 new mode 100755 index e725186..e725186 --- a/frontend/views/catalog/products.php +++ b/frontend/views/catalog/products.php diff --git a/frontend/views/layouts/cabinet.php b/frontend/views/layouts/cabinet.php old mode 100644 new mode 100755 index 35243f7..35243f7 --- a/frontend/views/layouts/cabinet.php +++ b/frontend/views/layouts/cabinet.php diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php old mode 100644 new mode 100755 index 9f53ae1..9f53ae1 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php diff --git a/frontend/views/layouts/main_menu.php b/frontend/views/layouts/main_menu.php old mode 100644 new mode 100755 index 833982e..833982e --- a/frontend/views/layouts/main_menu.php +++ b/frontend/views/layouts/main_menu.php diff --git a/frontend/views/layouts/products.php b/frontend/views/layouts/products.php old mode 100644 new mode 100755 index 4d6b8b1..4d6b8b1 --- a/frontend/views/layouts/products.php +++ b/frontend/views/layouts/products.php diff --git a/frontend/views/layouts/site_content.php b/frontend/views/layouts/site_content.php old mode 100644 new mode 100755 index 0d4acbb..0d4acbb --- a/frontend/views/layouts/site_content.php +++ b/frontend/views/layouts/site_content.php diff --git a/frontend/views/layouts/why_us.php b/frontend/views/layouts/why_us.php old mode 100644 new mode 100755 index 788ffbc..788ffbc --- a/frontend/views/layouts/why_us.php +++ b/frontend/views/layouts/why_us.php diff --git a/frontend/views/modal/forgot_password_form_model_window.php b/frontend/views/modal/forgot_password_form_model_window.php old mode 100644 new mode 100755 index eabe848..eabe848 --- a/frontend/views/modal/forgot_password_form_model_window.php +++ b/frontend/views/modal/forgot_password_form_model_window.php diff --git a/frontend/views/modal/login_window_model_window.php b/frontend/views/modal/login_window_model_window.php old mode 100644 new mode 100755 index 02ed6a0..02ed6a0 --- a/frontend/views/modal/login_window_model_window.php +++ b/frontend/views/modal/login_window_model_window.php diff --git a/frontend/views/modal/registration_window_model_window.php b/frontend/views/modal/registration_window_model_window.php old mode 100644 new mode 100755 index 160f165..160f165 --- a/frontend/views/modal/registration_window_model_window.php +++ b/frontend/views/modal/registration_window_model_window.php diff --git a/frontend/views/orders/basket-step-01.php b/frontend/views/orders/basket-step-01.php old mode 100644 new mode 100755 index 3a57a2d..3a57a2d --- a/frontend/views/orders/basket-step-01.php +++ b/frontend/views/orders/basket-step-01.php diff --git a/frontend/views/orders/basket-step-02.php b/frontend/views/orders/basket-step-02.php old mode 100644 new mode 100755 index beaf0b4..beaf0b4 --- a/frontend/views/orders/basket-step-02.php +++ b/frontend/views/orders/basket-step-02.php diff --git a/frontend/views/orders/basket-step-03.php b/frontend/views/orders/basket-step-03.php old mode 100644 new mode 100755 index 0c6deaf..0c6deaf --- a/frontend/views/orders/basket-step-03.php +++ b/frontend/views/orders/basket-step-03.php diff --git a/frontend/views/putty/catalog.php b/frontend/views/putty/catalog.php old mode 100644 new mode 100755 index 1341581..1341581 --- a/frontend/views/putty/catalog.php +++ b/frontend/views/putty/catalog.php diff --git a/frontend/views/putty/category.php b/frontend/views/putty/category.php old mode 100644 new mode 100755 index fdd12d0..fdd12d0 --- a/frontend/views/putty/category.php +++ b/frontend/views/putty/category.php diff --git a/frontend/views/putty/contacts.php b/frontend/views/putty/contacts.php old mode 100644 new mode 100755 index 88df15a..88df15a --- a/frontend/views/putty/contacts.php +++ b/frontend/views/putty/contacts.php diff --git a/frontend/views/putty/delivery.php b/frontend/views/putty/delivery.php old mode 100644 new mode 100755 index 8d1d15f..8d1d15f --- a/frontend/views/putty/delivery.php +++ b/frontend/views/putty/delivery.php diff --git a/frontend/views/putty/item-card-open.php b/frontend/views/putty/item-card-open.php old mode 100644 new mode 100755 index dd255fa..dd255fa --- a/frontend/views/putty/item-card-open.php +++ b/frontend/views/putty/item-card-open.php diff --git a/frontend/views/putty/manufacturers.php b/frontend/views/putty/manufacturers.php old mode 100644 new mode 100755 index 3900ca6..3900ca6 --- a/frontend/views/putty/manufacturers.php +++ b/frontend/views/putty/manufacturers.php diff --git a/frontend/views/site/about.php b/frontend/views/site/about.php old mode 100644 new mode 100755 index 8eb0764..8eb0764 --- a/frontend/views/site/about.php +++ b/frontend/views/site/about.php diff --git a/frontend/views/site/contact.php b/frontend/views/site/contact.php old mode 100644 new mode 100755 index dcad18f..dcad18f --- a/frontend/views/site/contact.php +++ b/frontend/views/site/contact.php diff --git a/frontend/views/site/error.php b/frontend/views/site/error.php old mode 100644 new mode 100755 index def81b0..def81b0 --- a/frontend/views/site/error.php +++ b/frontend/views/site/error.php diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php old mode 100644 new mode 100755 index bff2da7..9867294 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -1,296 +1,147 @@ -title = 'My Yii Application'; -?> - - -
-
-
-
-
-
-
- Фанера влагостойкая ФСФ (slide1) -
повышенной влагостойкости -
2500х1250х12мм(лист) сорт СР/С
-
-
- -
-
шлифованные внешние слои фанерного листа
-
высокая устойчивость к влаге
-
повышенная плотность
-
стабильность толщины по всему периметру фанеры
-
- - подробнее - -
-
-
Супер цена
-
345,90 -
грн./лист
-
-
-
-
-
-
-
-
-
-
- Фанера влагостойкая ФСФ (slide2) -
повышенной влагостойкости -
2500х1250х12мм(лист) сорт СР/С
-
-
- -
-
шлифованные внешние слои фанерного листа
-
высокая устойчивость к влаге
-
повышенная плотность
-
стабильность толщины по всему периметру фанеры
-
- - подробнее - -
-
-
Супер цена
-
345,90 -
грн./лист
-
-
-
-
-
-
-
-
-
-
- Фанера влагостойкая ФСФ (slide3) -
повышенной влагостойкости -
2500х1250х12мм(лист) сорт СР/С
-
-
- -
-
шлифованные внешние слои фанерного листа
-
высокая устойчивость к влаге
-
повышенная плотность
-
стабильность толщины по всему периметру фанеры
-
- - подробнее - -
-
-
Супер цена
-
345,90 -
грн./лист
-
-
-
-
-
-
-
-
-
-
- Фанера влагостойкая ФСФ (slide4) -
повышенной влагостойкости -
2500х1250х12мм(лист) сорт СР/С
-
-
- -
-
шлифованные внешние слои фанерного листа
-
высокая устойчивость к влаге
-
повышенная плотность
-
стабильность толщины по всему периметру фанеры
-
- - подробнее - -
-
-
Супер цена
-
345,90 -
грн./лист
-
-
-
-
-
-
-
-
-
-
- Фанера влагостойкая ФСФ (slide5) -
повышенной влагостойкости -
2500х1250х12мм(лист) сорт СР/С
-
-
- -
-
шлифованные внешние слои фанерного листа
-
высокая устойчивость к влаге
-
повышенная плотность
-
стабильность толщины по всему периметру фанеры
-
- - подробнее - -
-
-
Супер цена
-
345,90 -
грн./лист
-
-
-
-
-
-
-
-
- - - - -
-
-
Новинки
-
-
-
Новинка
-
Toп
-
-
Штукатурка гипсовая Кнауф Ротбанд 30 кг белая
 -
Бренд: Knauf
-
Штукатурки
-
102.05 грн.
- - добавить к сравнению -
-
-
Новинка
-
-
Ceresit CR 65 гидроизоляционная смесь, 25кг
 -
Бренд: Ceresit
-
Гидроизоляция
-
187.00 грн.
- - добавить к сравнению -
-
-
Новинка
-
Toп
-
-
Ruukki Металлочерепица Monterrey Standard 0,5мм, ПЭ глянец
 -
Бренд: Rukki
-
Металлочерепица
-
168.40 грн.
- - добавить к сравнению -
-
-
Новинка
-
Toп
-
-
Авеню Плитка тротуарная Брусчатка, 200x100x40, вишня
 -
Бренд: Авеню
-
Тротуарная плитка
-
120.00 грн.
- - добавить к сравнению -
-
-
-
-
- -
-
-
Почему выбирают нас
-
-
Актуальные цены
на сайте
-
Услуги дизайна
-
Индивидуальный заказ
товара
-
Удобная форма
оплаты
-
Консультации
специалистов
-
Помощь в оформлении
документов
-
Своевременная
доставка
-
Скидки постоянным
клиентам
-
-
-
- - -
-
-
Производители
- -
-
- -
-
-
У нас покупают
-
-
- - -
Плиточные клеи
- -
-
- - -
Металлочерепица
- -
-
- - -
Водосточные
системы
- -
-
- - -
Утеплители
- -
-
- - -
Гипсокартон
- -
-
- - -
Трубы
- -
-
-
-
+title = 'My Yii Application'; +?> + + +
+ "Hello"]); ?> +
+ + + + + +
+
+
Новинки
+
+
+
Новинка
+
Toп
+
+
Штукатурка гипсовая Кнауф Ротбанд 30 кг белая
 +
Бренд: Knauf
+
Штукатурки
+
102.05 грн.
+ + добавить к сравнению +
+
+
Новинка
+
+
Ceresit CR 65 гидроизоляционная смесь, 25кг
 +
Бренд: Ceresit
+
Гидроизоляция
+
187.00 грн.
+ + добавить к сравнению +
+
+
Новинка
+
Toп
+
+
Ruukki Металлочерепица Monterrey Standard 0,5мм, ПЭ глянец
 +
Бренд: Rukki
+
Металлочерепица
+
168.40 грн.
+ + добавить к сравнению +
+
+
Новинка
+
Toп
+
+
Авеню Плитка тротуарная Брусчатка, 200x100x40, вишня
 +
Бренд: Авеню
+
Тротуарная плитка
+
120.00 грн.
+ + добавить к сравнению +
+
+
+
+
+ +
+
+
Почему выбирают нас
+
+
Актуальные цены
на сайте
+
Услуги дизайна
+
Индивидуальный заказ
товара
+
Удобная форма
оплаты
+
Консультации
специалистов
+
Помощь в оформлении
документов
+
Своевременная
доставка
+
Скидки постоянным
клиентам
+
+
+
+ + +
+
+
Производители
+ +
+
+ +
+
+
У нас покупают
+
+
+ + +
Плиточные клеи
+ +
+
+ + +
Металлочерепица
+ +
+
+ + +
Водосточные
системы
+ +
+
+ + +
Утеплители
+ +
+
+ + +
Гипсокартон
+ +
+
+ + +
Трубы
+ +
+
+
+
diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php old mode 100644 new mode 100755 index 90e81c4..90e81c4 --- a/frontend/views/site/login.php +++ b/frontend/views/site/login.php diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php old mode 100644 new mode 100755 index 9f6822e..9f6822e --- a/frontend/views/site/requestPasswordResetToken.php +++ b/frontend/views/site/requestPasswordResetToken.php diff --git a/frontend/views/site/resetPassword.php b/frontend/views/site/resetPassword.php old mode 100644 new mode 100755 index 36ef452..36ef452 --- a/frontend/views/site/resetPassword.php +++ b/frontend/views/site/resetPassword.php diff --git a/frontend/views/site/signup.php b/frontend/views/site/signup.php old mode 100644 new mode 100755 index de9dad6..de9dad6 --- a/frontend/views/site/signup.php +++ b/frontend/views/site/signup.php diff --git a/frontend/web/.gitignore b/frontend/web/.gitignore old mode 100644 new mode 100755 index 25c74e6..25c74e6 --- a/frontend/web/.gitignore +++ b/frontend/web/.gitignore diff --git a/frontend/web/assets/.gitignore b/frontend/web/assets/.gitignore old mode 100644 new mode 100755 index d6b7ef3..d6b7ef3 --- a/frontend/web/assets/.gitignore +++ b/frontend/web/assets/.gitignore diff --git a/frontend/web/css/catalog.css b/frontend/web/css/catalog.css old mode 100644 new mode 100755 index 4449db0..4449db0 --- a/frontend/web/css/catalog.css +++ b/frontend/web/css/catalog.css diff --git a/frontend/web/css/concat_all.css b/frontend/web/css/concat_all.css old mode 100644 new mode 100755 index 132890b..132890b --- a/frontend/web/css/concat_all.css +++ b/frontend/web/css/concat_all.css diff --git a/frontend/web/css/concat_all_back.css b/frontend/web/css/concat_all_back.css old mode 100644 new mode 100755 index b359e28..b359e28 --- a/frontend/web/css/concat_all_back.css +++ b/frontend/web/css/concat_all_back.css diff --git a/frontend/web/css/fonts.css b/frontend/web/css/fonts.css old mode 100644 new mode 100755 index 3f4dd12..3f4dd12 --- a/frontend/web/css/fonts.css +++ b/frontend/web/css/fonts.css diff --git a/frontend/web/css/ie.css b/frontend/web/css/ie.css old mode 100644 new mode 100755 index 15beb76..15beb76 --- a/frontend/web/css/ie.css +++ b/frontend/web/css/ie.css diff --git a/frontend/web/css/item_card_open.css b/frontend/web/css/item_card_open.css old mode 100644 new mode 100755 index 838320b..838320b --- a/frontend/web/css/item_card_open.css +++ b/frontend/web/css/item_card_open.css diff --git a/frontend/web/css/owl.carousel.css b/frontend/web/css/owl.carousel.css old mode 100644 new mode 100755 index 72336a1..72336a1 --- a/frontend/web/css/owl.carousel.css +++ b/frontend/web/css/owl.carousel.css diff --git a/frontend/web/css/site.css b/frontend/web/css/site.css old mode 100644 new mode 100755 index 25df5fb..25df5fb --- a/frontend/web/css/site.css +++ b/frontend/web/css/site.css diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css old mode 100644 new mode 100755 index 3da1752..3da1752 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css diff --git a/frontend/web/favicon.ico b/frontend/web/favicon.ico old mode 100644 new mode 100755 index 580ed73..580ed73 Binary files a/frontend/web/favicon.ico and b/frontend/web/favicon.ico differ diff --git a/frontend/web/fonts/FontAwesome.otf b/frontend/web/fonts/FontAwesome.otf old mode 100644 new mode 100755 index 681bdd4..681bdd4 Binary files a/frontend/web/fonts/FontAwesome.otf and b/frontend/web/fonts/FontAwesome.otf differ diff --git a/frontend/web/fonts/HelveticaBlack/HelveticaBlack.eot b/frontend/web/fonts/HelveticaBlack/HelveticaBlack.eot old mode 100644 new mode 100755 index 99c2b3e..99c2b3e Binary files a/frontend/web/fonts/HelveticaBlack/HelveticaBlack.eot and b/frontend/web/fonts/HelveticaBlack/HelveticaBlack.eot differ diff --git a/frontend/web/fonts/HelveticaBlack/HelveticaBlack.ttf b/frontend/web/fonts/HelveticaBlack/HelveticaBlack.ttf old mode 100644 new mode 100755 index 923e273..923e273 Binary files a/frontend/web/fonts/HelveticaBlack/HelveticaBlack.ttf and b/frontend/web/fonts/HelveticaBlack/HelveticaBlack.ttf differ diff --git a/frontend/web/fonts/HelveticaBlack/HelveticaBlack.woff b/frontend/web/fonts/HelveticaBlack/HelveticaBlack.woff old mode 100644 new mode 100755 index 4c807bb..4c807bb Binary files a/frontend/web/fonts/HelveticaBlack/HelveticaBlack.woff and b/frontend/web/fonts/HelveticaBlack/HelveticaBlack.woff differ diff --git a/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.eot b/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.eot old mode 100644 new mode 100755 index bcbcf1c..bcbcf1c Binary files a/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.eot and b/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.eot differ diff --git a/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.ttf b/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.ttf old mode 100644 new mode 100755 index b4701e3..b4701e3 Binary files a/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.ttf and b/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.woff b/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.woff old mode 100644 new mode 100755 index fd62f2c..fd62f2c Binary files a/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.woff and b/frontend/web/fonts/HelveticaBlackItalic/HelveticaBlackItalic.woff differ diff --git a/frontend/web/fonts/HelveticaBold/HelveticaBold.eot b/frontend/web/fonts/HelveticaBold/HelveticaBold.eot old mode 100644 new mode 100755 index 48527c3..48527c3 Binary files a/frontend/web/fonts/HelveticaBold/HelveticaBold.eot and b/frontend/web/fonts/HelveticaBold/HelveticaBold.eot differ diff --git a/frontend/web/fonts/HelveticaBold/HelveticaBold.ttf b/frontend/web/fonts/HelveticaBold/HelveticaBold.ttf old mode 100644 new mode 100755 index 8dcfee9..8dcfee9 Binary files a/frontend/web/fonts/HelveticaBold/HelveticaBold.ttf and b/frontend/web/fonts/HelveticaBold/HelveticaBold.ttf differ diff --git a/frontend/web/fonts/HelveticaBold/HelveticaBold.woff b/frontend/web/fonts/HelveticaBold/HelveticaBold.woff old mode 100644 new mode 100755 index c760a30..c760a30 Binary files a/frontend/web/fonts/HelveticaBold/HelveticaBold.woff and b/frontend/web/fonts/HelveticaBold/HelveticaBold.woff differ diff --git a/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.eot b/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.eot old mode 100644 new mode 100755 index b44f61c..b44f61c Binary files a/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.eot and b/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.eot differ diff --git a/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.ttf b/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.ttf old mode 100644 new mode 100755 index 048066c..048066c Binary files a/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.ttf and b/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.woff b/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.woff old mode 100644 new mode 100755 index 9d7e877..9d7e877 Binary files a/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.woff and b/frontend/web/fonts/HelveticaBoldItalic/HelveticaBoldItalic.woff differ diff --git a/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.eot b/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.eot old mode 100644 new mode 100755 index 3338ddb..3338ddb Binary files a/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.eot and b/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.eot differ diff --git a/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.ttf b/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.ttf old mode 100644 new mode 100755 index dea9299..dea9299 Binary files a/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.ttf and b/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.ttf differ diff --git a/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.woff b/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.woff old mode 100644 new mode 100755 index 4cd9c11..4cd9c11 Binary files a/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.woff and b/frontend/web/fonts/HelveticaHeavy/HelveticaHeavy.woff differ diff --git a/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.eot b/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.eot old mode 100644 new mode 100755 index 0c1e441..0c1e441 Binary files a/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.eot and b/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.eot differ diff --git a/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.ttf b/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.ttf old mode 100644 new mode 100755 index 988ec8a..988ec8a Binary files a/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.ttf and b/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.woff b/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.woff old mode 100644 new mode 100755 index 3a4279e..3a4279e Binary files a/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.woff and b/frontend/web/fonts/HelveticaHeavyItalic/HelveticaHeavyItalic.woff differ diff --git a/frontend/web/fonts/HelveticaItalic/HelveticaItalic.eot b/frontend/web/fonts/HelveticaItalic/HelveticaItalic.eot old mode 100644 new mode 100755 index b3a9aa5..b3a9aa5 Binary files a/frontend/web/fonts/HelveticaItalic/HelveticaItalic.eot and b/frontend/web/fonts/HelveticaItalic/HelveticaItalic.eot differ diff --git a/frontend/web/fonts/HelveticaItalic/HelveticaItalic.ttf b/frontend/web/fonts/HelveticaItalic/HelveticaItalic.ttf old mode 100644 new mode 100755 index d25e429..d25e429 Binary files a/frontend/web/fonts/HelveticaItalic/HelveticaItalic.ttf and b/frontend/web/fonts/HelveticaItalic/HelveticaItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaItalic/HelveticaItalic.woff b/frontend/web/fonts/HelveticaItalic/HelveticaItalic.woff old mode 100644 new mode 100755 index 10edd36..10edd36 Binary files a/frontend/web/fonts/HelveticaItalic/HelveticaItalic.woff and b/frontend/web/fonts/HelveticaItalic/HelveticaItalic.woff differ diff --git a/frontend/web/fonts/HelveticaLight/HelveticaLight.eot b/frontend/web/fonts/HelveticaLight/HelveticaLight.eot old mode 100644 new mode 100755 index 7cfa597..7cfa597 Binary files a/frontend/web/fonts/HelveticaLight/HelveticaLight.eot and b/frontend/web/fonts/HelveticaLight/HelveticaLight.eot differ diff --git a/frontend/web/fonts/HelveticaLight/HelveticaLight.ttf b/frontend/web/fonts/HelveticaLight/HelveticaLight.ttf old mode 100644 new mode 100755 index 9d3808f..9d3808f Binary files a/frontend/web/fonts/HelveticaLight/HelveticaLight.ttf and b/frontend/web/fonts/HelveticaLight/HelveticaLight.ttf differ diff --git a/frontend/web/fonts/HelveticaLight/HelveticaLight.woff b/frontend/web/fonts/HelveticaLight/HelveticaLight.woff old mode 100644 new mode 100755 index cae768f..cae768f Binary files a/frontend/web/fonts/HelveticaLight/HelveticaLight.woff and b/frontend/web/fonts/HelveticaLight/HelveticaLight.woff differ diff --git a/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.eot b/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.eot old mode 100644 new mode 100755 index 3f0de7e..3f0de7e Binary files a/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.eot and b/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.eot differ diff --git a/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.ttf b/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.ttf old mode 100644 new mode 100755 index df0419d..df0419d Binary files a/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.ttf and b/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.woff b/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.woff old mode 100644 new mode 100755 index a9a6447..a9a6447 Binary files a/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.woff and b/frontend/web/fonts/HelveticaLightItalic/HelveticaLightItalic.woff differ diff --git a/frontend/web/fonts/HelveticaMedium/HelveticaMedium.eot b/frontend/web/fonts/HelveticaMedium/HelveticaMedium.eot old mode 100644 new mode 100755 index 8c82342..8c82342 Binary files a/frontend/web/fonts/HelveticaMedium/HelveticaMedium.eot and b/frontend/web/fonts/HelveticaMedium/HelveticaMedium.eot differ diff --git a/frontend/web/fonts/HelveticaMedium/HelveticaMedium.ttf b/frontend/web/fonts/HelveticaMedium/HelveticaMedium.ttf old mode 100644 new mode 100755 index cf97ecc..cf97ecc Binary files a/frontend/web/fonts/HelveticaMedium/HelveticaMedium.ttf and b/frontend/web/fonts/HelveticaMedium/HelveticaMedium.ttf differ diff --git a/frontend/web/fonts/HelveticaMedium/HelveticaMedium.woff b/frontend/web/fonts/HelveticaMedium/HelveticaMedium.woff old mode 100644 new mode 100755 index 4ccd3bf..4ccd3bf Binary files a/frontend/web/fonts/HelveticaMedium/HelveticaMedium.woff and b/frontend/web/fonts/HelveticaMedium/HelveticaMedium.woff differ diff --git a/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.eot b/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.eot old mode 100644 new mode 100755 index 77f2b7a..77f2b7a Binary files a/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.eot and b/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.eot differ diff --git a/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.ttf b/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.ttf old mode 100644 new mode 100755 index 668a705..668a705 Binary files a/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.ttf and b/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.ttf differ diff --git a/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.woff b/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.woff old mode 100644 new mode 100755 index 48d06e0..48d06e0 Binary files a/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.woff and b/frontend/web/fonts/HelveticaMediumItaicl/HelveticaMediumItaicl.woff differ diff --git a/frontend/web/fonts/HelveticaRegular/HelveticaRegular.eot b/frontend/web/fonts/HelveticaRegular/HelveticaRegular.eot old mode 100644 new mode 100755 index 881e0ab..881e0ab Binary files a/frontend/web/fonts/HelveticaRegular/HelveticaRegular.eot and b/frontend/web/fonts/HelveticaRegular/HelveticaRegular.eot differ diff --git a/frontend/web/fonts/HelveticaRegular/HelveticaRegular.ttf b/frontend/web/fonts/HelveticaRegular/HelveticaRegular.ttf old mode 100644 new mode 100755 index d944a13..d944a13 Binary files a/frontend/web/fonts/HelveticaRegular/HelveticaRegular.ttf and b/frontend/web/fonts/HelveticaRegular/HelveticaRegular.ttf differ diff --git a/frontend/web/fonts/HelveticaRegular/HelveticaRegular.woff b/frontend/web/fonts/HelveticaRegular/HelveticaRegular.woff old mode 100644 new mode 100755 index 66d9328..66d9328 Binary files a/frontend/web/fonts/HelveticaRegular/HelveticaRegular.woff and b/frontend/web/fonts/HelveticaRegular/HelveticaRegular.woff differ diff --git a/frontend/web/fonts/HelveticaThin/HelveticaThin.eot b/frontend/web/fonts/HelveticaThin/HelveticaThin.eot old mode 100644 new mode 100755 index 619a96d..619a96d Binary files a/frontend/web/fonts/HelveticaThin/HelveticaThin.eot and b/frontend/web/fonts/HelveticaThin/HelveticaThin.eot differ diff --git a/frontend/web/fonts/HelveticaThin/HelveticaThin.ttf b/frontend/web/fonts/HelveticaThin/HelveticaThin.ttf old mode 100644 new mode 100755 index 45b7e67..45b7e67 Binary files a/frontend/web/fonts/HelveticaThin/HelveticaThin.ttf and b/frontend/web/fonts/HelveticaThin/HelveticaThin.ttf differ diff --git a/frontend/web/fonts/HelveticaThin/HelveticaThin.woff b/frontend/web/fonts/HelveticaThin/HelveticaThin.woff old mode 100644 new mode 100755 index 8ea4d26..8ea4d26 Binary files a/frontend/web/fonts/HelveticaThin/HelveticaThin.woff and b/frontend/web/fonts/HelveticaThin/HelveticaThin.woff differ diff --git a/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.eot b/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.eot old mode 100644 new mode 100755 index a5aa177..a5aa177 Binary files a/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.eot and b/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.eot differ diff --git a/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.ttf b/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.ttf old mode 100644 new mode 100755 index 5dad877..5dad877 Binary files a/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.ttf and b/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.woff b/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.woff old mode 100644 new mode 100755 index ef351c6..ef351c6 Binary files a/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.woff and b/frontend/web/fonts/HelveticaThinItalic/HelveticaThinItalic.woff differ diff --git a/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.eot b/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.eot old mode 100644 new mode 100755 index 73910db..73910db Binary files a/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.eot and b/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.eot differ diff --git a/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.ttf b/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.ttf old mode 100644 new mode 100755 index f4363c3..f4363c3 Binary files a/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.ttf and b/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.ttf differ diff --git a/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.woff b/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.woff old mode 100644 new mode 100755 index 7fa72fa..7fa72fa Binary files a/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.woff and b/frontend/web/fonts/HelveticaUltraLight/HelveticaUltraLight.woff differ diff --git a/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.eot b/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.eot old mode 100644 new mode 100755 index 1803126..1803126 Binary files a/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.eot and b/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.eot differ diff --git a/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.ttf b/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.ttf old mode 100644 new mode 100755 index d12c1f6..d12c1f6 Binary files a/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.ttf and b/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.ttf differ diff --git a/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.woff b/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.woff old mode 100644 new mode 100755 index 6b3fea5..6b3fea5 Binary files a/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.woff and b/frontend/web/fonts/HelveticaUltraLightItalic/HelveticaUltraLightItalic.woff differ diff --git a/frontend/web/fonts/UbuntuBold/UbuntuBold.eot b/frontend/web/fonts/UbuntuBold/UbuntuBold.eot old mode 100644 new mode 100755 index f21132e..f21132e Binary files a/frontend/web/fonts/UbuntuBold/UbuntuBold.eot and b/frontend/web/fonts/UbuntuBold/UbuntuBold.eot differ diff --git a/frontend/web/fonts/UbuntuBold/UbuntuBold.ttf b/frontend/web/fonts/UbuntuBold/UbuntuBold.ttf old mode 100644 new mode 100755 index e733c57..e733c57 Binary files a/frontend/web/fonts/UbuntuBold/UbuntuBold.ttf and b/frontend/web/fonts/UbuntuBold/UbuntuBold.ttf differ diff --git a/frontend/web/fonts/UbuntuBold/UbuntuBold.woff b/frontend/web/fonts/UbuntuBold/UbuntuBold.woff old mode 100644 new mode 100755 index 1a9daf4..1a9daf4 Binary files a/frontend/web/fonts/UbuntuBold/UbuntuBold.woff and b/frontend/web/fonts/UbuntuBold/UbuntuBold.woff differ diff --git a/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.eot b/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.eot old mode 100644 new mode 100755 index 67fc359..67fc359 Binary files a/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.eot and b/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.eot differ diff --git a/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.ttf b/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.ttf old mode 100644 new mode 100755 index 749cd24..749cd24 Binary files a/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.ttf and b/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.ttf differ diff --git a/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.woff b/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.woff old mode 100644 new mode 100755 index 0969e79..0969e79 Binary files a/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.woff and b/frontend/web/fonts/UbuntuBoldItalic/UbuntuBoldItalic.woff differ diff --git a/frontend/web/fonts/UbuntuItalic/UbuntuItalic.eot b/frontend/web/fonts/UbuntuItalic/UbuntuItalic.eot old mode 100644 new mode 100755 index 08c98dc..08c98dc Binary files a/frontend/web/fonts/UbuntuItalic/UbuntuItalic.eot and b/frontend/web/fonts/UbuntuItalic/UbuntuItalic.eot differ diff --git a/frontend/web/fonts/UbuntuItalic/UbuntuItalic.ttf b/frontend/web/fonts/UbuntuItalic/UbuntuItalic.ttf old mode 100644 new mode 100755 index b37ab87..b37ab87 Binary files a/frontend/web/fonts/UbuntuItalic/UbuntuItalic.ttf and b/frontend/web/fonts/UbuntuItalic/UbuntuItalic.ttf differ diff --git a/frontend/web/fonts/UbuntuItalic/UbuntuItalic.woff b/frontend/web/fonts/UbuntuItalic/UbuntuItalic.woff old mode 100644 new mode 100755 index b908c95..b908c95 Binary files a/frontend/web/fonts/UbuntuItalic/UbuntuItalic.woff and b/frontend/web/fonts/UbuntuItalic/UbuntuItalic.woff differ diff --git a/frontend/web/fonts/UbuntuLight/UbuntuLight.eot b/frontend/web/fonts/UbuntuLight/UbuntuLight.eot old mode 100644 new mode 100755 index c95586e..c95586e Binary files a/frontend/web/fonts/UbuntuLight/UbuntuLight.eot and b/frontend/web/fonts/UbuntuLight/UbuntuLight.eot differ diff --git a/frontend/web/fonts/UbuntuLight/UbuntuLight.ttf b/frontend/web/fonts/UbuntuLight/UbuntuLight.ttf old mode 100644 new mode 100755 index ec2e13c..ec2e13c Binary files a/frontend/web/fonts/UbuntuLight/UbuntuLight.ttf and b/frontend/web/fonts/UbuntuLight/UbuntuLight.ttf differ diff --git a/frontend/web/fonts/UbuntuLight/UbuntuLight.woff b/frontend/web/fonts/UbuntuLight/UbuntuLight.woff old mode 100644 new mode 100755 index 9d65f31..9d65f31 Binary files a/frontend/web/fonts/UbuntuLight/UbuntuLight.woff and b/frontend/web/fonts/UbuntuLight/UbuntuLight.woff differ diff --git a/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.eot b/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.eot old mode 100644 new mode 100755 index 302e49f..302e49f Binary files a/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.eot and b/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.eot differ diff --git a/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.ttf b/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.ttf old mode 100644 new mode 100755 index bb6559a..bb6559a Binary files a/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.ttf and b/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.ttf differ diff --git a/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.woff b/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.woff old mode 100644 new mode 100755 index 8f41c55..8f41c55 Binary files a/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.woff and b/frontend/web/fonts/UbuntuLightItalic/UbuntuLightItalic.woff differ diff --git a/frontend/web/fonts/UbuntuMedium/UbuntuMedium.eot b/frontend/web/fonts/UbuntuMedium/UbuntuMedium.eot old mode 100644 new mode 100755 index b824b76..b824b76 Binary files a/frontend/web/fonts/UbuntuMedium/UbuntuMedium.eot and b/frontend/web/fonts/UbuntuMedium/UbuntuMedium.eot differ diff --git a/frontend/web/fonts/UbuntuMedium/UbuntuMedium.ttf b/frontend/web/fonts/UbuntuMedium/UbuntuMedium.ttf old mode 100644 new mode 100755 index 8cfc2b0..8cfc2b0 Binary files a/frontend/web/fonts/UbuntuMedium/UbuntuMedium.ttf and b/frontend/web/fonts/UbuntuMedium/UbuntuMedium.ttf differ diff --git a/frontend/web/fonts/UbuntuMedium/UbuntuMedium.woff b/frontend/web/fonts/UbuntuMedium/UbuntuMedium.woff old mode 100644 new mode 100755 index 2e7f6ec..2e7f6ec Binary files a/frontend/web/fonts/UbuntuMedium/UbuntuMedium.woff and b/frontend/web/fonts/UbuntuMedium/UbuntuMedium.woff differ diff --git a/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.eot b/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.eot old mode 100644 new mode 100755 index 4caca07..4caca07 Binary files a/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.eot and b/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.eot differ diff --git a/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.ttf b/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.ttf old mode 100644 new mode 100755 index 7030705..7030705 Binary files a/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.ttf and b/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.ttf differ diff --git a/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.woff b/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.woff old mode 100644 new mode 100755 index 2a5606f..2a5606f Binary files a/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.woff and b/frontend/web/fonts/UbuntuMediumItalic/UbuntuMediumItalic.woff differ diff --git a/frontend/web/fonts/UbuntuRegular/UbuntuRegular.eot b/frontend/web/fonts/UbuntuRegular/UbuntuRegular.eot old mode 100644 new mode 100755 index c3befbc..c3befbc Binary files a/frontend/web/fonts/UbuntuRegular/UbuntuRegular.eot and b/frontend/web/fonts/UbuntuRegular/UbuntuRegular.eot differ diff --git a/frontend/web/fonts/UbuntuRegular/UbuntuRegular.ttf b/frontend/web/fonts/UbuntuRegular/UbuntuRegular.ttf old mode 100644 new mode 100755 index 9a295e8..9a295e8 Binary files a/frontend/web/fonts/UbuntuRegular/UbuntuRegular.ttf and b/frontend/web/fonts/UbuntuRegular/UbuntuRegular.ttf differ diff --git a/frontend/web/fonts/UbuntuRegular/UbuntuRegular.woff b/frontend/web/fonts/UbuntuRegular/UbuntuRegular.woff old mode 100644 new mode 100755 index 7adfda1..7adfda1 Binary files a/frontend/web/fonts/UbuntuRegular/UbuntuRegular.woff and b/frontend/web/fonts/UbuntuRegular/UbuntuRegular.woff differ diff --git a/frontend/web/fonts/fontawesome-webfont.eot b/frontend/web/fonts/fontawesome-webfont.eot old mode 100644 new mode 100755 index a30335d..a30335d Binary files a/frontend/web/fonts/fontawesome-webfont.eot and b/frontend/web/fonts/fontawesome-webfont.eot differ diff --git a/frontend/web/fonts/fontawesome-webfont.svg b/frontend/web/fonts/fontawesome-webfont.svg old mode 100644 new mode 100755 index 9f53245..9f53245 --- a/frontend/web/fonts/fontawesome-webfont.svg +++ b/frontend/web/fonts/fontawesome-webfont.svg diff --git a/frontend/web/fonts/fontawesome-webfont.ttf b/frontend/web/fonts/fontawesome-webfont.ttf old mode 100644 new mode 100755 index d7994e1..d7994e1 Binary files a/frontend/web/fonts/fontawesome-webfont.ttf and b/frontend/web/fonts/fontawesome-webfont.ttf differ diff --git a/frontend/web/fonts/fontawesome-webfont.woff b/frontend/web/fonts/fontawesome-webfont.woff old mode 100644 new mode 100755 index 6fd4ede..6fd4ede Binary files a/frontend/web/fonts/fontawesome-webfont.woff and b/frontend/web/fonts/fontawesome-webfont.woff differ diff --git a/frontend/web/fonts/fontawesome-webfont.woff2 b/frontend/web/fonts/fontawesome-webfont.woff2 old mode 100644 new mode 100755 index 5560193..5560193 Binary files a/frontend/web/fonts/fontawesome-webfont.woff2 and b/frontend/web/fonts/fontawesome-webfont.woff2 differ diff --git a/frontend/web/images/aw_logo.png b/frontend/web/images/aw_logo.png old mode 100644 new mode 100755 index a0ee47f..a0ee47f Binary files a/frontend/web/images/aw_logo.png and b/frontend/web/images/aw_logo.png differ diff --git a/frontend/web/images/bau_logo.png b/frontend/web/images/bau_logo.png old mode 100644 new mode 100755 index 18c2720..18c2720 Binary files a/frontend/web/images/bau_logo.png and b/frontend/web/images/bau_logo.png differ diff --git a/frontend/web/images/category/1.png b/frontend/web/images/category/1.png old mode 100644 new mode 100755 index 7da8870..7da8870 Binary files a/frontend/web/images/category/1.png and b/frontend/web/images/category/1.png differ diff --git a/frontend/web/images/category/10.png b/frontend/web/images/category/10.png old mode 100644 new mode 100755 index e8e58d9..e8e58d9 Binary files a/frontend/web/images/category/10.png and b/frontend/web/images/category/10.png differ diff --git a/frontend/web/images/category/11.png b/frontend/web/images/category/11.png old mode 100644 new mode 100755 index fe5b157..fe5b157 Binary files a/frontend/web/images/category/11.png and b/frontend/web/images/category/11.png differ diff --git a/frontend/web/images/category/12.png b/frontend/web/images/category/12.png old mode 100644 new mode 100755 index 694bd4e..694bd4e Binary files a/frontend/web/images/category/12.png and b/frontend/web/images/category/12.png differ diff --git a/frontend/web/images/category/13.png b/frontend/web/images/category/13.png old mode 100644 new mode 100755 index b1a79ff..b1a79ff Binary files a/frontend/web/images/category/13.png and b/frontend/web/images/category/13.png differ diff --git a/frontend/web/images/category/14.png b/frontend/web/images/category/14.png old mode 100644 new mode 100755 index 3194663..3194663 Binary files a/frontend/web/images/category/14.png and b/frontend/web/images/category/14.png differ diff --git a/frontend/web/images/category/15.png b/frontend/web/images/category/15.png old mode 100644 new mode 100755 index 2dbc904..2dbc904 Binary files a/frontend/web/images/category/15.png and b/frontend/web/images/category/15.png differ diff --git a/frontend/web/images/category/2.png b/frontend/web/images/category/2.png old mode 100644 new mode 100755 index 8bce442..8bce442 Binary files a/frontend/web/images/category/2.png and b/frontend/web/images/category/2.png differ diff --git a/frontend/web/images/category/3.png b/frontend/web/images/category/3.png old mode 100644 new mode 100755 index 9d728a1..9d728a1 Binary files a/frontend/web/images/category/3.png and b/frontend/web/images/category/3.png differ diff --git a/frontend/web/images/category/4.png b/frontend/web/images/category/4.png old mode 100644 new mode 100755 index 5f14727..5f14727 Binary files a/frontend/web/images/category/4.png and b/frontend/web/images/category/4.png differ diff --git a/frontend/web/images/category/5.png b/frontend/web/images/category/5.png old mode 100644 new mode 100755 index 8d78c0b..8d78c0b Binary files a/frontend/web/images/category/5.png and b/frontend/web/images/category/5.png differ diff --git a/frontend/web/images/category/6.png b/frontend/web/images/category/6.png old mode 100644 new mode 100755 index 001757a..001757a Binary files a/frontend/web/images/category/6.png and b/frontend/web/images/category/6.png differ diff --git a/frontend/web/images/category/7.png b/frontend/web/images/category/7.png old mode 100644 new mode 100755 index 6325dc8..6325dc8 Binary files a/frontend/web/images/category/7.png and b/frontend/web/images/category/7.png differ diff --git a/frontend/web/images/category/8.png b/frontend/web/images/category/8.png old mode 100644 new mode 100755 index 362e621..362e621 Binary files a/frontend/web/images/category/8.png and b/frontend/web/images/category/8.png differ diff --git a/frontend/web/images/category/9.png b/frontend/web/images/category/9.png old mode 100644 new mode 100755 index 0345772..0345772 Binary files a/frontend/web/images/category/9.png and b/frontend/web/images/category/9.png differ diff --git a/frontend/web/images/category/green_arrows.png b/frontend/web/images/category/green_arrows.png old mode 100644 new mode 100755 index 0872f46..0872f46 Binary files a/frontend/web/images/category/green_arrows.png and b/frontend/web/images/category/green_arrows.png differ diff --git a/frontend/web/images/delivery01.png b/frontend/web/images/delivery01.png old mode 100644 new mode 100755 index 57e1217..57e1217 Binary files a/frontend/web/images/delivery01.png and b/frontend/web/images/delivery01.png differ diff --git a/frontend/web/images/delivery02.png b/frontend/web/images/delivery02.png old mode 100644 new mode 100755 index 9f372e3..9f372e3 Binary files a/frontend/web/images/delivery02.png and b/frontend/web/images/delivery02.png differ diff --git a/frontend/web/images/fb_small_color.png b/frontend/web/images/fb_small_color.png old mode 100644 new mode 100755 index 3813edd..3813edd Binary files a/frontend/web/images/fb_small_color.png and b/frontend/web/images/fb_small_color.png differ diff --git a/frontend/web/images/fon_up_slider.jpg b/frontend/web/images/fon_up_slider.jpg old mode 100644 new mode 100755 index 82bf05b..82bf05b Binary files a/frontend/web/images/fon_up_slider.jpg and b/frontend/web/images/fon_up_slider.jpg differ diff --git a/frontend/web/images/head_down.png b/frontend/web/images/head_down.png old mode 100644 new mode 100755 index 29febdc..29febdc Binary files a/frontend/web/images/head_down.png and b/frontend/web/images/head_down.png differ diff --git a/frontend/web/images/head_up.png b/frontend/web/images/head_up.png old mode 100644 new mode 100755 index 3c5e2db..3c5e2db Binary files a/frontend/web/images/head_up.png and b/frontend/web/images/head_up.png differ diff --git a/frontend/web/images/ico_basket.png b/frontend/web/images/ico_basket.png old mode 100644 new mode 100755 index 617b34d..617b34d Binary files a/frontend/web/images/ico_basket.png and b/frontend/web/images/ico_basket.png differ diff --git a/frontend/web/images/ico_basket_white.png b/frontend/web/images/ico_basket_white.png old mode 100644 new mode 100755 index 0b4c2b1..0b4c2b1 Binary files a/frontend/web/images/ico_basket_white.png and b/frontend/web/images/ico_basket_white.png differ diff --git a/frontend/web/images/ico_home.png b/frontend/web/images/ico_home.png old mode 100644 new mode 100755 index 96362f8..96362f8 Binary files a/frontend/web/images/ico_home.png and b/frontend/web/images/ico_home.png differ diff --git a/frontend/web/images/ico_home_black.png b/frontend/web/images/ico_home_black.png old mode 100644 new mode 100755 index a5c7cb4..a5c7cb4 Binary files a/frontend/web/images/ico_home_black.png and b/frontend/web/images/ico_home_black.png differ diff --git a/frontend/web/images/ico_home_white.png b/frontend/web/images/ico_home_white.png old mode 100644 new mode 100755 index 63a0191..63a0191 Binary files a/frontend/web/images/ico_home_white.png and b/frontend/web/images/ico_home_white.png differ diff --git a/frontend/web/images/ico_note.png b/frontend/web/images/ico_note.png old mode 100644 new mode 100755 index 8d84a1e..8d84a1e Binary files a/frontend/web/images/ico_note.png and b/frontend/web/images/ico_note.png differ diff --git a/frontend/web/images/ico_ok.png b/frontend/web/images/ico_ok.png old mode 100644 new mode 100755 index f18df01..f18df01 Binary files a/frontend/web/images/ico_ok.png and b/frontend/web/images/ico_ok.png differ diff --git a/frontend/web/images/ico_scales.png b/frontend/web/images/ico_scales.png old mode 100644 new mode 100755 index db3951a..db3951a Binary files a/frontend/web/images/ico_scales.png and b/frontend/web/images/ico_scales.png differ diff --git a/frontend/web/images/ico_user.png b/frontend/web/images/ico_user.png old mode 100644 new mode 100755 index 73132ee..73132ee Binary files a/frontend/web/images/ico_user.png and b/frontend/web/images/ico_user.png differ diff --git a/frontend/web/images/items/01.jpg b/frontend/web/images/items/01.jpg old mode 100644 new mode 100755 index a397fce..a397fce Binary files a/frontend/web/images/items/01.jpg and b/frontend/web/images/items/01.jpg differ diff --git a/frontend/web/images/items/02.jpg b/frontend/web/images/items/02.jpg old mode 100644 new mode 100755 index 666e8c5..666e8c5 Binary files a/frontend/web/images/items/02.jpg and b/frontend/web/images/items/02.jpg differ diff --git a/frontend/web/images/items/03.jpg b/frontend/web/images/items/03.jpg old mode 100644 new mode 100755 index 81e1095..81e1095 Binary files a/frontend/web/images/items/03.jpg and b/frontend/web/images/items/03.jpg differ diff --git a/frontend/web/images/items/04.jpg b/frontend/web/images/items/04.jpg old mode 100644 new mode 100755 index f18ec9b..f18ec9b Binary files a/frontend/web/images/items/04.jpg and b/frontend/web/images/items/04.jpg differ diff --git a/frontend/web/images/items/11.png b/frontend/web/images/items/11.png old mode 100644 new mode 100755 index e9c3e26..e9c3e26 Binary files a/frontend/web/images/items/11.png and b/frontend/web/images/items/11.png differ diff --git a/frontend/web/images/items/12.png b/frontend/web/images/items/12.png old mode 100644 new mode 100755 index 4ace3f8..4ace3f8 Binary files a/frontend/web/images/items/12.png and b/frontend/web/images/items/12.png differ diff --git a/frontend/web/images/items/13.png b/frontend/web/images/items/13.png old mode 100644 new mode 100755 index 1bce2af..1bce2af Binary files a/frontend/web/images/items/13.png and b/frontend/web/images/items/13.png differ diff --git a/frontend/web/images/items/14.png b/frontend/web/images/items/14.png old mode 100644 new mode 100755 index ba06549..ba06549 Binary files a/frontend/web/images/items/14.png and b/frontend/web/images/items/14.png differ diff --git a/frontend/web/images/items/15.png b/frontend/web/images/items/15.png old mode 100644 new mode 100755 index 6a52edf..6a52edf Binary files a/frontend/web/images/items/15.png and b/frontend/web/images/items/15.png differ diff --git a/frontend/web/images/items/16.png b/frontend/web/images/items/16.png old mode 100644 new mode 100755 index 3d77b11..3d77b11 Binary files a/frontend/web/images/items/16.png and b/frontend/web/images/items/16.png differ diff --git a/frontend/web/images/items/17.png b/frontend/web/images/items/17.png old mode 100644 new mode 100755 index da105f0..da105f0 Binary files a/frontend/web/images/items/17.png and b/frontend/web/images/items/17.png differ diff --git a/frontend/web/images/items/big_img.png b/frontend/web/images/items/big_img.png old mode 100644 new mode 100755 index bd82d31..bd82d31 Binary files a/frontend/web/images/items/big_img.png and b/frontend/web/images/items/big_img.png differ diff --git a/frontend/web/images/li1.png b/frontend/web/images/li1.png new file mode 100755 index 0000000..f02d9a6 Binary files /dev/null and b/frontend/web/images/li1.png differ diff --git a/frontend/web/images/li3.png b/frontend/web/images/li3.png new file mode 100755 index 0000000..ea42367 Binary files /dev/null and b/frontend/web/images/li3.png differ diff --git a/frontend/web/images/logos/404.png b/frontend/web/images/logos/404.png old mode 100644 new mode 100755 index 28880dd..28880dd Binary files a/frontend/web/images/logos/404.png and b/frontend/web/images/logos/404.png differ diff --git a/frontend/web/images/logos/ceresit.jpg b/frontend/web/images/logos/ceresit.jpg old mode 100644 new mode 100755 index 9022959..9022959 Binary files a/frontend/web/images/logos/ceresit.jpg and b/frontend/web/images/logos/ceresit.jpg differ diff --git a/frontend/web/images/logos/knauf.jpg b/frontend/web/images/logos/knauf.jpg old mode 100644 new mode 100755 index 61c16da..61c16da Binary files a/frontend/web/images/logos/knauf.jpg and b/frontend/web/images/logos/knauf.jpg differ diff --git a/frontend/web/images/logos/kolorit.jpg b/frontend/web/images/logos/kolorit.jpg old mode 100644 new mode 100755 index f84633a..f84633a Binary files a/frontend/web/images/logos/kolorit.jpg and b/frontend/web/images/logos/kolorit.jpg differ diff --git a/frontend/web/images/logos/rukki.jpg b/frontend/web/images/logos/rukki.jpg old mode 100644 new mode 100755 index 4508146..4508146 Binary files a/frontend/web/images/logos/rukki.jpg and b/frontend/web/images/logos/rukki.jpg differ diff --git a/frontend/web/images/logos/tikkurila.jpg b/frontend/web/images/logos/tikkurila.jpg old mode 100644 new mode 100755 index 464b810..464b810 Binary files a/frontend/web/images/logos/tikkurila.jpg and b/frontend/web/images/logos/tikkurila.jpg differ diff --git a/frontend/web/images/logos/triora.jpg b/frontend/web/images/logos/triora.jpg old mode 100644 new mode 100755 index 21f0831..21f0831 Binary files a/frontend/web/images/logos/triora.jpg and b/frontend/web/images/logos/triora.jpg differ diff --git a/frontend/web/images/manufacturers/1.png b/frontend/web/images/manufacturers/1.png old mode 100644 new mode 100755 index ab24dc2..ab24dc2 Binary files a/frontend/web/images/manufacturers/1.png and b/frontend/web/images/manufacturers/1.png differ diff --git a/frontend/web/images/manufacturers/10.png b/frontend/web/images/manufacturers/10.png old mode 100644 new mode 100755 index b2dedda..b2dedda Binary files a/frontend/web/images/manufacturers/10.png and b/frontend/web/images/manufacturers/10.png differ diff --git a/frontend/web/images/manufacturers/11.png b/frontend/web/images/manufacturers/11.png old mode 100644 new mode 100755 index a6abf2b..a6abf2b Binary files a/frontend/web/images/manufacturers/11.png and b/frontend/web/images/manufacturers/11.png differ diff --git a/frontend/web/images/manufacturers/12.png b/frontend/web/images/manufacturers/12.png old mode 100644 new mode 100755 index a0dcf7b..a0dcf7b Binary files a/frontend/web/images/manufacturers/12.png and b/frontend/web/images/manufacturers/12.png differ diff --git a/frontend/web/images/manufacturers/13.png b/frontend/web/images/manufacturers/13.png old mode 100644 new mode 100755 index 0dbf003..0dbf003 Binary files a/frontend/web/images/manufacturers/13.png and b/frontend/web/images/manufacturers/13.png differ diff --git a/frontend/web/images/manufacturers/14.png b/frontend/web/images/manufacturers/14.png old mode 100644 new mode 100755 index a72637f..a72637f Binary files a/frontend/web/images/manufacturers/14.png and b/frontend/web/images/manufacturers/14.png differ diff --git a/frontend/web/images/manufacturers/15.png b/frontend/web/images/manufacturers/15.png old mode 100644 new mode 100755 index 0d56f21..0d56f21 Binary files a/frontend/web/images/manufacturers/15.png and b/frontend/web/images/manufacturers/15.png differ diff --git a/frontend/web/images/manufacturers/16.png b/frontend/web/images/manufacturers/16.png old mode 100644 new mode 100755 index a7dc9b2..a7dc9b2 Binary files a/frontend/web/images/manufacturers/16.png and b/frontend/web/images/manufacturers/16.png differ diff --git a/frontend/web/images/manufacturers/17.png b/frontend/web/images/manufacturers/17.png old mode 100644 new mode 100755 index b2aaf4f..b2aaf4f Binary files a/frontend/web/images/manufacturers/17.png and b/frontend/web/images/manufacturers/17.png differ diff --git a/frontend/web/images/manufacturers/18.png b/frontend/web/images/manufacturers/18.png old mode 100644 new mode 100755 index 8bf1eae..8bf1eae Binary files a/frontend/web/images/manufacturers/18.png and b/frontend/web/images/manufacturers/18.png differ diff --git a/frontend/web/images/manufacturers/19.png b/frontend/web/images/manufacturers/19.png old mode 100644 new mode 100755 index daf9daa..daf9daa Binary files a/frontend/web/images/manufacturers/19.png and b/frontend/web/images/manufacturers/19.png differ diff --git a/frontend/web/images/manufacturers/2.png b/frontend/web/images/manufacturers/2.png old mode 100644 new mode 100755 index 0ea46c5..0ea46c5 Binary files a/frontend/web/images/manufacturers/2.png and b/frontend/web/images/manufacturers/2.png differ diff --git a/frontend/web/images/manufacturers/20.png b/frontend/web/images/manufacturers/20.png old mode 100644 new mode 100755 index 0eca99d..0eca99d Binary files a/frontend/web/images/manufacturers/20.png and b/frontend/web/images/manufacturers/20.png differ diff --git a/frontend/web/images/manufacturers/3.png b/frontend/web/images/manufacturers/3.png old mode 100644 new mode 100755 index 9fb6903..9fb6903 Binary files a/frontend/web/images/manufacturers/3.png and b/frontend/web/images/manufacturers/3.png differ diff --git a/frontend/web/images/manufacturers/4.png b/frontend/web/images/manufacturers/4.png old mode 100644 new mode 100755 index 6b13fa4..6b13fa4 Binary files a/frontend/web/images/manufacturers/4.png and b/frontend/web/images/manufacturers/4.png differ diff --git a/frontend/web/images/manufacturers/5.png b/frontend/web/images/manufacturers/5.png old mode 100644 new mode 100755 index 8e26674..8e26674 Binary files a/frontend/web/images/manufacturers/5.png and b/frontend/web/images/manufacturers/5.png differ diff --git a/frontend/web/images/manufacturers/6.png b/frontend/web/images/manufacturers/6.png old mode 100644 new mode 100755 index af37318..af37318 Binary files a/frontend/web/images/manufacturers/6.png and b/frontend/web/images/manufacturers/6.png differ diff --git a/frontend/web/images/manufacturers/7.png b/frontend/web/images/manufacturers/7.png old mode 100644 new mode 100755 index d45b2ac..d45b2ac Binary files a/frontend/web/images/manufacturers/7.png and b/frontend/web/images/manufacturers/7.png differ diff --git a/frontend/web/images/manufacturers/8.png b/frontend/web/images/manufacturers/8.png old mode 100644 new mode 100755 index ecdb896..ecdb896 Binary files a/frontend/web/images/manufacturers/8.png and b/frontend/web/images/manufacturers/8.png differ diff --git a/frontend/web/images/manufacturers/9.png b/frontend/web/images/manufacturers/9.png old mode 100644 new mode 100755 index dc45b7b..dc45b7b Binary files a/frontend/web/images/manufacturers/9.png and b/frontend/web/images/manufacturers/9.png differ diff --git a/frontend/web/images/manufacturers/manufacturers.png b/frontend/web/images/manufacturers/manufacturers.png old mode 100644 new mode 100755 index a7946f5..a7946f5 Binary files a/frontend/web/images/manufacturers/manufacturers.png and b/frontend/web/images/manufacturers/manufacturers.png differ diff --git a/frontend/web/images/modal_capcha.png b/frontend/web/images/modal_capcha.png old mode 100644 new mode 100755 index 0a52230..0a52230 Binary files a/frontend/web/images/modal_capcha.png and b/frontend/web/images/modal_capcha.png differ diff --git a/frontend/web/images/modal_close_btn.png b/frontend/web/images/modal_close_btn.png old mode 100644 new mode 100755 index f1b483d..f1b483d Binary files a/frontend/web/images/modal_close_btn.png and b/frontend/web/images/modal_close_btn.png differ diff --git a/frontend/web/images/nc_item_bottom.png b/frontend/web/images/nc_item_bottom.png old mode 100644 new mode 100755 index e3713ee..e3713ee Binary files a/frontend/web/images/nc_item_bottom.png and b/frontend/web/images/nc_item_bottom.png differ diff --git a/frontend/web/images/new_fon_blue.jpg b/frontend/web/images/new_fon_blue.jpg old mode 100644 new mode 100755 index d5593ac..d5593ac Binary files a/frontend/web/images/new_fon_blue.jpg and b/frontend/web/images/new_fon_blue.jpg differ diff --git a/frontend/web/images/new_fon_blue.png b/frontend/web/images/new_fon_blue.png old mode 100644 new mode 100755 index b8a13f8..b8a13f8 Binary files a/frontend/web/images/new_fon_blue.png and b/frontend/web/images/new_fon_blue.png differ diff --git a/frontend/web/images/no_photo.png b/frontend/web/images/no_photo.png old mode 100644 new mode 100755 index aef9e08..aef9e08 Binary files a/frontend/web/images/no_photo.png and b/frontend/web/images/no_photo.png differ diff --git a/frontend/web/images/no_photo_big.png b/frontend/web/images/no_photo_big.png old mode 100644 new mode 100755 index fc71420..fc71420 Binary files a/frontend/web/images/no_photo_big.png and b/frontend/web/images/no_photo_big.png differ diff --git a/frontend/web/images/ok_icon_green.png b/frontend/web/images/ok_icon_green.png old mode 100644 new mode 100755 index 2809faf..2809faf Binary files a/frontend/web/images/ok_icon_green.png and b/frontend/web/images/ok_icon_green.png differ diff --git a/frontend/web/images/payment01.png b/frontend/web/images/payment01.png old mode 100644 new mode 100755 index 3d50e79..3d50e79 Binary files a/frontend/web/images/payment01.png and b/frontend/web/images/payment01.png differ diff --git a/frontend/web/images/pr_img1.jpg b/frontend/web/images/pr_img1.jpg old mode 100644 new mode 100755 index 58be45c..58be45c Binary files a/frontend/web/images/pr_img1.jpg and b/frontend/web/images/pr_img1.jpg differ diff --git a/frontend/web/images/pr_img2.jpg b/frontend/web/images/pr_img2.jpg old mode 100644 new mode 100755 index adeff3d..adeff3d Binary files a/frontend/web/images/pr_img2.jpg and b/frontend/web/images/pr_img2.jpg differ diff --git a/frontend/web/images/pr_img3.jpg b/frontend/web/images/pr_img3.jpg old mode 100644 new mode 100755 index 5dd33bc..5dd33bc Binary files a/frontend/web/images/pr_img3.jpg and b/frontend/web/images/pr_img3.jpg differ diff --git a/frontend/web/images/pr_img4.jpg b/frontend/web/images/pr_img4.jpg old mode 100644 new mode 100755 index 16df53c..16df53c Binary files a/frontend/web/images/pr_img4.jpg and b/frontend/web/images/pr_img4.jpg differ diff --git a/frontend/web/images/pr_img5.jpg b/frontend/web/images/pr_img5.jpg old mode 100644 new mode 100755 index 74767e0..74767e0 Binary files a/frontend/web/images/pr_img5.jpg and b/frontend/web/images/pr_img5.jpg differ diff --git a/frontend/web/images/pr_img6.jpg b/frontend/web/images/pr_img6.jpg old mode 100644 new mode 100755 index 125ec74..125ec74 Binary files a/frontend/web/images/pr_img6.jpg and b/frontend/web/images/pr_img6.jpg differ diff --git a/frontend/web/images/prods_grey_fon.png b/frontend/web/images/prods_grey_fon.png old mode 100644 new mode 100755 index de04e47..de04e47 Binary files a/frontend/web/images/prods_grey_fon.png and b/frontend/web/images/prods_grey_fon.png differ diff --git a/frontend/web/images/search.png b/frontend/web/images/search.png old mode 100644 new mode 100755 index 4a9b72f..4a9b72f Binary files a/frontend/web/images/search.png and b/frontend/web/images/search.png differ diff --git a/frontend/web/images/services01.png b/frontend/web/images/services01.png old mode 100644 new mode 100755 index 01d877c..01d877c Binary files a/frontend/web/images/services01.png and b/frontend/web/images/services01.png differ diff --git a/frontend/web/images/services02.png b/frontend/web/images/services02.png old mode 100644 new mode 100755 index c8e082b..c8e082b Binary files a/frontend/web/images/services02.png and b/frontend/web/images/services02.png differ diff --git a/frontend/web/images/services03.png b/frontend/web/images/services03.png old mode 100644 new mode 100755 index 4f67172..4f67172 Binary files a/frontend/web/images/services03.png and b/frontend/web/images/services03.png differ diff --git a/frontend/web/images/services04.png b/frontend/web/images/services04.png old mode 100644 new mode 100755 index 74495bf..74495bf Binary files a/frontend/web/images/services04.png and b/frontend/web/images/services04.png differ diff --git a/frontend/web/images/slider_fon_fanera.jpg b/frontend/web/images/slider_fon_fanera.jpg old mode 100644 new mode 100755 index 4da7b29..4da7b29 Binary files a/frontend/web/images/slider_fon_fanera.jpg and b/frontend/web/images/slider_fon_fanera.jpg differ diff --git a/frontend/web/images/slider_left.png b/frontend/web/images/slider_left.png old mode 100644 new mode 100755 index c91014b..c91014b Binary files a/frontend/web/images/slider_left.png and b/frontend/web/images/slider_left.png differ diff --git a/frontend/web/images/slider_left_hover.png b/frontend/web/images/slider_left_hover.png old mode 100644 new mode 100755 index 460feb0..460feb0 Binary files a/frontend/web/images/slider_left_hover.png and b/frontend/web/images/slider_left_hover.png differ diff --git a/frontend/web/images/slider_left_white.png b/frontend/web/images/slider_left_white.png old mode 100644 new mode 100755 index 57689f6..57689f6 Binary files a/frontend/web/images/slider_left_white.png and b/frontend/web/images/slider_left_white.png differ diff --git a/frontend/web/images/slider_right.png b/frontend/web/images/slider_right.png old mode 100644 new mode 100755 index 7506196..7506196 Binary files a/frontend/web/images/slider_right.png and b/frontend/web/images/slider_right.png differ diff --git a/frontend/web/images/slider_right_hover.png b/frontend/web/images/slider_right_hover.png old mode 100644 new mode 100755 index 179e854..179e854 Binary files a/frontend/web/images/slider_right_hover.png and b/frontend/web/images/slider_right_hover.png differ diff --git a/frontend/web/images/slider_right_white.png b/frontend/web/images/slider_right_white.png old mode 100644 new mode 100755 index 7e5de6e..7e5de6e Binary files a/frontend/web/images/slider_right_white.png and b/frontend/web/images/slider_right_white.png differ diff --git a/frontend/web/images/top_fon_yellow.png b/frontend/web/images/top_fon_yellow.png old mode 100644 new mode 100755 index e64848f..e64848f Binary files a/frontend/web/images/top_fon_yellow.png and b/frontend/web/images/top_fon_yellow.png differ diff --git a/frontend/web/images/vk_small_color.png b/frontend/web/images/vk_small_color.png old mode 100644 new mode 100755 index c1433bc..c1433bc Binary files a/frontend/web/images/vk_small_color.png and b/frontend/web/images/vk_small_color.png differ diff --git a/frontend/web/images/warning_form.jpg b/frontend/web/images/warning_form.jpg old mode 100644 new mode 100755 index 68ed96b..68ed96b Binary files a/frontend/web/images/warning_form.jpg and b/frontend/web/images/warning_form.jpg differ diff --git a/frontend/web/images/why01.png b/frontend/web/images/why01.png old mode 100644 new mode 100755 index fc0ee9b..fc0ee9b Binary files a/frontend/web/images/why01.png and b/frontend/web/images/why01.png differ diff --git a/frontend/web/images/why02.png b/frontend/web/images/why02.png old mode 100644 new mode 100755 index 192e894..192e894 Binary files a/frontend/web/images/why02.png and b/frontend/web/images/why02.png differ diff --git a/frontend/web/images/why03.png b/frontend/web/images/why03.png old mode 100644 new mode 100755 index 648d2db..648d2db Binary files a/frontend/web/images/why03.png and b/frontend/web/images/why03.png differ diff --git a/frontend/web/images/why04.png b/frontend/web/images/why04.png old mode 100644 new mode 100755 index 1df340e..1df340e Binary files a/frontend/web/images/why04.png and b/frontend/web/images/why04.png differ diff --git a/frontend/web/images/why05.png b/frontend/web/images/why05.png old mode 100644 new mode 100755 index 902aaa7..902aaa7 Binary files a/frontend/web/images/why05.png and b/frontend/web/images/why05.png differ diff --git a/frontend/web/images/why06.png b/frontend/web/images/why06.png old mode 100644 new mode 100755 index 69fe5ed..69fe5ed Binary files a/frontend/web/images/why06.png and b/frontend/web/images/why06.png differ diff --git a/frontend/web/images/why07.png b/frontend/web/images/why07.png old mode 100644 new mode 100755 index d885d8c..d885d8c Binary files a/frontend/web/images/why07.png and b/frontend/web/images/why07.png differ diff --git a/frontend/web/images/why08.png b/frontend/web/images/why08.png old mode 100644 new mode 100755 index efedc7c..efedc7c Binary files a/frontend/web/images/why08.png and b/frontend/web/images/why08.png differ diff --git a/frontend/web/images/why_us_fon.png b/frontend/web/images/why_us_fon.png old mode 100644 new mode 100755 index f34e0ef..f34e0ef Binary files a/frontend/web/images/why_us_fon.png and b/frontend/web/images/why_us_fon.png differ diff --git a/frontend/web/images/yt_small_color.png b/frontend/web/images/yt_small_color.png old mode 100644 new mode 100755 index d7ebd77..d7ebd77 Binary files a/frontend/web/images/yt_small_color.png and b/frontend/web/images/yt_small_color.png differ diff --git a/frontend/web/js/basket.js b/frontend/web/js/basket.js old mode 100644 new mode 100755 index 1fb7e4b..1fb7e4b --- a/frontend/web/js/basket.js +++ b/frontend/web/js/basket.js diff --git a/frontend/web/js/jquery.jcarousellite-1.0.1.js b/frontend/web/js/jquery.jcarousellite-1.0.1.js old mode 100644 new mode 100755 index 159dd17..51497f4 --- a/frontend/web/js/jquery.jcarousellite-1.0.1.js +++ b/frontend/web/js/jquery.jcarousellite-1.0.1.js @@ -332,6 +332,7 @@ function css(el, prop) { return parseInt($.css(el[0], prop)) || 0; }; function width(el) { + return el[0].offsetWidth + css(el, 'marginLeft') + css(el, 'marginRight'); }; function height(el) { diff --git a/frontend/web/js/jquery.maskedinput.min.js b/frontend/web/js/jquery.maskedinput.min.js old mode 100644 new mode 100755 index d4dfd01..d4dfd01 --- a/frontend/web/js/jquery.maskedinput.min.js +++ b/frontend/web/js/jquery.maskedinput.min.js diff --git a/frontend/web/js/my_scripts.js b/frontend/web/js/my_scripts.js old mode 100644 new mode 100755 index 8bf74a0..8bf74a0 --- a/frontend/web/js/my_scripts.js +++ b/frontend/web/js/my_scripts.js diff --git a/frontend/web/js/owl.carousel.js b/frontend/web/js/owl.carousel.js old mode 100644 new mode 100755 index 2296115..2296115 --- a/frontend/web/js/owl.carousel.js +++ b/frontend/web/js/owl.carousel.js diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js old mode 100644 new mode 100755 index 82df11d..4d8e93d --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -3,17 +3,7 @@ $(document).ready(function(){ $(".phone_me_head").append("
Введите номер телефона
"); $(".submenu_button").removeAttr("href"); - $(".carousel").owlCarousel({ - items: 1, - loop: true, - nav: true, - startPosition: 2, - mouseDrag: false, - navSpeed: 800, - autoplaySpeed: 800, - autoplayHoverPause:true, - navText: ['', ''] - }); + $(".submenu_button").click(function(){ diff --git a/frontend/web/robots.txt b/frontend/web/robots.txt old mode 100644 new mode 100755 index 6f27bb6..6f27bb6 --- a/frontend/web/robots.txt +++ b/frontend/web/robots.txt diff --git a/frontend/widgets/Slider.php b/frontend/widgets/Slider.php new file mode 100644 index 0000000..4275f11 --- /dev/null +++ b/frontend/widgets/Slider.php @@ -0,0 +1,30 @@ +where([\common\models\Slider::tableName().'.title'=>$this->title])->joinWith("sliderImage")->one(); + + return $this->render('slider',[ + 'slider'=>$slider + ]); + + + } + +} \ No newline at end of file diff --git a/frontend/widgets/views/slider.php b/frontend/widgets/views/slider.php new file mode 100644 index 0000000..4dc6d95 --- /dev/null +++ b/frontend/widgets/views/slider.php @@ -0,0 +1,63 @@ + +
+ sliderImage as $image): + + ?> +
+
+
+
+
+ Фанера влагостойкая ФСФ (slide1) +
повышенной влагостойкости +
2500х1250х12мм(лист) сорт СР/С
+
+
+ +
+
шлифованные внешние слои фанерного листа
+
высокая устойчивость к влаге
+
повышенная плотность
+
стабильность толщины по всему периметру фанеры
+
+ + url))?> + подробнее + +
+
+
Супер цена
+
345,90 +
грн./лист
+
+
+
+
+
+ +
+ +
+', ''] + });"; + +$this->registerJs($js); + +?> diff --git a/init b/init old mode 100644 new mode 100755 index 6b8dd76..6b8dd76 --- a/init +++ b/init diff --git a/init.bat b/init.bat old mode 100644 new mode 100755 index e50c242..e50c242 --- a/init.bat +++ b/init.bat diff --git a/requirements.php b/requirements.php old mode 100644 new mode 100755 index fd84f47..fd84f47 --- a/requirements.php +++ b/requirements.php diff --git a/tests/README.md b/tests/README.md old mode 100644 new mode 100755 index ad7f016..ad7f016 --- a/tests/README.md +++ b/tests/README.md diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php new file mode 100755 index 0000000..243f9c8 --- /dev/null +++ b/tests/_bootstrap.php @@ -0,0 +1,2 @@ +getScenario()->runStep(new \Codeception\Step\Action('debugWebDriverLogs', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Changes the subdomain for the 'url' configuration parameter. + * Does not open a page; use `amOnPage` for that. + * + * ``` php + * amOnSubdomain('user'); + * $I->amOnPage('/'); + * // moves to http://user.mysite.com/ + * ?> + * ``` + * + * @param $subdomain + * + * @return mixed + * @see \Codeception\Module\WebDriver::amOnSubdomain() + */ + public function amOnSubdomain($subdomain) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Takes a screenshot of the current window and saves it to `tests/_output/debug`. + * + * ``` php + * amOnPage('/user/edit'); + * $I->makeScreenshot('edit_page'); + * // saved to: tests/_output/debug/edit_page.png + * ?> + * ``` + * + * @param $name + * @see \Codeception\Module\WebDriver::makeScreenshot() + */ + public function makeScreenshot($name) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('makeScreenshot', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Resize the current window. + * + * ``` php + * resizeWindow(800, 600); + * + * ``` + * + * @param int $width + * @param int $height + * @see \Codeception\Module\WebDriver::resizeWindow() + */ + public function resizeWindow($width, $height) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('resizeWindow', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that a cookie with the given name is set. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * ``` php + * seeCookie('PHPSESSID'); + * ?> + * ``` + * + * @param $cookie + * @param array $params + * @return mixed + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeCookie() + */ + public function canSeeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that a cookie with the given name is set. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * ``` php + * seeCookie('PHPSESSID'); + * ?> + * ``` + * + * @param $cookie + * @param array $params + * @return mixed + * @see \Codeception\Module\WebDriver::seeCookie() + */ + public function seeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there isn't a cookie with the given name. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeCookie() + */ + public function cantSeeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there isn't a cookie with the given name. + * You can set additional cookie params like `domain`, `path` as array passed in last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Module\WebDriver::dontSeeCookie() + */ + public function dontSeeCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Sets a cookie with the given name and value. + * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument. + * + * ``` php + * setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3'); + * ?> + * ``` + * + * @param $name + * @param $val + * @param array $params + * + * @return mixed + * @see \Codeception\Module\WebDriver::setCookie() + */ + public function setCookie($cookie, $value, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Unsets cookie with the given name. + * You can set additional cookie params like `domain`, `path` in array passed as last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Module\WebDriver::resetCookie() + */ + public function resetCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs a cookie value. + * You can set additional cookie params like `domain`, `path` in array passed as last argument. + * + * @param $cookie + * + * @param array $params + * @return mixed + * @see \Codeception\Module\WebDriver::grabCookie() + */ + public function grabCookie($cookie, $params = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Open web page at the given absolute URL and sets its hostname as the base host. + * + * ``` php + * amOnUrl('http://codeception.com'); + * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart + * ?> + * ``` + * @see \Codeception\Module\WebDriver::amOnUrl() + */ + public function amOnUrl($url) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Opens the page for the given relative URI. + * + * ``` php + * amOnPage('/'); + * // opens /register page + * $I->amOnPage('/register'); + * ``` + * + * @param $page + * @see \Codeception\Module\WebDriver::amOnPage() + */ + public function amOnPage($page) { + return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string (case insensitive). + * + * You can specify a specific HTML element (via CSS or XPath) as the second + * parameter to only search within that element. + * + * ``` php + * see('Logout'); // I can suppose user is logged in + * $I->see('Sign Up', 'h1'); // I can suppose it's a signup page + * $I->see('Sign Up', '//body/h1'); // with XPath + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->see('strong')` will return true for strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will *not* be true for strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param $text + * @param null $selector + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::see() + */ + public function canSee($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string (case insensitive). + * + * You can specify a specific HTML element (via CSS or XPath) as the second + * parameter to only search within that element. + * + * ``` php + * see('Logout'); // I can suppose user is logged in + * $I->see('Sign Up', 'h1'); // I can suppose it's a signup page + * $I->see('Sign Up', '//body/h1'); // with XPath + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->see('strong')` will return true for strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will *not* be true for strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param $text + * @param null $selector + * @see \Codeception\Module\WebDriver::see() + */ + public function see($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page doesn't contain the text specified (case insensitive). + * Give a locator as the second parameter to match a specific region. + * + * ```php + * dontSee('Login'); // I can suppose user is already logged in + * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page + * $I->dontSee('Sign Up','//body/h1'); // with XPath + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->dontSee('strong')` will fail on strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will ignore strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param $text + * @param null $selector + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSee() + */ + public function cantSee($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page doesn't contain the text specified (case insensitive). + * Give a locator as the second parameter to match a specific region. + * + * ```php + * dontSee('Login'); // I can suppose user is already logged in + * $I->dontSee('Sign Up','h1'); // I can suppose it's not a signup page + * $I->dontSee('Sign Up','//body/h1'); // with XPath + * ``` + * + * Note that the search is done after stripping all HTML tags from the body, + * so `$I->dontSee('strong')` will fail on strings like: + * + * - `

I am Stronger than thou

` + * - `` + * + * But will ignore strings like: + * + * - `Home` + * - `
Home` + * - `` + * + * For checking the raw source code, use `seeInSource()`. + * + * @param $text + * @param null $selector + * @see \Codeception\Module\WebDriver::dontSee() + */ + public function dontSee($text, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string in its + * raw source code. + * + * ``` php + * seeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeInSource() + */ + public function canSeeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string in its + * raw source code. + * + * ``` php + * seeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * @see \Codeception\Module\WebDriver::seeInSource() + */ + public function seeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string in its + * raw source code. + * + * ```php + * dontSeeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeInSource() + */ + public function cantSeeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current page contains the given string in its + * raw source code. + * + * ```php + * dontSeeInSource('

Green eggs & ham

'); + * ``` + * + * @param $raw + * @see \Codeception\Module\WebDriver::dontSeeInSource() + */ + public function dontSeeInSource($raw) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page source contains the given string. + * + * ```php + * seeInPageSource('getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInPageSource', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page source contains the given string. + * + * ```php + * seeInPageSource('getScenario()->runStep(new \Codeception\Step\Assertion('seeInPageSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page source doesn't contain the given string. + * + * @param $text + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeInPageSource() + */ + public function cantSeeInPageSource($text) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInPageSource', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page source doesn't contain the given string. + * + * @param $text + * @see \Codeception\Module\WebDriver::dontSeeInPageSource() + */ + public function dontSeeInPageSource($text) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInPageSource', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Perform a click on a link or a button, given by a locator. + * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string. + * For buttons, the "value" attribute, "name" attribute, and inner text are searched. + * For links, the link text is searched. + * For images, the "alt" attribute and inner text of any parent links are searched. + * + * The second parameter is a context (CSS or XPath locator) to narrow the search. + * + * Note that if the locator matches a button of type `submit`, the form will be submitted. + * + * ``` php + * click('Logout'); + * // button of form + * $I->click('Submit'); + * // CSS button + * $I->click('#form input[type=submit]'); + * // XPath + * $I->click('//form/*[@type=submit]'); + * // link in context + * $I->click('Logout', '#nav'); + * // using strict locator + * $I->click(['link' => 'Login']); + * ?> + * ``` + * + * @param $link + * @param $context + * @see \Codeception\Module\WebDriver::click() + */ + public function click($link, $context = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there's a link with the specified text. + * Give a full URL as the second parameter to match links with that exact URL. + * + * ``` php + * seeLink('Logout'); // matches Logout + * $I->seeLink('Logout','/logout'); // matches Logout + * ?> + * ``` + * + * @param $text + * @param null $url + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeLink() + */ + public function canSeeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there's a link with the specified text. + * Give a full URL as the second parameter to match links with that exact URL. + * + * ``` php + * seeLink('Logout'); // matches Logout + * $I->seeLink('Logout','/logout'); // matches Logout + * ?> + * ``` + * + * @param $text + * @param null $url + * @see \Codeception\Module\WebDriver::seeLink() + */ + public function seeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page doesn't contain a link with the given string. + * If the second parameter is given, only links with a matching "href" attribute will be checked. + * + * ``` php + * dontSeeLink('Logout'); // I suppose user is not logged in + * $I->dontSeeLink('Checkout now', '/store/cart.php'); + * ?> + * ``` + * + * @param $text + * @param null $url + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeLink() + */ + public function cantSeeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page doesn't contain a link with the given string. + * If the second parameter is given, only links with a matching "href" attribute will be checked. + * + * ``` php + * dontSeeLink('Logout'); // I suppose user is not logged in + * $I->dontSeeLink('Checkout now', '/store/cart.php'); + * ?> + * ``` + * + * @param $text + * @param null $url + * @see \Codeception\Module\WebDriver::dontSeeLink() + */ + public function dontSeeLink($text, $url = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that current URI contains the given string. + * + * ``` php + * seeInCurrentUrl('home'); + * // to match: /users/1 + * $I->seeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param $uri + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeInCurrentUrl() + */ + public function canSeeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that current URI contains the given string. + * + * ``` php + * seeInCurrentUrl('home'); + * // to match: /users/1 + * $I->seeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param $uri + * @see \Codeception\Module\WebDriver::seeInCurrentUrl() + */ + public function seeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL is equal to the given string. + * Unlike `seeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * seeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param $uri + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeCurrentUrlEquals() + */ + public function canSeeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL is equal to the given string. + * Unlike `seeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * seeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param $uri + * @see \Codeception\Module\WebDriver::seeCurrentUrlEquals() + */ + public function seeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL matches the given regular expression. + * + * ``` php + * seeCurrentUrlMatches('~$/users/(\d+)~'); + * ?> + * ``` + * + * @param $uri + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeCurrentUrlMatches() + */ + public function canSeeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL matches the given regular expression. + * + * ``` php + * seeCurrentUrlMatches('~$/users/(\d+)~'); + * ?> + * ``` + * + * @param $uri + * @see \Codeception\Module\WebDriver::seeCurrentUrlMatches() + */ + public function seeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URI doesn't contain the given string. + * + * ``` php + * dontSeeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param $uri + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeInCurrentUrl() + */ + public function cantSeeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URI doesn't contain the given string. + * + * ``` php + * dontSeeInCurrentUrl('/users/'); + * ?> + * ``` + * + * @param $uri + * @see \Codeception\Module\WebDriver::dontSeeInCurrentUrl() + */ + public function dontSeeInCurrentUrl($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL doesn't equal the given string. + * Unlike `dontSeeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * dontSeeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param $uri + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlEquals() + */ + public function cantSeeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the current URL doesn't equal the given string. + * Unlike `dontSeeInCurrentUrl`, this only matches the full URL. + * + * ``` php + * dontSeeCurrentUrlEquals('/'); + * ?> + * ``` + * + * @param $uri + * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlEquals() + */ + public function dontSeeCurrentUrlEquals($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that current url doesn't match the given regular expression. + * + * ``` php + * dontSeeCurrentUrlMatches('~$/users/(\d+)~'); + * ?> + * ``` + * + * @param $uri + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlMatches() + */ + public function cantSeeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that current url doesn't match the given regular expression. + * + * ``` php + * dontSeeCurrentUrlMatches('~$/users/(\d+)~'); + * ?> + * ``` + * + * @param $uri + * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlMatches() + */ + public function dontSeeCurrentUrlMatches($uri) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Executes the given regular expression against the current URI and returns the first match. + * If no parameters are provided, the full URI is returned. + * + * ``` php + * grabFromCurrentUrl('~$/user/(\d+)/~'); + * $uri = $I->grabFromCurrentUrl(); + * ?> + * ``` + * + * @param null $uri + * + * @return mixed + * @see \Codeception\Module\WebDriver::grabFromCurrentUrl() + */ + public function grabFromCurrentUrl($uri = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the specified checkbox is checked. + * + * ``` php + * seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form. + * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]'); + * ?> + * ``` + * + * @param $checkbox + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeCheckboxIsChecked() + */ + public function canSeeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the specified checkbox is checked. + * + * ``` php + * seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form. + * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]'); + * ?> + * ``` + * + * @param $checkbox + * @see \Codeception\Module\WebDriver::seeCheckboxIsChecked() + */ + public function seeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Check that the specified checkbox is unchecked. + * + * ``` php + * dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form. + * ?> + * ``` + * + * @param $checkbox + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeCheckboxIsChecked() + */ + public function cantSeeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Check that the specified checkbox is unchecked. + * + * ``` php + * dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms + * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form. + * ?> + * ``` + * + * @param $checkbox + * @see \Codeception\Module\WebDriver::dontSeeCheckboxIsChecked() + */ + public function dontSeeCheckboxIsChecked($checkbox) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given input field or textarea contains the given value. + * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath. + * + * ``` php + * seeInField('Body','Type your comment here'); + * $I->seeInField('form textarea[name=body]','Type your comment here'); + * $I->seeInField('form input[type=hidden]','hidden_value'); + * $I->seeInField('#searchform input','Search'); + * $I->seeInField('//form/*[@name=search]','Search'); + * $I->seeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeInField() + */ + public function canSeeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given input field or textarea contains the given value. + * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath. + * + * ``` php + * seeInField('Body','Type your comment here'); + * $I->seeInField('form textarea[name=body]','Type your comment here'); + * $I->seeInField('form input[type=hidden]','hidden_value'); + * $I->seeInField('#searchform input','Search'); + * $I->seeInField('//form/*[@name=search]','Search'); + * $I->seeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Module\WebDriver::seeInField() + */ + public function seeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that an input field or textarea doesn't contain the given value. + * For fuzzy locators, the field is matched by label text, CSS and XPath. + * + * ``` php + * dontSeeInField('Body','Type your comment here'); + * $I->dontSeeInField('form textarea[name=body]','Type your comment here'); + * $I->dontSeeInField('form input[type=hidden]','hidden_value'); + * $I->dontSeeInField('#searchform input','Search'); + * $I->dontSeeInField('//form/*[@name=search]','Search'); + * $I->dontSeeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeInField() + */ + public function cantSeeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that an input field or textarea doesn't contain the given value. + * For fuzzy locators, the field is matched by label text, CSS and XPath. + * + * ``` php + * dontSeeInField('Body','Type your comment here'); + * $I->dontSeeInField('form textarea[name=body]','Type your comment here'); + * $I->dontSeeInField('form input[type=hidden]','hidden_value'); + * $I->dontSeeInField('#searchform input','Search'); + * $I->dontSeeInField('//form/*[@name=search]','Search'); + * $I->dontSeeInField(['name' => 'search'], 'Search'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Module\WebDriver::dontSeeInField() + */ + public function dontSeeInField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks if the array of form parameters (name => value) are set on the form matched with the + * passed selector. + * + * ``` php + * seeInFormFields('form[name=myform]', [ + * 'input1' => 'value', + * 'input2' => 'other value', + * ]); + * ?> + * ``` + * + * For multi-select elements, or to check values of multiple elements with the same name, an + * array may be passed: + * + * ``` php + * seeInFormFields('.form-class', [ + * 'multiselect' => [ + * 'value1', + * 'value2', + * ], + * 'checkbox[]' => [ + * 'a checked value', + * 'another checked value', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * seeInFormFields('#form-id', [ + * 'checkbox1' => true, // passes if checked + * 'checkbox2' => false, // passes if unchecked + * ]); + * ?> + * ``` + * + * Pair this with submitForm for quick testing magic. + * + * ``` php + * 'value', + * 'field2' => 'another value', + * 'checkbox1' => true, + * // ... + * ]; + * $I->submitForm('//form[@id=my-form]', $form, 'submitButton'); + * // $I->amOnPage('/path/to/form-page') may be needed + * $I->seeInFormFields('//form[@id=my-form]', $form); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeInFormFields() + */ + public function canSeeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks if the array of form parameters (name => value) are set on the form matched with the + * passed selector. + * + * ``` php + * seeInFormFields('form[name=myform]', [ + * 'input1' => 'value', + * 'input2' => 'other value', + * ]); + * ?> + * ``` + * + * For multi-select elements, or to check values of multiple elements with the same name, an + * array may be passed: + * + * ``` php + * seeInFormFields('.form-class', [ + * 'multiselect' => [ + * 'value1', + * 'value2', + * ], + * 'checkbox[]' => [ + * 'a checked value', + * 'another checked value', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * seeInFormFields('#form-id', [ + * 'checkbox1' => true, // passes if checked + * 'checkbox2' => false, // passes if unchecked + * ]); + * ?> + * ``` + * + * Pair this with submitForm for quick testing magic. + * + * ``` php + * 'value', + * 'field2' => 'another value', + * 'checkbox1' => true, + * // ... + * ]; + * $I->submitForm('//form[@id=my-form]', $form, 'submitButton'); + * // $I->amOnPage('/path/to/form-page') may be needed + * $I->seeInFormFields('//form[@id=my-form]', $form); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * @see \Codeception\Module\WebDriver::seeInFormFields() + */ + public function seeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks if the array of form parameters (name => value) are not set on the form matched with + * the passed selector. + * + * ``` php + * dontSeeInFormFields('form[name=myform]', [ + * 'input1' => 'non-existent value', + * 'input2' => 'other non-existent value', + * ]); + * ?> + * ``` + * + * To check that an element hasn't been assigned any one of many values, an array can be passed + * as the value: + * + * ``` php + * dontSeeInFormFields('.form-class', [ + * 'fieldName' => [ + * 'This value shouldn\'t be set', + * 'And this value shouldn\'t be set', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * dontSeeInFormFields('#form-id', [ + * 'checkbox1' => true, // fails if checked + * 'checkbox2' => false, // fails if unchecked + * ]); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeInFormFields() + */ + public function cantSeeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks if the array of form parameters (name => value) are not set on the form matched with + * the passed selector. + * + * ``` php + * dontSeeInFormFields('form[name=myform]', [ + * 'input1' => 'non-existent value', + * 'input2' => 'other non-existent value', + * ]); + * ?> + * ``` + * + * To check that an element hasn't been assigned any one of many values, an array can be passed + * as the value: + * + * ``` php + * dontSeeInFormFields('.form-class', [ + * 'fieldName' => [ + * 'This value shouldn\'t be set', + * 'And this value shouldn\'t be set', + * ], + * ]); + * ?> + * ``` + * + * Additionally, checkbox values can be checked with a boolean. + * + * ``` php + * dontSeeInFormFields('#form-id', [ + * 'checkbox1' => true, // fails if checked + * 'checkbox2' => false, // fails if unchecked + * ]); + * ?> + * ``` + * + * @param $formSelector + * @param $params + * @see \Codeception\Module\WebDriver::dontSeeInFormFields() + */ + public function dontSeeInFormFields($formSelector, $params) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Selects an option in a select tag or in radio button group. + * + * ``` php + * selectOption('form select[name=account]', 'Premium'); + * $I->selectOption('form input[name=payment]', 'Monthly'); + * $I->selectOption('//form/select[@name=account]', 'Monthly'); + * ?> + * ``` + * + * Provide an array for the second argument to select multiple options: + * + * ``` php + * selectOption('Which OS do you use?', array('Windows','Linux')); + * ?> + * ``` + * + * @param $select + * @param $option + * @see \Codeception\Module\WebDriver::selectOption() + */ + public function selectOption($select, $option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * + * @see \Codeception\Module\WebDriver::unselectOption() + */ + public function unselectOption($select, $option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('unselectOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Ticks a checkbox. For radio buttons, use the `selectOption` method instead. + * + * ``` php + * checkOption('#agree'); + * ?> + * ``` + * + * @param $option + * @see \Codeception\Module\WebDriver::checkOption() + */ + public function checkOption($option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Unticks a checkbox. + * + * ``` php + * uncheckOption('#notify'); + * ?> + * ``` + * + * @param $option + * @see \Codeception\Module\WebDriver::uncheckOption() + */ + public function uncheckOption($option) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Fills a text field or textarea with the given string. + * + * ``` php + * fillField("//input[@type='text']", "Hello World!"); + * $I->fillField(['name' => 'email'], 'jon@mail.com'); + * ?> + * ``` + * + * @param $field + * @param $value + * @see \Codeception\Module\WebDriver::fillField() + */ + public function fillField($field, $value) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Attaches a file relative to the Codeception data directory to the given file upload field. + * + * ``` php + * attachFile('input[@type="file"]', 'prices.xls'); + * ?> + * ``` + * + * @param $field + * @param $filename + * @see \Codeception\Module\WebDriver::attachFile() + */ + public function attachFile($field, $filename) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs all visible text from the current page. + * + * @return string + * @see \Codeception\Module\WebDriver::getVisibleText() + */ + public function getVisibleText() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('getVisibleText', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Finds and returns the text contents of the given element. + * If a fuzzy locator is used, the element is found using CSS, XPath, and by matching the full page source by regular expression. + * + * ``` php + * grabTextFrom('h1'); + * $heading = $I->grabTextFrom('descendant-or-self::h1'); + * $value = $I->grabTextFrom('~ + * ``` + * + * @param $cssOrXPathOrRegex + * + * @return mixed + * @see \Codeception\Module\WebDriver::grabTextFrom() + */ + public function grabTextFrom($cssOrXPathOrRegex) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs the value of the given attribute value from the given element. + * Fails if element is not found. + * + * ``` php + * grabAttributeFrom('#tooltip', 'title'); + * ?> + * ``` + * + * + * @param $cssOrXpath + * @param $attribute + * + * @return mixed + * @see \Codeception\Module\WebDriver::grabAttributeFrom() + */ + public function grabAttributeFrom($cssOrXpath, $attribute) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Finds the value for the given form field. + * If a fuzzy locator is used, the field is found by field name, CSS, and XPath. + * + * ``` php + * grabValueFrom('Name'); + * $name = $I->grabValueFrom('input[name=username]'); + * $name = $I->grabValueFrom('descendant-or-self::form/descendant::input[@name = 'username']'); + * $name = $I->grabValueFrom(['name' => 'username']); + * ?> + * ``` + * + * @param $field + * + * @return mixed + * @see \Codeception\Module\WebDriver::grabValueFrom() + */ + public function grabValueFrom($field) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Grabs either the text content, or attribute values, of nodes + * matched by $cssOrXpath and returns them as an array. + * + * ```html + * First + * Second + * Third + * ``` + * + * ```php + * grabMultiple('a'); + * + * // would return ['#first', '#second', '#third'] + * $aLinks = $I->grabMultiple('a', 'href'); + * ?> + * ``` + * + * @param $cssOrXpath + * @param $attribute + * @return string[] + * @see \Codeception\Module\WebDriver::grabMultiple() + */ + public function grabMultiple($cssOrXpath, $attribute = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element exists on the page and is visible. + * You can also specify expected attributes of this element. + * + * ``` php + * seeElement('.error'); + * $I->seeElement('//form/input[1]'); + * $I->seeElement('input', ['name' => 'login']); + * $I->seeElement('input', ['value' => '123456']); + * + * // strict locator in first arg, attributes in second + * $I->seeElement(['css' => 'form input'], ['name' => 'login']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @return + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeElement() + */ + public function canSeeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element exists on the page and is visible. + * You can also specify expected attributes of this element. + * + * ``` php + * seeElement('.error'); + * $I->seeElement('//form/input[1]'); + * $I->seeElement('input', ['name' => 'login']); + * $I->seeElement('input', ['value' => '123456']); + * + * // strict locator in first arg, attributes in second + * $I->seeElement(['css' => 'form input'], ['name' => 'login']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @return + * @see \Codeception\Module\WebDriver::seeElement() + */ + public function seeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element is invisible or not present on the page. + * You can also specify expected attributes of this element. + * + * ``` php + * dontSeeElement('.error'); + * $I->dontSeeElement('//form/input[1]'); + * $I->dontSeeElement('input', ['name' => 'login']); + * $I->dontSeeElement('input', ['value' => '123456']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeElement() + */ + public function cantSeeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element is invisible or not present on the page. + * You can also specify expected attributes of this element. + * + * ``` php + * dontSeeElement('.error'); + * $I->dontSeeElement('//form/input[1]'); + * $I->dontSeeElement('input', ['name' => 'login']); + * $I->dontSeeElement('input', ['value' => '123456']); + * ?> + * ``` + * + * @param $selector + * @param array $attributes + * @see \Codeception\Module\WebDriver::dontSeeElement() + */ + public function dontSeeElement($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element exists on the page, even it is invisible. + * + * ``` php + * seeElementInDOM('//form/input[type=hidden]'); + * ?> + * ``` + * + * @param $selector + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeElementInDOM() + */ + public function canSeeElementInDOM($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElementInDOM', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given element exists on the page, even it is invisible. + * + * ``` php + * seeElementInDOM('//form/input[type=hidden]'); + * ?> + * ``` + * + * @param $selector + * @see \Codeception\Module\WebDriver::seeElementInDOM() + */ + public function seeElementInDOM($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElementInDOM', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Opposite of `seeElementInDOM`. + * + * @param $selector + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeElementInDOM() + */ + public function cantSeeElementInDOM($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElementInDOM', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Opposite of `seeElementInDOM`. + * + * @param $selector + * @see \Codeception\Module\WebDriver::dontSeeElementInDOM() + */ + public function dontSeeElementInDOM($selector, $attributes = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElementInDOM', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there are a certain number of elements matched by the given locator on the page. + * + * ``` php + * seeNumberOfElements('tr', 10); + * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements + * ?> + * ``` + * @param $selector + * @param mixed $expected : + * - string: strict number + * - array: range of numbers [0,10] + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeNumberOfElements() + */ + public function canSeeNumberOfElements($selector, $expected) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that there are a certain number of elements matched by the given locator on the page. + * + * ``` php + * seeNumberOfElements('tr', 10); + * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements + * ?> + * ``` + * @param $selector + * @param mixed $expected : + * - string: strict number + * - array: range of numbers [0,10] + * @see \Codeception\Module\WebDriver::seeNumberOfElements() + */ + public function seeNumberOfElements($selector, $expected) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeNumberOfElementsInDOM() + */ + public function canSeeNumberOfElementsInDOM($selector, $expected) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElementsInDOM', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * + * @see \Codeception\Module\WebDriver::seeNumberOfElementsInDOM() + */ + public function seeNumberOfElementsInDOM($selector, $expected) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElementsInDOM', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given option is selected. + * + * ``` php + * seeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeOptionIsSelected() + */ + public function canSeeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given option is selected. + * + * ``` php + * seeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * @see \Codeception\Module\WebDriver::seeOptionIsSelected() + */ + public function seeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given option is not selected. + * + * ``` php + * dontSeeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeOptionIsSelected() + */ + public function cantSeeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the given option is not selected. + * + * ``` php + * dontSeeOptionIsSelected('#form input[name=payment]', 'Visa'); + * ?> + * ``` + * + * @param $selector + * @param $optionText + * + * @return mixed + * @see \Codeception\Module\WebDriver::dontSeeOptionIsSelected() + */ + public function dontSeeOptionIsSelected($selector, $optionText) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page title contains the given string. + * + * ``` php + * seeInTitle('Blog - Post #1'); + * ?> + * ``` + * + * @param $title + * + * @return mixed + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeInTitle() + */ + public function canSeeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page title contains the given string. + * + * ``` php + * seeInTitle('Blog - Post #1'); + * ?> + * ``` + * + * @param $title + * + * @return mixed + * @see \Codeception\Module\WebDriver::seeInTitle() + */ + public function seeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page title does not contain the given string. + * + * @param $title + * + * @return mixed + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::dontSeeInTitle() + */ + public function cantSeeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the page title does not contain the given string. + * + * @param $title + * + * @return mixed + * @see \Codeception\Module\WebDriver::dontSeeInTitle() + */ + public function dontSeeInTitle($title) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Accepts the active JavaScript native popup window, as created by `window.alert`|`window.confirm`|`window.prompt`. + * Don't confuse popups with modal windows, as created by [various libraries](http://jster.net/category/windows-modals-popups). + * @see \Codeception\Module\WebDriver::acceptPopup() + */ + public function acceptPopup() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('acceptPopup', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Dismisses the active JavaScript popup, as created by `window.alert`|`window.confirm`|`window.prompt`. + * @see \Codeception\Module\WebDriver::cancelPopup() + */ + public function cancelPopup() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('cancelPopup', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the active JavaScript popup, as created by `window.alert`|`window.confirm`|`window.prompt`, contains the given string. + * + * @param $text + * Conditional Assertion: Test won't be stopped on fail + * @see \Codeception\Module\WebDriver::seeInPopup() + */ + public function canSeeInPopup($text) { + return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInPopup', func_get_args())); + } + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Checks that the active JavaScript popup, as created by `window.alert`|`window.confirm`|`window.prompt`, contains the given string. + * + * @param $text + * @see \Codeception\Module\WebDriver::seeInPopup() + */ + public function seeInPopup($text) { + return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInPopup', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Enters text into a native JavaScript prompt popup, as created by `window.prompt`. + * + * @param $keys + * @see \Codeception\Module\WebDriver::typeInPopup() + */ + public function typeInPopup($keys) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('typeInPopup', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Reloads the current page. + * @see \Codeception\Module\WebDriver::reloadPage() + */ + public function reloadPage() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('reloadPage', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Moves back in history. + * @see \Codeception\Module\WebDriver::moveBack() + */ + public function moveBack() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Moves forward in history. + * @see \Codeception\Module\WebDriver::moveForward() + */ + public function moveForward() { + return $this->getScenario()->runStep(new \Codeception\Step\Action('moveForward', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Submits the given form on the page, optionally with the given form + * values. Give the form fields values as an array. Note that hidden fields + * can't be accessed. + * + * Skipped fields will be filled by their values from the page. + * You don't need to click the 'Submit' button afterwards. + * This command itself triggers the request to form's action. + * + * You can optionally specify what button's value to include + * in the request with the last parameter as an alternative to + * explicitly setting its value in the second parameter, as + * button values are not otherwise included in the request. + * + * Examples: + * + * ``` php + * submitForm('#login', [ + * 'login' => 'davert', + * 'password' => '123456' + * ]); + * // or + * $I->submitForm('#login', [ + * 'login' => 'davert', + * 'password' => '123456' + * ], 'submitButtonName'); + * + * ``` + * + * For example, given this sample "Sign Up" form: + * + * ``` html + *
+ * Login: + *
+ * Password: + *
+ * Do you agree to our terms? + *
+ * Select pricing plan: + * + * + *
+ * ``` + * + * You could write the following to submit it: + * + * ``` php + * submitForm( + * '#userForm', + * [ + * 'user[login]' => 'Davert', + * 'user[password]' => '123456', + * 'user[agree]' => true + * ], + * 'submitButton' + * ); + * ``` + * Note that "2" will be the submitted value for the "plan" field, as it is + * the selected option. + * + * Also note that this differs from PhpBrowser, in that + * ```'user' => [ 'login' => 'Davert' ]``` is not supported at the moment. + * Named array keys *must* be included in the name as above. + * + * Pair this with seeInFormFields for quick testing magic. + * + * ``` php + * 'value', + * 'field2' => 'another value', + * 'checkbox1' => true, + * // ... + * ]; + * $I->submitForm('//form[@id=my-form]', $form, 'submitButton'); + * // $I->amOnPage('/path/to/form-page') may be needed + * $I->seeInFormFields('//form[@id=my-form]', $form); + * ?> + * ``` + * + * Parameter values must be set to arrays for multiple input fields + * of the same name, or multi-select combo boxes. For checkboxes, + * either the string value can be used, or boolean values which will + * be replaced by the checkbox's value in the DOM. + * + * ``` php + * submitForm('#my-form', [ + * 'field1' => 'value', + * 'checkbox' => [ + * 'value of first checkbox', + * 'value of second checkbox, + * ], + * 'otherCheckboxes' => [ + * true, + * false, + * false + * ], + * 'multiselect' => [ + * 'first option value', + * 'second option value' + * ] + * ]); + * ?> + * ``` + * + * Mixing string and boolean values for a checkbox's value is not supported + * and may produce unexpected results. + * + * Field names ending in "[]" must be passed without the trailing square + * bracket characters, and must contain an array for its value. This allows + * submitting multiple values with the same name, consider: + * + * ```php + * $I->submitForm('#my-form', [ + * 'field[]' => 'value', + * 'field[]' => 'another value', // 'field[]' is already a defined key + * ]); + * ``` + * + * The solution is to pass an array value: + * + * ```php + * // this way both values are submitted + * $I->submitForm('#my-form', [ + * 'field' => [ + * 'value', + * 'another value', + * ] + * ]); + * ``` + * @param $selector + * @param $params + * @param $button + * @see \Codeception\Module\WebDriver::submitForm() + */ + public function submitForm($selector, $params, $button = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Waits up to $timeout seconds for the given element to change. + * Element "change" is determined by a callback function which is called repeatedly until the return value evaluates to true. + * + * ``` php + * waitForElementChange('#menu', function(WebDriverElement $el) { + * return $el->isDisplayed(); + * }, 100); + * ?> + * ``` + * + * @param $element + * @param \Closure $callback + * @param int $timeout seconds + * @throws \Codeception\Exception\ElementNotFound + * @see \Codeception\Module\WebDriver::waitForElementChange() + */ + public function waitForElementChange($element, $callback, $timeout = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementChange', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Waits up to $timeout seconds for an element to appear on the page. + * If the element doesn't appear, a timeout exception is thrown. + * + * ``` php + * waitForElement('#agree_button', 30); // secs + * $I->click('#agree_button'); + * ?> + * ``` + * + * @param $element + * @param int $timeout seconds + * @throws \Exception + * @see \Codeception\Module\WebDriver::waitForElement() + */ + public function waitForElement($element, $timeout = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElement', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Waits up to $timeout seconds for the given element to be visible on the page. + * If element doesn't appear, a timeout exception is thrown. + * + * ``` php + * waitForElementVisible('#agree_button', 30); // secs + * $I->click('#agree_button'); + * ?> + * ``` + * + * @param $element + * @param int $timeout seconds + * @throws \Exception + * @see \Codeception\Module\WebDriver::waitForElementVisible() + */ + public function waitForElementVisible($element, $timeout = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementVisible', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Waits up to $timeout seconds for the given element to become invisible. + * If element stays visible, a timeout exception is thrown. + * + * ``` php + * waitForElementNotVisible('#agree_button', 30); // secs + * ?> + * ``` + * + * @param $element + * @param int $timeout seconds + * @throws \Exception + * @see \Codeception\Module\WebDriver::waitForElementNotVisible() + */ + public function waitForElementNotVisible($element, $timeout = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementNotVisible', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Waits up to $timeout seconds for the given string to appear on the page. + * Can also be passed a selector to search in. + * If the given text doesn't appear, a timeout exception is thrown. + * + * ``` php + * waitForText('foo', 30); // secs + * $I->waitForText('foo', 30, '.title'); // secs + * ?> + * ``` + * + * @param string $text + * @param int $timeout seconds + * @param null $selector + * @throws \Exception + * @see \Codeception\Module\WebDriver::waitForText() + */ + public function waitForText($text, $timeout = null, $selector = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForText', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Wait for $timeout seconds. + * + * @param int $timeout secs + * @throws \Codeception\Exception\TestRuntimeException + * @see \Codeception\Module\WebDriver::wait() + */ + public function wait($timeout) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('wait', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Low-level API method. + * If Codeception commands are not enough, this allows you to use Selenium WebDriver methods directly: + * + * ``` php + * $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) { + * $webdriver->get('http://google.com'); + * }); + * ``` + * + * This runs in the context of the [RemoteWebDriver class](https://github.com/facebook/php-webdriver/blob/master/lib/remote/RemoteWebDriver.php). + * Try not to use this command on a regular basis. + * If Codeception lacks a feature you need, please implement it and submit a patch. + * + * @param callable $function + * @see \Codeception\Module\WebDriver::executeInSelenium() + */ + public function executeInSelenium($function) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInSelenium', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Switch to another window identified by name. + * + * The window can only be identified by name. If the $name parameter is blank, the parent window will be used. + * + * Example: + * ``` html + * + * ``` + * + * ``` php + * click("Open window"); + * # switch to another window + * $I->switchToWindow("another_window"); + * # switch to parent window + * $I->switchToWindow(); + * ?> + * ``` + * + * If the window has no name, the only way to access it is via the `executeInSelenium()` method, like so: + * + * ``` php + * executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) { + * $handles=$webdriver->getWindowHandles(); + * $last_window = end($handles); + * $webdriver->switchTo()->window($last_window); + * }); + * ?> + * ``` + * + * @param string|null $name + * @see \Codeception\Module\WebDriver::switchToWindow() + */ + public function switchToWindow($name = null) { + return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToWindow', func_get_args())); + } + + + /** + * [!] Method is generated. Documentation taken from corresponding module. + * + * Switch to another frame on the page. + * + * Example: + * ``` html + *