From 89d4b5ac8567a3450fbd461ba2948b52c6a9520a Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 25 Nov 2015 16:41:35 +0200 Subject: [PATCH] VItaliy 25.11.2015 --- .htaccess | 2 +- backend/assets/MyAsset.php | 2 -- backend/components/ImageResizer.php | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/components/ImageSizer.php | 59 ----------------------------------------------------------- backend/components/ImageUploader.php | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/components/ImgResizer.php | 181 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- backend/components/base/BaseController.php | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- backend/components/views/image_sizer.php | 71 +++++++++++++++++++++++++++++++++++++++-------------------------------- backend/controllers/AccountsController.php | 3 +-- backend/controllers/NewsController.php | 4 ++-- backend/models/Accounts.php | 1 + backend/views/accounts/_form.php | 12 +++++++----- backend/views/accounts/index.php | 5 +++++ backend/views/layouts/main.php | 2 +- backend/views/news/_form.php | 3 --- backend/views/news/index.php | 30 +++++++++++++++++------------- backend/views/team/_form.php | 5 +++-- backend/views/team/index.php | 5 ++++- backend/views/user/_form.php | 10 +++++++++- backend/web/css/AdminLTE.css | 10 +++++++--- backend/web/css/site.css | 33 +++++++++++++++++++++++++++++++++ backend/web/js/script.js | 28 ++++++++++++++++++++++++++++ common/models/Accounts.php | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ common/models/AccountsForm.php | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ common/models/DicCities.php | 4 ++++ common/models/Team.php | 5 +++++ common/models/TeamGroup.php | 5 +++++ frontend/assets/InternalAsset.php | 1 + frontend/assets/OuterAsset.php | 1 + frontend/controllers/AjaxController.php | 35 +++++++++++++++++++++++++++++++++++ frontend/controllers/SiteController.php | 82 ++++++++++++++++++++++++++++------------------------------------------------------ frontend/views/ajax/cities_list.php | 3 +++ frontend/views/ajax/registration_for_company.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ frontend/views/ajax/registration_for_person.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ frontend/views/cart/index.php | 2 +- frontend/views/cart/step.php | 2 +- frontend/views/layouts/main.php | 66 +++++++++++++++++++----------------------------------------------- frontend/views/news/index.php | 2 +- frontend/views/news/view.php | 55 ++++++++++++++++++++++++++++--------------------------- frontend/views/site/about.php | 204 ++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/site/contacts.php | 11 +++++++++++ frontend/views/site/contacts_layout.php | 34 ++++++++++++++++++++++++++++++++++ frontend/views/site/optovikam.php | 131 ----------------------------------------------------------------------------------------------------------------------------------- frontend/views/site/payment_delivery.php | 12 ++++++++++++ frontend/views/site/payment_delivery_layout.php | 11 +++++++++++ frontend/views/site/provider.php | 91 +++++-------------------------------------------------------------------------------------- frontend/views/site/team_list_layout.php | 37 +++++++++++++++++++++++++++++++++++++ frontend/views/site/wholesalers.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/css/BC2_catalog.css | 5 +---- frontend/web/css/BC2_catalog_zapchasti.css | 12 ------------ frontend/web/css/about_company.css | 17 ----------------- frontend/web/css/catalog_marok.css | 12 +----------- frontend/web/css/general_styles.css | 28 ---------------------------- frontend/web/css/main.css | 41 ++++++++++++++++++++++++++++++++++++++++- frontend/web/css/news_all.css | 13 ------------- frontend/web/css/not_found.css | 14 +------------- frontend/web/css/original_catalog.css | 12 ------------ frontend/web/css/search_filters.css | 2 -- frontend/web/css/search_page.css | 11 ----------- frontend/web/css/style.css | 17 +---------------- frontend/web/css/style/404.css | 14 -------------- frontend/web/css/style/brands.css | 15 --------------- frontend/web/css/style/busket.css | 13 ------------- frontend/web/css/style/my_profile.css | 6 ------ frontend/web/css/style/news_all.css | 12 ------------ frontend/web/css/style/notepad.css | 14 +------------- frontend/web/css/style/optovikam.css | 13 ------------- frontend/web/css/style/thanks.css | 13 ------------- frontend/web/css/style_vin.css | 10 ---------- frontend/web/js/main.js | 38 ++++++++++++++++++++++++++++++++++++++ frontend/web/js/script.js | 71 +++++++++++++++++++++++------------------------------------------------ storage/c24c6caa693896710ec7a0934a911214/200x200.png | Bin 160516 -> 0 bytes storage/dbd5c1a08753ca919151c7ac628e7df3/200x200.png | Bin 341710 -> 0 bytes storage/dbd5c1a08753ca919151c7ac628e7df3/x.png | Bin 341710 -> 0 bytes 74 files changed, 1258 insertions(+), 1174 deletions(-) create mode 100755 backend/components/ImageResizer.php delete mode 100755 backend/components/ImageSizer.php create mode 100755 backend/components/ImageUploader.php delete mode 100755 backend/components/ImgResizer.php create mode 100644 common/models/AccountsForm.php create mode 100644 frontend/controllers/AjaxController.php create mode 100644 frontend/views/ajax/cities_list.php create mode 100644 frontend/views/ajax/registration_for_company.php create mode 100644 frontend/views/ajax/registration_for_person.php create mode 100644 frontend/views/site/contacts.php create mode 100644 frontend/views/site/contacts_layout.php delete mode 100755 frontend/views/site/optovikam.php create mode 100644 frontend/views/site/payment_delivery.php create mode 100644 frontend/views/site/payment_delivery_layout.php create mode 100644 frontend/views/site/team_list_layout.php create mode 100755 frontend/views/site/wholesalers.php create mode 100644 frontend/web/js/main.js delete mode 100755 storage/dbd5c1a08753ca919151c7ac628e7df3/200x200.png delete mode 100755 storage/dbd5c1a08753ca919151c7ac628e7df3/x.png diff --git a/.htaccess b/.htaccess index effc303..35ce115 100755 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,5 @@ - +AddDefaultCharset UTF-8 Options +FollowSymlinks RewriteEngine On diff --git a/backend/assets/MyAsset.php b/backend/assets/MyAsset.php index f6aea43..11ad6cd 100755 --- a/backend/assets/MyAsset.php +++ b/backend/assets/MyAsset.php @@ -38,8 +38,6 @@ class MyAsset extends AssetBundle 'js/app.min.js', 'js/pages/dashboard.js', 'js/main.js', - 'js/angular.js', - 'js/angular_js.js', 'js/script.js', ]; diff --git a/backend/components/ImageResizer.php b/backend/components/ImageResizer.php new file mode 100755 index 0000000..dc8fa57 --- /dev/null +++ b/backend/components/ImageResizer.php @@ -0,0 +1,185 @@ +request->post(); + + if ($request) { + + if(isset($request['old_img'])){ + $this->deleteImages($request['old_img']); + } + + + $model->file = UploadedFile::getInstance($model, 'file'); + + if(!$model->file){ + return json_encode(["error"=>"Не указан файл"]); + } + + $md5_file = md5_file($model->file->tempName); + + $imgDir = Yii::getAlias('@storage/'.$md5_file.'/'); + + $imageOrigAlias = Yii::getAlias($imgDir.'original'.'.'.$model->file->extension); + + if(!is_dir($imgDir)) { + mkdir($imgDir, 0755, true); + } + + $model->file->saveAs($imageOrigAlias); + + if($request['width'] && $request['height']){ + + $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension); + + $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension; + + $this->resizeImg($request['width'],$request['height'], $imageOrigAlias,$imageAlias); + + } else { + + $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension; + + } + + + if($model->multi){ +// $view = $this->renderPartial('@app/components/views/_gallery_item', [ +// 'item' => ['image'=>$imageLink], +// ]); +// +// return json_encode(['link'=>$imageLink, 'view' =>$view]); + + + } else { + $p1[0] = ""; + return json_encode(['success','initialPreview' => $p1, 'append' => false, 'name' =>$imageLink,]); + } + + + } else { + return json_encode(['error']); + } + + + + + } + + + public function isBigger($width,$height,$w,$h) + { + if($width>$w){ + return true; + }else if($height >$h) { + return true; + } + return false; + } + + + + + + public function resizeImg($w, $h, $imageAlias,$imageAliasSave) + { + $img = Image::getImagine()->open(Yii::getAlias($imageAlias)); + + $size = $img->getSize(); + + $width = $size->getWidth(); + $height = $size->getHeight(); + + $e_width = $w/$h; + $e_height = $h/$w; + + $e1_width = $width/$height; + $e1_height = $height/$width; + + if($this->isBigger($width,$height,$w,$h)){ + if($e_width<$e1_width){ + $new_width = $width*($e_width/$e1_width); + $width = $new_width; + }else { + $new_height = $height*($e_height/$e1_height); + $height = $new_height; + } + + + } else { + $img->save($imageAliasSave, array('flatten' => false)); + return true; + } + + + Image::crop($imageAlias, $width, $height,[0,0]) + ->save(Yii::getAlias($imageAliasSave), ['quality' => + 100]); + + + $imagine = new Imagine(); + $imagine->open($imageAliasSave) + ->resize(new Box($w, $h)) + ->save($imageAliasSave, array('flatten' => false)); + + + + } + + + private function deleteImages($old_img){ + + if(!empty($old_img) && file_exists($_SERVER['DOCUMENT_ROOT'].$old_img)){ + + $rootDir = explode("/", $old_img); + + $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/'; + + $allFiles = scandir($row); + + $allFiles = array_slice($allFiles, 2); + + foreach($allFiles as $oldFile){ + + unlink($row.$oldFile); + + } + + } + } + + public function actionDeleteImage(){ + $old_img = Yii::$app->request->post('old_img'); + + if ($old_img) { + $this->deleteImages($old_img); + } + } + + + +} \ No newline at end of file diff --git a/backend/components/ImageSizer.php b/backend/components/ImageSizer.php deleted file mode 100755 index 3d3161d..0000000 --- a/backend/components/ImageSizer.php +++ /dev/null @@ -1,59 +0,0 @@ -render('image_sizer', - [ - 'model'=>$this->model, - 'field' => $this->field, - 'form' => $this->form, - 'height' => $this->height, - 'width' => $this->width, - 'multi' => $this->multi - ]); - - } - - public function getGallery(){ - if($this->gallery){ - $array = explode(",", $this->gallery); - if(count($array) > 1){ - array_pop($array); - } - return $array; - } else { - return array(); - } - - } - -} \ No newline at end of file diff --git a/backend/components/ImageUploader.php b/backend/components/ImageUploader.php new file mode 100755 index 0000000..454fa1d --- /dev/null +++ b/backend/components/ImageUploader.php @@ -0,0 +1,59 @@ +render('image_sizer', + [ + 'model'=>$this->model, + 'field' => $this->field, + 'form' => $this->form, + 'height' => $this->height, + 'width' => $this->width, + 'multi' => $this->multi + ]); + + } + + public function getGallery(){ + if($this->gallery){ + $array = explode(",", $this->gallery); + if(count($array) > 1){ + array_pop($array); + } + return $array; + } else { + return array(); + } + + } + +} \ No newline at end of file diff --git a/backend/components/ImgResizer.php b/backend/components/ImgResizer.php deleted file mode 100755 index fb18347..0000000 --- a/backend/components/ImgResizer.php +++ /dev/null @@ -1,181 +0,0 @@ -request->post(); - - if ($request) { - - if(isset($request['old_img'])){ - $this->deleteImages($request['old_img']); - } - - - $model->file = UploadedFile::getInstance($model, 'file'); - - $md5_file = md5_file($model->file->tempName); - - $imgDir = Yii::getAlias('@storage/'.$md5_file.'/'); - - $imageOrigAlias = Yii::getAlias($imgDir.'original'.'.'.$model->file->extension); - - if(!is_dir($imgDir)) { - mkdir($imgDir, 0755, true); - } - - $model->file->saveAs($imageOrigAlias); - - if($request['width'] && $request['height']){ - - $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension); - - $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension; - - $this->resizeImg($request['width'],$request['height'], $imageOrigAlias,$imageAlias); - - } else { - - $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension; - - } - - - if($model->multi){ -// $view = $this->renderPartial('@app/components/views/_gallery_item', [ -// 'item' => ['image'=>$imageLink], -// ]); -// -// return json_encode(['link'=>$imageLink, 'view' =>$view]); - - - } else { - $p1[0] = ""; - return json_encode(['success','initialPreview' => $p1, 'append' => false, 'name' =>$imageLink,]); - } - - - } else { - return json_encode(['error']); - } - - - - - } - - - public function isBigger($width,$height,$w,$h) - { - if($width>$w){ - return true; - }else if($height >$h) { - return true; - } - return false; - } - - - - - - public function resizeImg($w, $h, $imageAlias,$imageAliasSave) - { - $img = Image::getImagine()->open(Yii::getAlias($imageAlias)); - - $size = $img->getSize(); - - $width = $size->getWidth(); - $height = $size->getHeight(); - - $e_width = $w/$h; - $e_height = $h/$w; - - $e1_width = $width/$height; - $e1_height = $height/$width; - - if($this->isBigger($width,$height,$w,$h)){ - if($e_width<$e1_width){ - $new_width = $width*($e_width/$e1_width); - $width = $new_width; - }else { - $new_height = $height*($e_height/$e1_height); - $height = $new_height; - } - - - } else { - $img->save($imageAliasSave, array('flatten' => false)); - return true; - } - - - Image::crop($imageAlias, $width, $height,[0,0]) - ->save(Yii::getAlias($imageAliasSave), ['quality' => - 100]); - - - $imagine = new Imagine(); - $imagine->open($imageAliasSave) - ->resize(new Box($w, $h)) - ->save($imageAliasSave, array('flatten' => false)); - - - - } - - - private function deleteImages($old_img){ - - if(!empty($old_img) && file_exists($_SERVER['DOCUMENT_ROOT'].$old_img)){ - - $rootDir = explode("/", $old_img); - - $row = $_SERVER['DOCUMENT_ROOT'].'/'.$rootDir[1].'/'.$rootDir[2].'/'; - - $allFiles = scandir($row); - - $allFiles = array_slice($allFiles, 2); - - foreach($allFiles as $oldFile){ - - unlink($row.$oldFile); - - } - - } - } - - public function actionDeleteImage(){ - $old_img = Yii::$app->request->post('old_img'); - - if ($old_img) { - $this->deleteImages($old_img); - } - } - - - -} \ No newline at end of file diff --git a/backend/components/base/BaseController.php b/backend/components/base/BaseController.php index 87d48b2..98112ef 100755 --- a/backend/components/base/BaseController.php +++ b/backend/components/base/BaseController.php @@ -17,7 +17,15 @@ use yii\imagine\Image; class BaseController extends Controller { - + public function isBigger($width,$height,$w,$h) + { + if($width>$w){ + return true; + }else if($height >$h) { + return true; + } + return false; + } private function resizeImg($w, $h, $imageAlias,$imageAliasSave){ $img = Image::getImagine()->open(Yii::getAlias($imageAlias)); @@ -27,17 +35,38 @@ class BaseController extends Controller { $width = $size->getWidth(); $height = $size->getHeight(); - if($width > $height) { - $y = 0; - $x = ($width - $height) / 2; - $smallestSide = $height; + $e_width = $w/$h; + $e_height = $h/$w; + + $e1_width = $width/$height; + $e1_height = $height/$width; + + + if($this->isBigger($width,$height,$w,$h)){ + if($e_width<$e1_width){ + + $new_width = $width*($e_width/$e1_width); + + $y = 0; + $x = $width/ 2-($new_width/2); + $width = $new_width; + + }else { + + $new_height = $height*($e_height/$e1_height); + $x = 0; + $y = $height/2-($new_height/2); + $height = $new_height; + } + + } else { - $x = 0; - $y = ($height - $width) / 2; - $smallestSide = $width; + $img->save($imageAliasSave, array('flatten' => false)); + return true; } - Image::crop($imageAlias, $smallestSide, $smallestSide,[$x,$y]) + + Image::crop($imageAlias, $width, $height,[$x,$y]) ->save(Yii::getAlias($imageAliasSave), ['quality' => 100]); @@ -49,8 +78,6 @@ class BaseController extends Controller { - - } private function deleteImages($old_img){ @@ -75,11 +102,22 @@ class BaseController extends Controller { } public function actionDeleteImage(){ - $old_img = Yii::$app->request->post('old_img'); - if ($old_img) { - $this->deleteImages($old_img); + $request = Yii::$app->request->post(); + + if($request){ + if ($request['old_img']) { + $this->deleteImages($request['old_img']); + } + if(isset($request['action']) && $request['action']=='save'){ + $object = str_replace('-', '\\',$request['model']); + $model = new $object; + $model = $model->findOne($request['id']); + $model->$request['field'] = $request['new_url']; + $model->save(); + } } + } @@ -88,9 +126,8 @@ class BaseController extends Controller { $model = new ImageSizerForm(); - if ($model->load(Yii::$app->request->post())) { - - $this->deleteImages($model->old_img); + $request = Yii::$app->request->post(); + if ($request) { $model->file = UploadedFile::getInstance($model, 'file'); @@ -106,13 +143,13 @@ class BaseController extends Controller { $model->file->saveAs($imageOrigAlias); - if($model->width && $model->height){ + if($request['width'] && $request['height']){ - $imageAlias = Yii::getAlias($imgDir.$model->width.'x'.$model->height.'.'.$model->file->extension); + $imageAlias = Yii::getAlias($imgDir.$request['width'].'x'.$request['height'].'.'.$model->file->extension); - $imageLink = '/storage/'.$md5_file.'/'.$model->width.'x'.$model->height.'.'.$model->file->extension; + $imageLink = '/storage/'.$md5_file.'/'.$request['width'].'x'.$request['height'].'.'.$model->file->extension; - $this->resizeImg($model->width, $model->height, $imageOrigAlias,$imageAlias); + $this->resizeImg($request['width'], $request['height'], $imageOrigAlias,$imageAlias); } else { diff --git a/backend/components/views/image_sizer.php b/backend/components/views/image_sizer.php index 20fd8ca..fe065ad 100755 --- a/backend/components/views/image_sizer.php +++ b/backend/components/views/image_sizer.php @@ -11,39 +11,14 @@ $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.iframe- $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupload.js'); ?> - + field( new \backend\models\ImageSizerForm(), 'file')->fileInput(['id'=>$field, 'data-url'=>"/admin/site/download-photo" ]); ?> field($model,$field)->hiddenInput(['id' => "{$field}_picture_link"]) ?> - - - + + +
$field ? Html::img($model->$field): '' ?>
@@ -53,16 +28,48 @@ $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl $("#").fileupload({ dataType: 'json', + formData: {width: ,height:}, done: function (e, data) { + if($("#_buttons_block").length){ + $("#_buttons_block").remove() + } var host = window.location.host.toString(); - var img = ''; + var img = ''+ + '
'+ + ''+ + ''+ + '
'; var block = $("#_img_block"); block.find('img').remove(); block.append(img); - $("#_picture_link").val(data.result.link); + + $("#_new_img").val(data.result.link); } }); + + $('body').on('click', '#_save_img',function(){ + $("#_buttons_block").remove(); + var old_url = $('#_old_img').val(); + var new_url = $('#_new_img').val(); + var model = ''; + $.post( "/admin/site/delete-image",{new_url:new_url,old_img: old_url,model:model,field:"", id:"id?>",action:'save'}, function() { + }); + $("#_picture_link").val(new_url); + }); + + $('body').on('click', '#_remove_img',function(){ + $("#_buttons_block").remove(); + $("#_buttons_block").remove(); + var old_url = $('#_old_img').val(); + var new_url = $('#_new_img').val(); + $.post( "/admin/site/delete-image",{old_img: new_url}, function() { + }); + + $('#_img_block').find('img').attr('src',old_url); + }); + + }) @@ -108,4 +115,4 @@ $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl }) - \ No newline at end of file + \ No newline at end of file diff --git a/backend/controllers/AccountsController.php b/backend/controllers/AccountsController.php index e291f25..ff805ff 100755 --- a/backend/controllers/AccountsController.php +++ b/backend/controllers/AccountsController.php @@ -86,8 +86,7 @@ class AccountsController extends Controller $cities = DicCities::find()->all(); $margin = Margins::find()->all(); $users = User::find()->all(); - $model->load(Yii::$app->request->post()); - die( var_dump($model->validate())); + if ($model->load(Yii::$app->request->post()) && $model->save()) { return $this->redirect(['view', 'id' => $model->id]); } else { diff --git a/backend/controllers/NewsController.php b/backend/controllers/NewsController.php index cfebf06..109afde 100755 --- a/backend/controllers/NewsController.php +++ b/backend/controllers/NewsController.php @@ -12,7 +12,7 @@ use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; use yii\filters\AccessControl; use yii\web\UploadedFile; -use backend\components\ImgResizer; +use backend\components\ImageResizer; /** * NewsController implements the CRUD actions for News model. @@ -146,7 +146,7 @@ class NewsController extends Controller public function actionFileUpload(){ - echo ImgResizer::widget(); + echo ImageResizer::widget(); } diff --git a/backend/models/Accounts.php b/backend/models/Accounts.php index 5f7b3b1..6548386 100644 --- a/backend/models/Accounts.php +++ b/backend/models/Accounts.php @@ -62,6 +62,7 @@ class Accounts extends \yii\db\ActiveRecord { $date = \DateTime::createFromFormat("Y.m.d" , $this->dt); $this->dt = $date->getTimestamp(); + return true; } diff --git a/backend/views/accounts/_form.php b/backend/views/accounts/_form.php index d9b5c8f..0693050 100755 --- a/backend/views/accounts/_form.php +++ b/backend/views/accounts/_form.php @@ -9,17 +9,20 @@ use yii\helpers\ArrayHelper; /* @var $form yii\widgets\ActiveForm */ ?> -
+
- + +
Юридическое лицо
-
+
field($model, 'if_manager')->checkbox() ?> field($model, 'email')->textInput(['maxlength' => true]) ?> + field($model, 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?> + field($model, 'phones')->textInput(['maxlength' => true]) ?> field($model, 'pass')->passwordInput(['maxlength' => true]) ?> @@ -49,8 +52,7 @@ use yii\helpers\ArrayHelper; field($model, 'scode')->textInput() ?>
-
- field($model, 'is_firm')->textInput() ?> +
field($model, 'company')->textInput(['maxlength' => true]) ?> diff --git a/backend/views/accounts/index.php b/backend/views/accounts/index.php index 2aa005b..cabefab 100755 --- a/backend/views/accounts/index.php +++ b/backend/views/accounts/index.php @@ -64,6 +64,11 @@ $this->params['breadcrumbs'][] = $this->title; // 'company', ['class' => 'yii\grid\ActionColumn'], + + ], + 'pager' => [ + 'firstPageLabel' => '<<<', + 'lastPageLabel' => '>>>', ], ]); ?> diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index 439dd1e..a5d22e8 100755 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -9,7 +9,7 @@ use yii\helpers\Html; MyAsset::register($this); ?> beginPage() ?> - + diff --git a/backend/views/news/_form.php b/backend/views/news/_form.php index d053a2f..8dd5f64 100755 --- a/backend/views/news/_form.php +++ b/backend/views/news/_form.php @@ -77,9 +77,6 @@ use \yii\helpers\Url; field(new \backend\models\ImageSizerForm(), 'price_list')->widget(FileInput::classname(), [ 'name' => 'file', - 'options' => [ - ['accept' => 'image/*'] - ], 'pluginOptions' => [ 'initialPreview'=>[ Html::img($model->price_list, ['class'=>'file-preview-image']), diff --git a/backend/views/news/index.php b/backend/views/news/index.php index c4bc324..d735093 100755 --- a/backend/views/news/index.php +++ b/backend/views/news/index.php @@ -25,20 +25,24 @@ $this->params['breadcrumbs'][] = $this->title; 'columns' => [ ['class' => 'yii\grid\SerialColumn'], - 'id', + //'id', 'name', - 'code', - 'brief:ntext', - 'content:ntext', - // 'sort_delete', - // 'title', - // 'kwords', - // 'descr', - // 'dt', - // 'is_active', - // 'mail_send', - // 'mails_count', - // 'img', + //'code', + // 'brief:ntext', + //'content:ntext', + //'sort_delete', + //'title', + //'kwords', + //'descr', + + 'is_active', + //'mail_send', + 'mails_count', + [ + 'attribute' => 'dt', + 'value' => 'date' + ], + //'img', ['class' => 'yii\grid\ActionColumn'], ], diff --git a/backend/views/team/_form.php b/backend/views/team/_form.php index 3cb7cd2..da62658 100755 --- a/backend/views/team/_form.php +++ b/backend/views/team/_form.php @@ -2,7 +2,8 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; - +use \yii\helpers\ArrayHelper; +use \common\models\TeamGroup; /* @var $this yii\web\View */ /* @var $model common\models\Team */ /* @var $form yii\widgets\ActiveForm */ @@ -15,7 +16,7 @@ use yii\widgets\ActiveForm; field($model, 'email')->textInput(['maxlength' => true]) ?> field($model, 'group_id')->textInput() ?> - + field($model, 'group_id')->dropDownList(ArrayHelper::map(TeamGroup::find()->all(), 'id', 'name'), ['prompt' => 'Выберие группу']) ?> field($model, 'name')->textInput(['maxlength' => true]) ?> field($model, 'img')->textInput(['maxlength' => true]) ?> diff --git a/backend/views/team/index.php b/backend/views/team/index.php index d747c27..a55ff1f 100755 --- a/backend/views/team/index.php +++ b/backend/views/team/index.php @@ -27,7 +27,10 @@ $this->params['breadcrumbs'][] = $this->title; 'id', 'email:email', - 'group_id', + [ + 'attribute' => 'Группа', + 'value' => 'teamGroup.name' + ], 'name', 'img', // 'phone', diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php index f2dede2..58caad8 100755 --- a/backend/views/user/_form.php +++ b/backend/views/user/_form.php @@ -33,7 +33,15 @@ use yii\helpers\ArrayHelper; ], 'id', 'name')) ?> - $form, 'model'=> $model, 'field'=>'photo','width'=>200,'height'=>200,'multi'=>false, 'gallery' =>$model->photo]); ?> + $form, + 'model'=> $model, + 'field'=>'photo', + 'width'=>200, + 'height'=>200, + 'multi'=>false, + 'gallery' =>$model->photo + ]); ?> field($model, 'contacts')->textInput(['maxlength' => true]) ?> diff --git a/backend/web/css/AdminLTE.css b/backend/web/css/AdminLTE.css index 93e60d9..67e1e1c 100755 --- a/backend/web/css/AdminLTE.css +++ b/backend/web/css/AdminLTE.css @@ -13,6 +13,11 @@ html, body { min-height: 100%; + min-width: 100%; + +} +.row{ + margin: 0!important; } .layout-boxed html, .layout-boxed body { @@ -23,14 +28,13 @@ body { -moz-osx-font-smoothing: grayscale; font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 400; - overflow-x: hidden; overflow-y: auto; + position: absolute; } /* Layout */ .wrapper { min-height: 100%; position: relative; - overflow: hidden!important; } .wrapper:before, .wrapper:after { @@ -688,7 +692,7 @@ a:focus { transition: right 0.3s ease-in-out; } .control-sidebar { - position: absolute; + position: fixed; padding-top: 50px; z-index: 1010; } diff --git a/backend/web/css/site.css b/backend/web/css/site.css index dfc8b27..914729e 100755 --- a/backend/web/css/site.css +++ b/backend/web/css/site.css @@ -146,4 +146,37 @@ a.desc:after { .ui-tooltip{ display: none !important; +} + +#entity{ + display: none; +} + +.img-action-buttons{ + margin: 5px; +} + +.gallery_image{ + + position: relative; + margin-left: 20px; + margin-top: 20px; + display: inline-block; +} +.delete-gallery-item{ + background-color: #fff; + opacity: 0.5; + font-size: 20px; + position: absolute; + top: 5px; + right: 5px; + cursor: pointer; +} + +.delete-field-item{ + position: absolute; + top: 33%; + right: -35px; + font-size: 15px; + cursor: pointer; } \ No newline at end of file diff --git a/backend/web/js/script.js b/backend/web/js/script.js index e69de29..a4d6c5a 100755 --- a/backend/web/js/script.js +++ b/backend/web/js/script.js @@ -0,0 +1,28 @@ +$( document ).ready(function() { + $('.main_user_info').click(function(){ + if(!$(this).hasClass('active')){ + $('#accounts-is_firm').val('1'); + + $(this).removeClass('btn-default').addClass('active').addClass('btn-primary'); + $('#main_user_info').css('display','block'); + + $('.entity').removeClass('active').removeClass('btn-primary').addClass('btn-default'); + $('#entity').css('display','none'); + + + } + }); + + $('.entity').click(function(){ + if(!$(this).hasClass('active')){ + $('#accounts-is_firm').val('0'); + $(this).removeClass('btn-default').addClass('active').addClass('btn-primary'); + $('#entity').css('display','block'); + + $('.main_user_info').removeClass('active').removeClass('btn-primary').addClass('btn-default'); + $('#main_user_info').css('display','none'); + + + } + }); +}); \ No newline at end of file diff --git a/common/models/Accounts.php b/common/models/Accounts.php index 70dc2c5..773e593 100755 --- a/common/models/Accounts.php +++ b/common/models/Accounts.php @@ -3,7 +3,9 @@ namespace common\models; use Yii; - +use yii\web\IdentityInterface; +use yii\base\NotSupportedException; +use yii\db\ActiveRecord; /** * This is the model class for table "w_accounts". * @@ -45,12 +47,12 @@ use Yii; * @property string $firm_site * @property string $company */ -class Accounts extends \yii\db\ActiveRecord +class Accounts extends ActiveRecord implements IdentityInterface { public $re_pass; public $surname; - public $verifyCode; + public $country_region; /** * @inheritdoc @@ -63,8 +65,8 @@ class Accounts extends \yii\db\ActiveRecord public function beforeSave() { - $date = \DateTime::createFromFormat("Y.m.d" , $this->dt); - $this->dt = $date->getTimestamp(); + $this->dt = time(); + return true; } @@ -87,7 +89,6 @@ class Accounts extends \yii\db\ActiveRecord [['email'], 'unique'], [['email'], 'email'], ['re_pass', 'compare', 'compareAttribute' => 'pass'], - ['verifyCode', 'captcha'], ['dt', 'date', 'format' => 'Y.m.d'] ]; } @@ -134,6 +135,152 @@ class Accounts extends \yii\db\ActiveRecord 'firm_mfo' => 'МФО', 'firm_site' => 'Сайт', 'company' => 'Название фирмы', + 'country_region' => 'Регион' ]; } + + + /** + * Signs user up. + * + * @return User|null the saved model or null if saving fails + */ + public function signup() + { + + if ($this->validate()) { + $this->name = $this->surname.' '.$this->name; + + if( $this->is_firm ){ + $this->if_manager = '0'; + $this->margin_id = '1'; + $this->address = ''; + $this->comment = 'Новый пользователь'; + $this->rating = '0'; + $this->is_active = '1'; + $this->last_loginin = ''; + $this->firm_inn = ''; + $this->firm_bank =''; + $this->balance ='0.00'; + $this->office_id ='1'; + $this->is_scribe ='1'; + $this->set_manager_id ='0'; + $this->phones2=''; + $this->phones3 =''; + $this->snumb =''; + $this->firm_ur_adr =''; + $this->firm_fiz_adr = ''; + $this->firm_code_eg = ''; + $this->firm_rs = ''; + $this->firm_mfo = ''; + $this->firm_site = ''; + }else{ + + $this->if_manager = '0'; + $this->margin_id = '1'; + $this->address = ''; + $this->comment = 'Новый пользователь'; + $this->rating = '0'; + $this->is_active = '1'; + $this->last_loginin = ''; + $this->firm_inn = ''; + $this->firm_bank =''; + $this->balance ='0.00'; + $this->office_id ='1'; + $this->is_scribe ='1'; + $this->set_manager_id ='0'; + $this->phones2=''; + $this->phones3 =''; + $this->snumb =''; + $this->firm_ur_adr =''; + $this->firm_fiz_adr = ''; + $this->firm_code_eg = ''; + $this->firm_rs = ''; + $this->firm_mfo = ''; + $this->firm_site = ''; + } + + if ($this->save()) { + return $this; + } + } + + return null; + } + /** + * @inheritdoc + */ + public static function findIdentity($id) + { + return static::findOne(['id' => $id]); + } + + /** + * @inheritdoc + */ + public static function findIdentityByAccessToken($token, $type = null) + { + throw new NotSupportedException('"findIdentityByAccessToken" is not implemented.'); + } + + /** + * Finds user by username + * + * @param string $username + * @return static|null + */ + public static function findByUsername($username) + { + return static::findOne(['name' => $username]); + } + + /** + * @inheritdoc + */ + public function getId() + { + return $this->getPrimaryKey(); + } + + /** + * @inheritdoc + */ + public function getAuthKey() + { + return $this->auth_key; + } + + /** + * @inheritdoc + */ + public function validateAuthKey($authKey) + { + return $this->getAuthKey() === $authKey; + } + + + + /** + * Generates "remember me" authentication key + */ + public function generateAuthKey() + { + $this->auth_key = Yii::$app->security->generateRandomString(); + } + + /** + * Generates new password reset token + */ + public function generatePasswordResetToken() + { + $this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time(); + } + + /** + * Removes password reset token + */ + public function removePasswordResetToken() + { + $this->password_reset_token = null; + } } diff --git a/common/models/AccountsForm.php b/common/models/AccountsForm.php new file mode 100644 index 0000000..5627874 --- /dev/null +++ b/common/models/AccountsForm.php @@ -0,0 +1,139 @@ + 150], + [['pass','re_pass'], 'string', 'max' => 30], + [['phones', 'phones2', 'phones3'], 'string', 'max' => 50], + [['address', 'firm_inn', 'firm_bank'], 'string', 'max' => 254], + [['last_loginin'], 'string', 'max' => 15], + [['snumb', 'firm_ur_adr', 'firm_fiz_adr', 'firm_code_eg', 'firm_rs', 'firm_mfo', 'company'], 'string', 'max' => 255], + [['email'], 'unique'], + [['email'], 'email'], + ['re_pass', 'compare', 'compareAttribute' => 'pass'], + ['verifyCode', 'captcha'], + ['dt', 'date', 'format' => 'Y.m.d'] + ]; + } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'id' => 'ID', + 'if_manager' => 'Статус менеджера', + 'email' => 'E-mail (Логин)', + 'pass' => 'Пароль', + 'margin_id' => 'Тип цены', + 'name' => 'Имя', + 'phones' => 'Телефоны', + 'country' => Yii::t('app', 'Country'), + 'city' =>'Город', + 'address' => 'Адрес', + 'comment' => 'Комментарий', + 'rating' => Yii::t('app', 'Rating'), + 'dt' =>'Дата регистрации', + 'is_active' => 'Активный', + 'is_firm' => 'Юридическое лицо', + 'last_loginin' => Yii::t('app', 'Last Loginin'), + 'firm_inn' => 'ИНН', + 'firm_bank' => 'Банк', + 'balance' => Yii::t('app', 'Balance'), + 'office_id' => Yii::t('app', 'Office ID'), + 'is_scribe' => 'Подписка', + 'set_manager_id' => 'Персональный менеджер', + 'phones2' => 'Телефоны 2', + 'phones3' => 'Телефоны 3', + 'car' => Yii::t('app', 'Car'), + 'mod' => Yii::t('app', 'Mod'), + 'snumb' => 'snumb', + 'deliveries' => Yii::t('app', 'Deliveries'), + 'scode' => 'Код в 1С', + 'firm_ur_adr' => 'Юридический адрес', + 'firm_fiz_adr' => 'Физический адрес', + 'firm_code_eg' => 'Код ЭГ', + 'firm_rs' => 'Расчётный счёт', + 'firm_mfo' => 'МФО', + 'firm_site' => 'Сайт', + 'company' => 'Название фирмы', + 'country_region' => 'Регион' + ]; + } + + +} diff --git a/common/models/DicCities.php b/common/models/DicCities.php index 40814fc..291bad2 100755 --- a/common/models/DicCities.php +++ b/common/models/DicCities.php @@ -47,4 +47,8 @@ class DicCities extends \yii\db\ActiveRecord 'parent' => Yii::t('app', 'Parent'), ]; } + + public function getCitiesByRegion($region_id){ + return self::find()->where(['parent'=>$region_id])->all(); + } } diff --git a/common/models/Team.php b/common/models/Team.php index 0f0db23..ec58e3b 100755 --- a/common/models/Team.php +++ b/common/models/Team.php @@ -54,4 +54,9 @@ class Team extends \yii\db\ActiveRecord 'code' => 'Code', ]; } + + public function getTeamGroup() + { + return $this->hasOne(TeamGroup::className(), ['id' => 'group_id']); + } } diff --git a/common/models/TeamGroup.php b/common/models/TeamGroup.php index a33c8be..6de4959 100755 --- a/common/models/TeamGroup.php +++ b/common/models/TeamGroup.php @@ -41,4 +41,9 @@ class TeamGroup extends \yii\db\ActiveRecord 'name' => 'Name', ]; } + + public function getTeam() + { + return $this->hasMany(Team::className(), ['group_id' => 'id']); + } } diff --git a/frontend/assets/InternalAsset.php b/frontend/assets/InternalAsset.php index bb4f098..ea26dcb 100755 --- a/frontend/assets/InternalAsset.php +++ b/frontend/assets/InternalAsset.php @@ -31,6 +31,7 @@ class InternalAsset extends AssetBundle 'css/perfect-scrollbar/js/perfect-scrollbar.js', 'js/ital_auto.js', 'js/script.js', + 'js/main.js', 'js/selectize.js', 'js/select.js', 'js/validation/dist/jquery.validate.js', diff --git a/frontend/assets/OuterAsset.php b/frontend/assets/OuterAsset.php index 0f64340..fe3a735 100755 --- a/frontend/assets/OuterAsset.php +++ b/frontend/assets/OuterAsset.php @@ -29,6 +29,7 @@ class OuterAsset extends AssetBundle 'css/perfect-scrollbar/js/perfect-scrollbar.js', 'js/ital_auto.js', 'js/script.js', + 'js/main.js', 'js/selectize.js', 'js/select.js', 'js/validation/dist/jquery.validate.js' diff --git a/frontend/controllers/AjaxController.php b/frontend/controllers/AjaxController.php new file mode 100644 index 0000000..545144a --- /dev/null +++ b/frontend/controllers/AjaxController.php @@ -0,0 +1,35 @@ +getCitiesByRegion($region_id); + return $this->renderPartial('cities_list',[ + 'cities' => $cities + ]); + } + + public function actionGetRegistrationForm($form){ + return $this->renderPartial($form,[ + ]); + } + + +} \ No newline at end of file diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index e5cb52b..8923f4b 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -1,6 +1,10 @@ [ - 'class' => AccessControl::className(), - 'only' => ['logout', 'signup'], - 'rules' => [ - [ - 'actions' => ['signup'], - 'allow' => true, - 'roles' => ['?'], - ], - [ - 'actions' => ['logout'], - 'allow' => true, - 'roles' => ['@'], - ], - ], - ], - 'verbs' => [ - 'class' => VerbFilter::className(), - 'actions' => [ - 'logout' => ['post'], - ], - ], - ]; - } + // public $enableCsrfValidation = false; /** * @inheritdoc @@ -193,10 +168,10 @@ class SiteController extends Controller return $this->render('notepad'); } - public function actionOptovikam() + public function actionWholesalers() { $this->layout = '/internal'; - return $this->render('optovikam'); + return $this->render('wholesalers'); } public function actionOriginalCatalog() @@ -311,27 +286,18 @@ class SiteController extends Controller return $this->goHome(); } - /** - * Displays contact page. - * - * @return mixed - */ - public function actionContact() + + public function actionContacts() { - $model = new ContactForm(); - if ($model->load(Yii::$app->request->post()) && $model->validate()) { - if ($model->sendEmail(Yii::$app->params['adminEmail'])) { - Yii::$app->session->setFlash('success', 'Thank you for contacting us. We will respond to you as soon as possible.'); - } else { - Yii::$app->session->setFlash('error', 'There was an error sending email.'); - } + $this->layout = '/internal'; + return $this->render('contacts'); + } - return $this->refresh(); - } else { - return $this->render('contact', [ - 'model' => $model, - ]); - } + + public function actionPaymentDelivery() + { + $this->layout = '/internal'; + return $this->render('payment_delivery'); } /** @@ -341,8 +307,12 @@ class SiteController extends Controller */ public function actionAbout() { + $teamGroups = TeamGroup::find()->all(); + $this->layout = '/internal'; - return $this->render('about'); + return $this->render('about',[ + 'teamGroups' => $teamGroups, + ]); } /** @@ -352,9 +322,12 @@ class SiteController extends Controller */ public function actionSignup() { - $model = new SignupForm(); - if ($model->load(Yii::$app->request->post())) { + $model = new Accounts(); + + if ($model->load(Yii::$app->request->post(),'AccountsForm')) { + if ($user = $model->signup()) { + if (Yii::$app->getUser()->login($user)) { return $this->goHome(); } @@ -414,4 +387,5 @@ class SiteController extends Controller 'model' => $model, ]); } + } diff --git a/frontend/views/ajax/cities_list.php b/frontend/views/ajax/cities_list.php new file mode 100644 index 0000000..efebe43 --- /dev/null +++ b/frontend/views/ajax/cities_list.php @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/frontend/views/ajax/registration_for_company.php b/frontend/views/ajax/registration_for_company.php new file mode 100644 index 0000000..e632f53 --- /dev/null +++ b/frontend/views/ajax/registration_for_company.php @@ -0,0 +1,48 @@ + +
+ ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => 'site/signup']); ?> + field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'1'])->label(false) ?> + field(new AccountsForm(), 'company')->textInput(['maxlength' => 45,'placeholder'=>'Компания'])->label(false) ?> + field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?> + field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?> + field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?> + + field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?> + + field(new AccountsForm(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + + field(new AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + + field(new AccountsForm(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'), + ['prompt' => 'Выберите область'] + )->label(false); + ?> + + field(new AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + [], + ['prompt' => 'Выберите город'] + )->label(false); + ?> + + field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'), + ['prompt' => 'Выберите тип перевозки'] + )->label(false); + ?> + + field(new AccountsForm(), 'verifyCode')->widget(Captcha::className(), [ + 'options'=>['placeholder'=>'Введите код' ], + 'template' => '
{input}
{image}
', + ])->label(false); ?> + + + +
\ No newline at end of file diff --git a/frontend/views/ajax/registration_for_person.php b/frontend/views/ajax/registration_for_person.php new file mode 100644 index 0000000..616bb59 --- /dev/null +++ b/frontend/views/ajax/registration_for_person.php @@ -0,0 +1,48 @@ + +
+ ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => 'site/signup']); ?> + field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?> + field(new AccountsForm(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?> + field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?> + field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?> + field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?> + + field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?> + + field(new AccountsForm(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + + field(new AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + + field(new AccountsForm(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'), + ['prompt' => 'Выберите область'] + )->label(false); + ?> + + field(new AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + [], + ['prompt' => 'Выберите город'] + )->label(false); + ?> + + field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'), + ['prompt' => 'Выберите тип перевозки'] + )->label(false); + ?> + + field(new AccountsForm(), 'verifyCode')->widget(Captcha::className(), [ + 'options'=>['placeholder'=>'Введите код' ], + 'template' => '
{input}
{image}
', + ])->label(false); ?> + + + +
\ No newline at end of file diff --git a/frontend/views/cart/index.php b/frontend/views/cart/index.php index 41e5b15..a9538e6 100755 --- a/frontend/views/cart/index.php +++ b/frontend/views/cart/index.php @@ -5,7 +5,7 @@ $this->registerCssFile('/css/style/busket.css'); $this->title = 'Корзина'; $this->params['breadcrumbs'][] = $this->title; ?> -
+

Корзина

грн

diff --git a/frontend/views/cart/step.php b/frontend/views/cart/step.php index 5d45526..b3c8bdc 100755 --- a/frontend/views/cart/step.php +++ b/frontend/views/cart/step.php @@ -7,7 +7,7 @@ $this->params['breadcrumbs'][] = $this->title; ?> -
+

Корзина

diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index dd15053..c15e1cb 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -14,6 +14,7 @@ use \yii\widgets\Menu; use \yii\helpers\Url; use common\models\Callback; use \common\models\Accounts; +use \common\models\AccountsForm; use \yii\helpers\ArrayHelper; use \common\models\DicCities; use \common\models\Deliveries; @@ -41,10 +42,10 @@ use yii\captcha\Captcha; 'items' => [ ['label' => 'О компании', 'url'=>Url::toRoute('/site/about')], ['label' => 'Каталоги', 'url'=>'/page/FAQ'], - ['label' => 'Оптовикам','url'=>'/events/index'], - ['label' => 'Поставщикам','url'=>'/articles/index'], - ['label' => 'Оплата и доставка', 'url'=>Url::toRoute('/site/contact')], - ['label' => 'Контакты', 'url'=>Url::toRoute('/site/contact')], + ['label' => 'Оптовикам','url'=>'/site/wholesalers'], + ['label' => 'Поставщикам','url'=>'/site/provider'], + ['label' => 'Оплата и доставка', 'url'=>Url::toRoute('/site/payment-delivery')], + ['label' => 'Контакты', 'url'=>Url::toRoute('/site/contacts')], ], ]); ?> @@ -399,73 +400,43 @@ use yii\captcha\Captcha;
- ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => '/']); ?> - field(new Accounts(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?> - field(new Accounts(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?> + ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => 'site/signup']); ?> - field(new Accounts(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?> + field(new AccountsForm(), 'is_firm')->hiddenInput(['value'=>'0'])->label(false) ?> - field(new Accounts(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + field(new AccountsForm(), 'company')->hiddenInput(['value'=>'Частное лицо'])->label(false) ?> - field(new Accounts(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + field(new AccountsForm(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?> - field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( - ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'), - ['prompt' => 'Выберите область'] - )->label(false); - ?> - - field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( - [], - ['prompt' => 'Выберите город'] - )->label(false); - ?> - - field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( - ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'), - ['prompt' => 'Выберите тип перевозки'] - )->label(false); - ?> + field(new AccountsForm(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?> - field(new Accounts(), 'verifyCode')->widget(Captcha::className(), [ - 'options'=>['placeholder'=>'Введите код' ], - 'template' => '
{input}
{image}
', - ])->label(false); ?> + field(new AccountsForm(), 'phones')->textInput(['maxlength' => 45,'placeholder'=>'Телефон'])->label(false) ?> - - -
-
- ['enctype'=> 'multipart/form-data'], 'method'=>'post','action' => '/']); ?> - field(new Accounts(), 'company')->textInput(['maxlength' => 45,'placeholder'=>'Компания'])->label(false) ?> - field(new Accounts(), 'name')->textInput(['maxlength' => 45,'placeholder'=>'Имя'])->label(false) ?> - field(new Accounts(), 'surname')->textInput(['maxlength' => 45,'placeholder'=>'Фамилия'])->label(false) ?> + field(new AccountsForm(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?> - field(new Accounts(), 'email')->textInput(['maxlength' => 45,'placeholder'=>'E-mail','class'=>'form-control telephone_registration'])->label(false) ?> + field(new AccountsForm(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> - field(new Accounts(), 'pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> + field(new AccountsForm(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> - field(new Accounts(), 're_pass')->passwordInput(['maxlength' => 45,'placeholder'=>'Пароль','class'=>'form-control telephone_registration'])->label(false) ?> - - field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + field(new AccountsForm(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( ArrayHelper::map(DicCities::find()->where(['parent' => 0])->all(), 'id', 'name'), ['prompt' => 'Выберите область'] )->label(false); ?> - field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + field(new AccountsForm(), 'city',['options'=>['class'=>'selectize_item2' ]])->dropDownList( [], ['prompt' => 'Выберите город'] )->label(false); ?> - field(new Accounts(), 'country',['options'=>['class'=>'selectize_item2' ]])->dropDownList( + field(new AccountsForm(), 'deliveries',['options'=>['class'=>'selectize_item2' ]])->dropDownList( ArrayHelper::map(Deliveries::find()->all(), 'id', 'name'), ['prompt' => 'Выберите тип перевозки'] )->label(false); ?> - field(new Accounts(), 'verifyCode')->widget(Captcha::className(), [ + field(new AccountsForm(), 'verifyCode')->widget(Captcha::className(), [ 'options'=>['placeholder'=>'Введите код' ], 'template' => '
{input}
{image}
', ])->label(false); ?> @@ -473,6 +444,7 @@ use yii\captcha\Captcha;
+
diff --git a/frontend/views/news/index.php b/frontend/views/news/index.php index b46ac72..f1ce557 100755 --- a/frontend/views/news/index.php +++ b/frontend/views/news/index.php @@ -18,7 +18,7 @@ $this->params['breadcrumbs'][] = $this->title; -
+

Новости

title = $model->name; $this->params['breadcrumbs'][] = ['label' => 'Новости', 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; ?> -
+

name ?>

-
-
- -
- content ?> -
- - Скачать список товаров -
-
-
- -
-

Приход товара Mecarm

-

На склад поступила очередная партия товара MecArm

-
- - -
-

Приход товара Mecarm

-

На склад поступила очередная партия товара MecArm

-
- -
-
- + +
+ +
+ content ?> +
+ + Скачать список товаров +
+
+
+ +
+

Приход товара Mecarm

+

На склад поступила очередная партия товара MecArm

+
+ + +
+

Приход товара Mecarm

+

На склад поступила очередная партия товара MecArm

+
+ +
+
+ +
diff --git a/frontend/views/site/about.php b/frontend/views/site/about.php index 4130dfe..9d24980 100755 --- a/frontend/views/site/about.php +++ b/frontend/views/site/about.php @@ -1,7 +1,4 @@ registerCssFile('/css/about_company.css'); $this->title = "О компании"; @@ -9,7 +6,7 @@ $this->params['breadcrumbs'][] = $this->title; ?> -
+

О компании

    @@ -27,197 +24,16 @@ $this->params['breadcrumbs'][] = $this->title;

- - - - - - - - - - - - - - - - - - - - -
Руководитель
Олег Бершадский
oleg@italauto.com.ua
044-593-9051 доб.4201
oleg-italauto
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Продажи
Александр ВасильевПавел ОвчаренкоАлексей Чельцов
oleg@italauto.com.uaoleg@italauto.com.uaoleg@italauto.com.ua
044-593-9051 доб.4201044-593-9051 доб.4201044-593-9051 доб.4201
oleg-italautooleg-italautooleg-italauto
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Учет
Нина НосевичТатьяна Михайленко
oleg@italauto.com.uaoleg@italauto.com.ua
044-593-9051 доб.4201044-593-9051 доб.4201
oleg-italautooleg-italauto
- - - - - - - - - - - - - - - - - - - - - -
Склад
Александр БуглакАндрей Гаврилюк
044-593-9051 доб.4201044-593-9051 доб.4201
- - - - - - - - - - - - - - - - - - - - -
Транспорт
Роман Ковтун
oleg@italauto.com.ua
044-593-9051 доб.4201
oleg-italauto
- - - - - - - - - - - - - - - - - - - - -
IT
Сергей Калиниченко
oleg@italauto.com.ua
044-593-9051 доб.4201
oleg-italauto
-
-
-
-

Контакты


-

г.Киев ул.Изюмская 5



-
- -

050-0400-192


- -

097-0400-192


- -

093-0400-192


-
- - обратный звонок -
-
-

График работы


-

Пн - Пт – с 9:00 до 18:00 (без перерыва)
- Сб - с 9:00 до 15:00
- Вс – выходной день

-
-
-

Обратная связь


- - kiev@italauto.com.ua
- - retror0107 - - -
- -
-
-

Реквизиты для оплаты через "Приват Банк" на СПД Бершадский О. В.
- -ЄДРПОУ: 2690914236
- -Р/р: 26000060840517
- -Банк: ПАТ КБ "Приватбанк"
- -МФО: 300711

+ + render('team_list_layout', [ + 'group' => $group + ]);?> +
+ render('contacts_layout', [ + ]);?> + render('payment_delivery_layout', [ + ]);?>
diff --git a/frontend/views/site/contacts.php b/frontend/views/site/contacts.php new file mode 100644 index 0000000..3e67547 --- /dev/null +++ b/frontend/views/site/contacts.php @@ -0,0 +1,11 @@ +registerCssFile('/css/about_company.css'); + +$this->title = "Контакты"; +$this->params['breadcrumbs'][] = $this->title; +?> + +
+ render('contacts_layout', [ + ]);?> +
diff --git a/frontend/views/site/contacts_layout.php b/frontend/views/site/contacts_layout.php new file mode 100644 index 0000000..a883d15 --- /dev/null +++ b/frontend/views/site/contacts_layout.php @@ -0,0 +1,34 @@ +
+
+

Контакты


+

г.Киев ул.Изюмская 5



+
+ +

050-0400-192


+ +

097-0400-192


+ +

093-0400-192


+
+ + обратный звонок +
+
+

График работы


+

Пн - Пт – с 9:00 до 18:00 (без перерыва)
+ Сб - с 9:00 до 15:00
+ Вс – выходной день

+
+
+

Обратная связь


+ + kiev@italauto.com.ua
+ + retror0107 + + +
+
+ +
+
diff --git a/frontend/views/site/optovikam.php b/frontend/views/site/optovikam.php deleted file mode 100755 index 68783b7..0000000 --- a/frontend/views/site/optovikam.php +++ /dev/null @@ -1,131 +0,0 @@ -registerCssFile('/css/style/optovikam.css'); - -$this->params['breadcrumbs'][] = $this->title; -?> - -
- Италавто - - Оптовикам -

Оптовикам

-
-
-

Приглашаем к сотрудничеству СТО, магазины и торгующие организации

- -
-

Общие положения сотрудничества:

-
    -
  • Работа с Оптовиками ведется на основании Договора. Регистрация на сайте в качестве Оптовика и заказ товара означают согласие с положениями данного Договора.
    • -
  • Уровень цен и скидок определяется руководством на основании договоренностей с Оптовиком.
    • -
  • Ответственность за применяемость заказанного товара к автомобилю клиента несет Оптовик. В случае необходимости и возможности мы готовы предоставить консультации по подбору товара.
    • -
-
- -
-

Возврат товара

-
    -
  • Возврат “складского” товара возможен на протяжении 14 дней (включая время на пересылку товара). Товар, привезенный “под клиента” возврату не подлежит.
    • -
  • Доставка товара осуществляется за счет Оптовика.
    • -
  • Товар принимается в неповрежденной упаковке. Надписи, скотч и т.д. должны отсутствовать.
    • -
  • Товар со следами установки возврату не подлежит.
    • -
  • Cтоимость возвращенного товара учитывается для оплаты следующих заказов.
    • -
-
- -
-

Гарантия

-
    -
  • Оригинальные запчасти поставляются без гарантии. Претензии принимаются только по комплектности товара.
    • -
  • Гарантия на запчасти производителя Aftermaket (кроме электрических деталей) составляет 14 дней с момента получения товара Оптовиком. Перечень документов, необходимых для предъявления гарантийного случая здесь.
    • -
-
- -
-

Доставка товара

-
    -
  • Киевляне – самовывоз со склада Поставщика.
    • -
  • Регионы – отправка транспортными компаниями (Автолюкс, Гюнсел, Новая Почта).
    • -
-
-
- -
-
-

Наши проекты

- - 1/ - 5 - -
- - - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на Land Rover
    и Range Rover

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на
    Mercedes Benz

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на FIAT

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на Land Rover
    и Range Rover

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- -
- -
-
diff --git a/frontend/views/site/payment_delivery.php b/frontend/views/site/payment_delivery.php new file mode 100644 index 0000000..47a6627 --- /dev/null +++ b/frontend/views/site/payment_delivery.php @@ -0,0 +1,12 @@ +registerCssFile('/css/about_company.css'); + +$this->title = "Оплата и доставка"; +$this->params['breadcrumbs'][] = $this->title; +?> + +
+

Оплата и доставка

+ render('payment_delivery_layout', [ + ]);?> +
diff --git a/frontend/views/site/payment_delivery_layout.php b/frontend/views/site/payment_delivery_layout.php new file mode 100644 index 0000000..1433f89 --- /dev/null +++ b/frontend/views/site/payment_delivery_layout.php @@ -0,0 +1,11 @@ +
+

Реквизиты для оплаты через "Приват Банк" на СПД Бершадский О. В.
+ + ЄДРПОУ: 2690914236
+ + Р/р: 26000060840517
+ + Банк: ПАТ КБ "Приватбанк"
+ + МФО: 300711

+
\ No newline at end of file diff --git a/frontend/views/site/provider.php b/frontend/views/site/provider.php index 7e653f5..01fabeb 100755 --- a/frontend/views/site/provider.php +++ b/frontend/views/site/provider.php @@ -1,7 +1,7 @@ registerCssFile('/css/style/optovikam.css'); - +$this->title = "Поставщикам"; $this->params['breadcrumbs'][] = $this->title; ?> @@ -9,12 +9,10 @@ $this->params['breadcrumbs'][] = $this->title; -
- Италавто - - Поставщикам +
+

Поставщикам

-
+

Приглашаем к сотрудничеству поставщиков товара.

@@ -64,83 +62,4 @@ $this->params['breadcrumbs'][] = $this->title;
- -
-
-

Наши проекты

- - 1/ - 5 - -
- - - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на Land Rover
    и Range Rover

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на
    Mercedes Benz

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на FIAT

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- - - - -
- -
- lr.italauto.com.ua -
-
    -

    Запчасти на Land Rover
    и Range Rover

    -
  • Оригинальные запчасти
    • -
  • Сертифицированый продавец
    • -
  • Более 300 000 товаров
    • -
-
- -
- -
-
- +
diff --git a/frontend/views/site/team_list_layout.php b/frontend/views/site/team_list_layout.php new file mode 100644 index 0000000..d17b5e2 --- /dev/null +++ b/frontend/views/site/team_list_layout.php @@ -0,0 +1,37 @@ + + + + + + team as $team):?> + + + + + team as $team):?> + + + + + team as $team):?> + email):?> + + + + + + team as $team):?> + phone):?> + + + + + + team as $team):?> + skype):?> + + + + + +
name ?>
name ?>
email ?>
phone ?>
skype ?>
\ No newline at end of file diff --git a/frontend/views/site/wholesalers.php b/frontend/views/site/wholesalers.php new file mode 100755 index 0000000..129c652 --- /dev/null +++ b/frontend/views/site/wholesalers.php @@ -0,0 +1,52 @@ +registerCssFile('/css/style/optovikam.css'); +$this->title = "Оптовикам"; +$this->params['breadcrumbs'][] = $this->title; +?> + +
+ +

Оптовикам

+ +
+

Приглашаем к сотрудничеству СТО, магазины и торгующие организации

+ +
+

Общие положения сотрудничества:

+
    +
  • Работа с Оптовиками ведется на основании Договора. Регистрация на сайте в качестве Оптовика и заказ товара означают согласие с положениями данного Договора.
    • +
  • Уровень цен и скидок определяется руководством на основании договоренностей с Оптовиком.
    • +
  • Ответственность за применяемость заказанного товара к автомобилю клиента несет Оптовик. В случае необходимости и возможности мы готовы предоставить консультации по подбору товара.
    • +
+
+ +
+

Возврат товара

+
    +
  • Возврат “складского” товара возможен на протяжении 14 дней (включая время на пересылку товара). Товар, привезенный “под клиента” возврату не подлежит.
    • +
  • Доставка товара осуществляется за счет Оптовика.
    • +
  • Товар принимается в неповрежденной упаковке. Надписи, скотч и т.д. должны отсутствовать.
    • +
  • Товар со следами установки возврату не подлежит.
    • +
  • Cтоимость возвращенного товара учитывается для оплаты следующих заказов.
    • +
+
+ +
+

Гарантия

+
    +
  • Оригинальные запчасти поставляются без гарантии. Претензии принимаются только по комплектности товара.
    • +
  • Гарантия на запчасти производителя Aftermaket (кроме электрических деталей) составляет 14 дней с момента получения товара Оптовиком. Перечень документов, необходимых для предъявления гарантийного случая здесь.
    • +
+
+ +
+

Доставка товара

+
    +
  • Киевляне – самовывоз со склада Поставщика.
    • +
  • Регионы – отправка транспортными компаниями (Автолюкс, Гюнсел, Новая Почта).
    • +
+
+
+ +
\ No newline at end of file diff --git a/frontend/web/css/BC2_catalog.css b/frontend/web/css/BC2_catalog.css index a478375..ece0351 100755 --- a/frontend/web/css/BC2_catalog.css +++ b/frontend/web/css/BC2_catalog.css @@ -33,10 +33,7 @@ display: inline-block; margin-left: 15px; } -.vin{ - width: 960px; - margin: 40px auto 12px; -} + #stone-filter-form ul{ list-style-type: none; diff --git a/frontend/web/css/BC2_catalog_zapchasti.css b/frontend/web/css/BC2_catalog_zapchasti.css index cc4a016..d3e89b1 100755 --- a/frontend/web/css/BC2_catalog_zapchasti.css +++ b/frontend/web/css/BC2_catalog_zapchasti.css @@ -3,23 +3,11 @@ color: #828282; } -.vin_article{ - font-size:22px; - font-weight: 400; - margin-top:17px; - font-weight: 500; -} - .navigation{ color: #6b84b5; text-decoration: underline; } -.vin{ - width: 960px!important; - margin: 34px auto; -} - .detail{ margin-top: -10px; width: 460px; diff --git a/frontend/web/css/about_company.css b/frontend/web/css/about_company.css index 585ad47..1a58212 100755 --- a/frontend/web/css/about_company.css +++ b/frontend/web/css/about_company.css @@ -1,26 +1,9 @@ -.vin{ - width:960px; - margin:0 auto; -} - .navigation { color: #6b84b5; text-decoration: underline; } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; -} -.vin_article { - border-bottom:1px solid #dfdfdf; - padding-bottom: 4px; - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .side_menu{ diff --git a/frontend/web/css/catalog_marok.css b/frontend/web/css/catalog_marok.css index 3fe4334..fe9ac43 100755 --- a/frontend/web/css/catalog_marok.css +++ b/frontend/web/css/catalog_marok.css @@ -1,9 +1,4 @@ -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; -} + .vin_body { padding-bottom: 31px; @@ -30,11 +25,6 @@ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_catalog{ width: 960px; diff --git a/frontend/web/css/general_styles.css b/frontend/web/css/general_styles.css index 517fb21..18dec06 100755 --- a/frontend/web/css/general_styles.css +++ b/frontend/web/css/general_styles.css @@ -730,29 +730,6 @@ cursor: pointer; } -.registration_holder{ - padding-top: 32px; - width: 432px; - height: auto; - border: 1px solid #c7c7c7; - border-radius: 0 0 12px 12px; - margin-bottom: 30px; - margin-top: -4px; -} -.modal-content1 { - position: relative; - background-color: #fff; - -webkit-background-clip: padding-box; - background-clip: padding-box; - border: 1px solid #999; - border: 1px solid rgba(0,0,0,.2); - outline: 0; - -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); - box-shadow: 0 3px 9px rgba(0,0,0,.5); - border-bottom: 3px solid #dfdfdf!important; - -} - .first_block a:nth-child(12):hover { color: #8ca1c8; @@ -779,9 +756,6 @@ margin-right: 5px } -.registration_for_company{ - display: none; -} .registration_for_company a{ float:right; color: #6b84b5; @@ -2248,8 +2222,6 @@ left: -444px; -.vin_article{ -} .number_of{ diff --git a/frontend/web/css/main.css b/frontend/web/css/main.css index 08a72e5..e84bbbb 100755 --- a/frontend/web/css/main.css +++ b/frontend/web/css/main.css @@ -142,4 +142,43 @@ li a{ margin-bottom: 10px; } -div.required:after {content: " *"; color: #fec831;} \ No newline at end of file +div.required:after {content: " *"; color: #fec831;} + +.registration_holder{ + padding-top: 32px; + width: 432px; + border: 1px solid #c7c7c7; + border-radius: 0 0 12px 12px; + margin-bottom: 30px; + margin-top: -4px; +} +.modal-content1 { + position: relative; + background-color: #fff; + -webkit-background-clip: padding-box; + background-clip: padding-box; + border: 1px solid #999; + + outline: 0; + -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5); + box-shadow: 0 3px 9px rgba(0,0,0,.5); + border-bottom: 3px solid #dfdfdf !important; + +} +.vin_article{ + font-size: 22px; + font-weight: 500; + margin-top: 22px; + border-bottom: 1px solid #dfdfdf; + padding-bottom: 4px; +} +.main-vin{ + width: 960px; + border-bottom: 1px solid #dfdfdf; + margin: 20px auto; +} + +.vin{ + width: 960px; + margin: 20px auto; +} \ No newline at end of file diff --git a/frontend/web/css/news_all.css b/frontend/web/css/news_all.css index e3d8a21..008ad1e 100755 --- a/frontend/web/css/news_all.css +++ b/frontend/web/css/news_all.css @@ -2,14 +2,6 @@ p, a, label, span{ font-family: "Ubuntu" } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} - .navigation:hover { color: #879cc3; } @@ -27,11 +19,6 @@ p, a, label, span{ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_tovar{ width: 960px; diff --git a/frontend/web/css/not_found.css b/frontend/web/css/not_found.css index 1ae63ca..421daba 100755 --- a/frontend/web/css/not_found.css +++ b/frontend/web/css/not_found.css @@ -2,13 +2,6 @@ padding-bottom: 1px; } -.vin{ - padding-bottom: 38px; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; -} - .vin img{ margin-bottom: 1px; } @@ -17,12 +10,7 @@ text-decoration: underline; } -.vin_article{ - font-size: 22px; - font-weight: 500; - margin-top: 22px; - border-bottom: 1px solid #dfdfdf; -} + .line{ margin-bottom: 12px; } diff --git a/frontend/web/css/original_catalog.css b/frontend/web/css/original_catalog.css index 7f52a99..868c72b 100755 --- a/frontend/web/css/original_catalog.css +++ b/frontend/web/css/original_catalog.css @@ -1,10 +1,3 @@ -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; -} - .navigation { color: #6b84b5; text-decoration: underline; @@ -14,11 +7,6 @@ margin-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_catalog{ width: 960px; diff --git a/frontend/web/css/search_filters.css b/frontend/web/css/search_filters.css index d32d190..d28dcce 100755 --- a/frontend/web/css/search_filters.css +++ b/frontend/web/css/search_filters.css @@ -68,7 +68,6 @@ .choose_tovar{ margin-top: 30px; - border-bottom: 1px solid #6b84b5; padding-bottom:21px; } @@ -297,7 +296,6 @@ table.trackbar .r div { table.trackbar { width: 250px; margin: 10px 43px; - background: repeat-x url() top left; } diff --git a/frontend/web/css/search_page.css b/frontend/web/css/search_page.css index 67a33b5..b8628ea 100755 --- a/frontend/web/css/search_page.css +++ b/frontend/web/css/search_page.css @@ -2,12 +2,6 @@ padding-bottom: 1px; } -.vin{ - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; -} - .vin1{ width: 960px; margin: 34px auto; @@ -22,11 +16,6 @@ text-decoration: underline; } -.vin_article{ - font-size:22px; - font-weight: 500; - margin-top:22px; -} .line{ margin-bottom: 12px; } diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 74a536d..e42cb8e 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -1419,15 +1419,6 @@ input{ cursor: pointer; } -.registration_holder{ - padding-top: 32px; - width: 432px; - height: auto; - border: 1px solid #c7c7c7; - border-radius: 0 0 12px 12px; - margin-bottom: 30px; - margin-top: -4px; -} #modal_form_registration #code_input{ @@ -1449,19 +1440,13 @@ input{ margin-right: 5px } -.registration_for_company{ - display: none; -} .registration_for_company a{ float:right; color: #6b84b5; margin-right: 5px } -.registration_holder p{ - margin: 41px 0 0 51px; - font-size: 18px; -} + .code_generate{ float: right; margin: -55px 82px; diff --git a/frontend/web/css/style/404.css b/frontend/web/css/style/404.css index 5ea9f8e..e900e46 100755 --- a/frontend/web/css/style/404.css +++ b/frontend/web/css/style/404.css @@ -2,14 +2,6 @@ p, a, label, span{ font-family: "Ubuntu" } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} - .navigation:hover { color: #879cc3; } @@ -27,12 +19,6 @@ p, a, label, span{ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} - .choose_tovar{ width: 920px; margin: 121px auto 0; diff --git a/frontend/web/css/style/brands.css b/frontend/web/css/style/brands.css index 9195256..9b059bc 100755 --- a/frontend/web/css/style/brands.css +++ b/frontend/web/css/style/brands.css @@ -2,14 +2,6 @@ p, a, label, span{ font-family: "Ubuntu" } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - - -} - .navigation:hover { color: #879cc3; } @@ -27,13 +19,6 @@ p, a, label, span{ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; - border-bottom:1px solid #dfdfdf; - padding-bottom: 4px; -} .choose_tovar{ width: 960px; diff --git a/frontend/web/css/style/busket.css b/frontend/web/css/style/busket.css index 9f14d6b..87811ad 100755 --- a/frontend/web/css/style/busket.css +++ b/frontend/web/css/style/busket.css @@ -2,14 +2,6 @@ p, a, label, span{ font-family: "Ubuntu" } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} - .navigation:hover { color: #879cc3; } @@ -27,11 +19,6 @@ p, a, label, span{ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_tovar{ width: 960px; diff --git a/frontend/web/css/style/my_profile.css b/frontend/web/css/style/my_profile.css index ae9f494..b4fea93 100755 --- a/frontend/web/css/style/my_profile.css +++ b/frontend/web/css/style/my_profile.css @@ -135,7 +135,6 @@ .choose_tovar{ width: 750px!important; - border-bottom: none!important; margin-left:-36px; } #notepad .tab-content_header{ @@ -219,11 +218,6 @@ cursor: pointer; margin-right:69px; } -.vin{ - border-bottom: none!important; -} - - .search_input { background-color: #7b91bd; width: 286px; diff --git a/frontend/web/css/style/news_all.css b/frontend/web/css/style/news_all.css index 1e79046..2083918 100755 --- a/frontend/web/css/style/news_all.css +++ b/frontend/web/css/style/news_all.css @@ -2,13 +2,6 @@ p, a, label, span{ font-family: "Ubuntu" } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} .navigation:hover { color: #879cc3; @@ -27,11 +20,6 @@ p, a, label, span{ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_tovar{ width: 960px; diff --git a/frontend/web/css/style/notepad.css b/frontend/web/css/style/notepad.css index f82200a..2f96870 100755 --- a/frontend/web/css/style/notepad.css +++ b/frontend/web/css/style/notepad.css @@ -1,10 +1,3 @@ -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} .navigation:hover { color: #879cc3; @@ -23,16 +16,11 @@ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} + .choose_tovar{ width: 960px; margin: 20px auto; - border-bottom:1px solid #dfdfdf; padding-bottom: 32px; } diff --git a/frontend/web/css/style/optovikam.css b/frontend/web/css/style/optovikam.css index a58f337..e9bf6bc 100755 --- a/frontend/web/css/style/optovikam.css +++ b/frontend/web/css/style/optovikam.css @@ -1,10 +1,3 @@ -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} .navigation:hover { color: #879cc3; @@ -23,16 +16,10 @@ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_tovar{ width: 960px; margin: 20px auto; - border-bottom:1px solid #dfdfdf; } .choose_tovar-list{ margin-bottom: 27px; diff --git a/frontend/web/css/style/thanks.css b/frontend/web/css/style/thanks.css index cf58e2c..328f834 100755 --- a/frontend/web/css/style/thanks.css +++ b/frontend/web/css/style/thanks.css @@ -2,14 +2,6 @@ p, a, label, span{ font-family: "Ubuntu" } -.vin { - margin-bottom: 19px!important; - width: 960px; - margin: 34px auto; - border-bottom: 1px solid #dfdfdf; - -} - .navigation:hover { color: #879cc3; } @@ -27,11 +19,6 @@ p, a, label, span{ padding-bottom: 1px; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .choose_tovar{ width: 920px; diff --git a/frontend/web/css/style_vin.css b/frontend/web/css/style_vin.css index cbf15b9..2a16de7 100755 --- a/frontend/web/css/style_vin.css +++ b/frontend/web/css/style_vin.css @@ -1,9 +1,4 @@ -.vin{ - width: 960px; - margin: 34px auto; -} - .vin img{ margin-bottom: 1px; } @@ -12,11 +7,6 @@ text-decoration: underline; } -.vin_article { - font-size: 22px; - font-weight: 500; - margin-top: 22px; -} .line{ margin-bottom: 12px; } diff --git a/frontend/web/js/main.js b/frontend/web/js/main.js new file mode 100644 index 0000000..8a14e6e --- /dev/null +++ b/frontend/web/js/main.js @@ -0,0 +1,38 @@ +/** + * Created by vitaliy on 23.11.15. + */ +$(document).ready(function(){ + $('#accountsform-country').change(function(){ + var region_id = $(this).val(); + if(region_id){ + $.get( "/ajax/get-city", {region_id:region_id}, function( data ) { + var $input = $('#accountsform-city'); + $input.empty(); + $input.append(data); + }); + } + }); + + $('#company').click(function(){ + + $(this).addClass('active_button'); + $('#person').removeClass('active_button'); + + $('#accountsform-company').attr('type', 'text').attr('placeholder', 'Компания').val(''); + $('.field-accountsform-company').css('display','block'); + $('#accountsform-is_firm').val('1'); + + }); + + $('#person').click(function(){ + $('#company').removeClass('active_button'); + $(this).addClass('active_button'); + + $('.field-accountsform-company').css('display','none'); + $('#accountsform-company').attr('type', 'hidden').val('Частное лицо'); + $('#accountsform-is_firm').val('0'); + + + }); + +}); \ No newline at end of file diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index ba1e5c4..1af8d8a 100755 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -271,21 +271,7 @@ $('.phone_control, .phone_placeholder').click( $('.input1').css({display:'block'}); $(this).css({display:'none'}); }); - $('#company').click(function(){ - $('.registration_for_person').css({display:'none'}); - $('.registration_for_company').fadeIn(200).css({display:'block'}); - $(this).addClass('active_button'); - $('#person').removeClass('active_button'); - - }); - $('#person').click(function(){ - $('#company').removeClass('active_button'); - $('.registration_for_company').css({display:'none'}); - $('.registration_for_person').fadeIn(200).css({display:'block'}); - $(this).addClass('active_button'); - - - }); + @@ -813,11 +799,7 @@ $(document).ready(function(){ $('.menu_search_down').animate({height:'400px'}, 600, function(){}) }); -}); - - -$(document).ready(function(){ $('html,body').click(function(){ $('.phone_placeholder').removeClass('active_placeholder'); $('.status').css({display:'none'}) @@ -828,35 +810,30 @@ $(document).ready(function(){ // Do something }); - $( ".statusp" ).click(function( event ) { - event.stopPropagation(); - // Do something - }); -}); - $(document).ready(function () { - $('input,textarea').focus(function(){ - $(this).data('placeholder',$(this).attr('placeholder')) - $(this).attr('placeholder',''); - }); - $('input,textarea').blur(function(){ - $(this).attr('placeholder',$(this).data('placeholder')); - }); + $('input,textarea').focus(function(){ + $(this).data('placeholder',$(this).attr('placeholder')) + $(this).attr('placeholder',''); + }); + $('input,textarea').blur(function(){ + $(this).attr('placeholder',$(this).data('placeholder')); + }); - $('.own_page3').click(function(){ - $('#modal_form').css({'opacity': '0', - 'top': '45%', - 'display': 'none'}); - $('#overlay').css({display:'none'}) - }); - $("#get_user_number").click(function(){ - var inputdata = $("#get_telephone").val(); - if(inputdata != ''){ - $(".telephone_registration").val(inputdata);; - } -}); + $('.own_page3').click(function(){ + $('#modal_form').css({'opacity': '0', + 'top': '45%', + 'display': 'none'}); + $('#overlay').css({display:'none'}) + }); + + $("#get_user_number").click(function(){ + var inputdata = $("#get_telephone").val(); + if(inputdata != ''){ + $(".telephone_registration").val(inputdata);; + } + }); $('#go_project').click(function(){ @@ -874,13 +851,11 @@ $(document).ready(function(){ // $('.menu_block_center1 .menu_search_down .input_search').find('input').css({display:'none'}) // }); -}); - -$(document).ready(function(){ $('#footer_third').find('a').attr('rel','external'); - $('.statusp').click(function(){ + $('.statusp').click(function(event){ + event.stopPropagation(); if( $(".status").css('display') == 'none'){ $('.status').css({display:'block'}); } diff --git a/storage/c24c6caa693896710ec7a0934a911214/200x200.png b/storage/c24c6caa693896710ec7a0934a911214/200x200.png index e55d368..cb4a5ac 100755 Binary files a/storage/c24c6caa693896710ec7a0934a911214/200x200.png and b/storage/c24c6caa693896710ec7a0934a911214/200x200.png differ diff --git a/storage/dbd5c1a08753ca919151c7ac628e7df3/200x200.png b/storage/dbd5c1a08753ca919151c7ac628e7df3/200x200.png deleted file mode 100755 index 7029285..0000000 Binary files a/storage/dbd5c1a08753ca919151c7ac628e7df3/200x200.png and /dev/null differ diff --git a/storage/dbd5c1a08753ca919151c7ac628e7df3/x.png b/storage/dbd5c1a08753ca919151c7ac628e7df3/x.png deleted file mode 100755 index 7029285..0000000 Binary files a/storage/dbd5c1a08753ca919151c7ac628e7df3/x.png and /dev/null differ -- libgit2 0.21.4