big commti

Administrator
1 parent 74e69ddf
Showing 37 changed files with 25 additions and 11 deletions Show diff stats
.htaccess
.htpasswd
backend/controllers/EventController.php
backend/views/feedback/index.php
backend/views/layouts/header.php
common/behaviors/SaveImgBehavior.php
common/models/Customer.php
common/models/EventsToProducts.php
common/models/Feedback.php
common/models/LoginForm.php
common/modules/product/controllers/ManageController.php
common/modules/product/models/Export.php
common/modules/product/models/Import.php
console/controllers/SiteMapController.php
console/migrations/m160905_154051_create_table_feedback.php
console/migrations/m160907_101042_events_to_products.php
console/migrations/m160907_161750_event_add_status.php
console/migrations/m160908_162057_add_banner_to_event.php
console/migrations/m160912_212751_slider_image_add_end_at.php
console/migrations/m160920_193159_add_sale_percent_to_event.php
@@ -166,3 +166,4 @@ RewriteRule ^(.*)$ $1.gz [QSA,L]
 BrowserMatch "MSIE" force-no-vary
 BrowserMatch "Mozilla/4.[0-9]{2}" force-no-vary
 </IfModule>
+
+root:$apr1$yVolX6PS$4ga2ZthXEzR1Ii1Ru39iX0
 \ No newline at end of file
@@ -80,10 +80,11 @@ class EventController extends Controller
     {
         $model = new Event();
  
-        if ($model->load(Yii::$app->request->post())) {
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
  
             if ( ($image = UploadedFile::getInstance($model, 'imageUpload')) ) {
                 $model->image = $image->name;
+                $image->saveAs(Yii::getAlias('@imagesDir/event/' . $image->name));
             }
  
             if ( ($banner = UploadedFile::getInstance($model, 'banner')) ) {
@@ -91,9 +92,6 @@ class EventController extends Controller
                 $image->saveAs(Yii::getAlias('@imagesDir/event/' . $banner->name));
             }
  
-            if ($model->save() && $image) {
-                $image->saveAs(Yii::getAlias('@imagesDir/event/' . $image->name));
-            }
  
             return $this->redirect(['view', 'id' => $model->event_id]);
         } else {
@@ -8,7 +8,7 @@ use yii\bootstrap\Nav;
 use yii\bootstrap\NavBar;
 use yii\helpers\Url;
 use yii\widgets\Breadcrumbs;
-use frontend\assets\AppAsset;
+use backend\assets\AppAsset;
 use common\widgets\Alert;
 use yii\widgets\Menu;
  
@@ -58,7 +58,7 @@ class SaveImgBehavior extends Behavior
         foreach($this->fields as $field){
  
             if ( ($image = UploadedFile::getInstance($this->owner, $field['name'])) ) {
-                $this->owner->image = $image->name;
+                $this->owner->$field['name'] = $image->name;
             }
  
  
@@ -202,8 +202,10 @@ class ManageController extends Controller
  
         if ($model->load(Yii::$app->request->post())) {
             $file = UploadedFile::getInstances($model, 'file');
+
             $method = 'go'. ucfirst($model->type);
             $target = Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFile'. ucfirst($model->type));
+
             if (empty($file)) {
                 $model->errors[] = 'File not upload';
             } elseif ($method == 'goPrices' && $file[0]->name != 'file_1.csv') {
@@ -12,6 +12,7 @@ class Export extends Model {
  
     public function process($dirName, $filename = null, $use_not_enables = false) {
         set_time_limit(0);
+        ini_set('max_execution_time', 900);
         if (is_null($filename)) {
             $filename = 'products_'. date('d_m_Y_H_i') .'.csv';
         }
@@ -75,8 +75,14 @@ class Import extends Model {
  
         $is_utf = (preg_match('//u', file_get_contents(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'), null, null, null, 1000000)));
  
-        while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE && (empty($limit) || $j++ < $limit))
+        while (empty($limit) || $j++ < $limit)
         {
+
+
+            if(!(($data = fgetcsv ($handle, 10000, ";")) !== FALSE)){
+                break;
+            }
+
             foreach ($data as &$value)
             {
                 if (!$is_utf) {
@@ -214,10 +220,14 @@ class Import extends Model {
  
         $result_items = [];
  
-        while (($data = fgetcsv ($handle, 10000, ";")) !== FALSE && (empty($limit) || $j++ < $limit))
-        {
  
  
+        while ( empty($limit) || $j++ < $limit)
+        {
+            if(!(($data = fgetcsv ($handle, 10000, ";")) !== FALSE)){
+                break;
+            }
+
             foreach ($data as &$value)
             {
                 if (!$is_utf) {
@@ -11,7 +11,7 @@ FlipclockAsset::register($this);
  
  
 <div id="<?=$title?>" class="owl-carousel owl-theme">
-    <?php foreach($slider->sliderImage as $image):
+    <?php if($slider instanceof Slider){ foreach($slider->sliderImage as $image):
  
  
     ?>
@@ -56,7 +56,8 @@ FlipclockAsset::register($this);
  
  
  
-<?php endforeach; ?>
+<?php endforeach; }
+    ?>
 </div>
 <?php
 $dur = $slider->duration ?  $slider->duration : 5000;