diff --git a/css/style.css b/css/style.css index 4c484f6..9a745a1 100644 --- a/css/style.css +++ b/css/style.css @@ -2564,4 +2564,20 @@ hr.inline{ .send_sto_form .error{ color: red; font-weight: normal; +} + + +#select-filter-form .col3{ + position: relative; +} +.active-select{ + font-size: 15px; + font-weight: bold; + color: #b2adb2; + height: 15px; + width: 15px; + position: absolute; + top: 5px; + right: 17px; + cursor: pointer; } \ No newline at end of file diff --git a/protected/controllers/AjaxStoFilterController.php b/protected/controllers/AjaxStoFilterController.php index 866d5fa..62b3770 100644 --- a/protected/controllers/AjaxStoFilterController.php +++ b/protected/controllers/AjaxStoFilterController.php @@ -14,7 +14,9 @@ class AjaxStoFilterController extends Controller public function actionFilter(){ - if(!empty(Yii::app()->request->getParam('StoFilter'))){ + $post = Yii::app()->request->getParam('StoFilter'); + + if(!empty($post)){ $form = new StoFilter(); @@ -25,7 +27,10 @@ class AjaxStoFilterController extends Controller $filter['transmission'] = $form->searchFilter('transmission'); $filter['fuel_type'] = $form->searchFilter('fuel_type'); - if(!empty( Yii::app()->request->getParam('StoFilter')['model']) && !empty( Yii::app()->request->getParam('StoFilter')['engine']) && !empty( Yii::app()->request->getParam('StoFilter')['drive_unit']) && !empty( Yii::app()->request->getParam('StoFilter')['transmission'])&& !empty( Yii::app()->request->getParam('StoFilter')['fuel_type'])){ + + + + if(!empty( $post['model']) && !empty( $post['engine']) && !empty( $post['drive_unit']) && !empty( $post['transmission'])&& !empty( $post['fuel_type'])){ foreach($form->searchFilter('id') as $key => $val){ @@ -47,11 +52,11 @@ class AjaxStoFilterController extends Controller public function actionRenderPriceList(){ - if(!empty(Yii::app()->request->getParam('id')) && !empty(Yii::app()->request->getParam('dist'))){ + $id = Yii::app()->request->getParam('id'); + $dist = Yii::app()->request->getParam('dist'); + if(!empty($id) && !empty($dist)){ - $id = Yii::app()->request->getParam('id'); - $dist = Yii::app()->request->getParam('dist'); $names = new StoRequireName(); diff --git a/protected/modules/admin/controllers/StoFilterController.php b/protected/modules/admin/controllers/StoFilterController.php index 8f2f7f0..668d7c5 100644 --- a/protected/modules/admin/controllers/StoFilterController.php +++ b/protected/modules/admin/controllers/StoFilterController.php @@ -38,7 +38,7 @@ class StoFilterController extends AdminController $count = $objPHPExcel->getSheetCount(); - $fullArray = []; + $fullArray = array(); for($i =0; $i<$count; $i++){ $objPHPExcel->setActiveSheetIndex($i); @@ -94,7 +94,7 @@ class StoFilterController extends AdminController $mask_pause = 'НЕОБХІДНІ'; $mask_optional_start = 'НАЗВА'; - $dist = []; + $dist = array(); $requireParamsArea = false; @@ -208,9 +208,16 @@ class StoFilterController extends AdminController public function saveFile(){ $path = dirname(Yii::app()->basePath).'/uploads/parser'; + $path2 = dirname(Yii::app()->basePath).'/images/action'; $uploadfile = $path .'/'.basename($_FILES['files']['name']); + if(!is_dir($path)) { + mkdir($path, 0777, true); + } + if(!is_dir($path2)) { + mkdir($path2, 0777, true); + } if (move_uploaded_file($_FILES['files']['tmp_name'], $uploadfile)) { return $uploadfile; } else { diff --git a/protected/views/stoFilter/index.php b/protected/views/stoFilter/index.php index 886ee2a..bfd2cd9 100644 --- a/protected/views/stoFilter/index.php +++ b/protected/views/stoFilter/index.php @@ -27,7 +27,7 @@ $cs->registerScriptFile('/css/bootstrap/js/bootstrap.min.js');