big commti

Administrator
1 parent 389fc0d1
Showing 6 changed files with 37 additions and 6 deletions Show diff stats
backend/views/event/_form.php
common/models/Event.php
common/modules/product/models/Export.php
common/modules/product/models/Import.php
console/migrations/m160920_193159_add_isEvent_to_event.php
frontend/controllers/EventController.php
@@ -92,6 +92,8 @@ use mihaildev\elfinder\ElFinder;
  
     <?= $form->field($model, 'sale')->checkbox() ?>
  
+    <?= $form->field($model, 'is_event')->checkbox() ?>
+
     <?= $form->field($model, 'percent')->textInput() ?>
  
  
@@ -91,7 +91,7 @@ class Event extends \yii\db\ActiveRecord
     {
         return [
             [['body', 'seo_text'], 'string'],
-            [['created_at', 'updated_at','percent','sale' ], 'integer'],
+            [['created_at', 'updated_at','percent','sale','is_event' ], 'integer'],
             [['name', 'alias', 'image', 'meta_title', 'description', 'h1','end_at','banner'], 'string', 'max' => 255],
             [['name','body'], 'required'],
             [['imageUpload'], 'safe'],
@@ -122,6 +122,7 @@ class Event extends \yii\db\ActiveRecord
             'products_file' => Yii::t('app', 'Загрузка файла'),
             'sale' => Yii::t('app', 'Распродажа'),
             'percent' => Yii::t('app', 'Процент'),
+            'is_event' => Yii::t('app', 'Акция'),
         ];
     }
  
@@ -13,6 +13,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);
+        ini_set('memory_limit', '1024M');
         if (is_null($filename)) {
             $filename = 'products_'. date('d_m_Y_H_i') .'.csv';
         }
@@ -443,17 +443,17 @@ class Import extends Model {
                     $MOD_ARRAY[] = $_productVariant->product_variant_id;
  
                     if ($mod_image) {
-                        $source_image = Yii::getAlias('@uploadDir') . '/product_images/'. urlencode($mod_image);
-                        if (file_exists($source_image)) {
+//                        $source_image = Yii::getAlias('@uploadDir') . '/product_images/'. urlencode($mod_image);
+//                        if (file_exists($source_image)) {
                             if (($variantImage = ProductImage::find()->andFilterWhere(['ilike', 'image', $mod_image])->andFilterWhere(['product_variant_id' => $_productVariant->product_variant_id])->one()) === null) {
-                                copy($source_image, Yii::getAlias('@productsDir') . "/" . $mod_image);
+//                                copy($source_image, Yii::getAlias('@productsDir') . "/" . $mod_image);
                                 $variantImage = new ProductImage();
                                 $variantImage->product_id = $_product->product_id;
                                 $variantImage->product_variant_id = $_productVariant->product_variant_id;
                                 $variantImage->image = $mod_image;
                                 $variantImage->save();
                             }
-                        }
+//                        }
                     }
                 }
             }
+<?php
+
+use yii\db\Migration;
+
+class m160920_193159_add_isEvent_to_event extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('event', 'is_event', $this->boolean());
+    }
+
+    public function down()
+    {
+        $this->dropColumn('event', 'is_event');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
@@ -54,7 +54,7 @@ class EventController extends Controller
  
     protected function findModel($alias)
     {
-        if (($model = Event::findOne(["alias"=>$alias])) !== null) {
+        if (($model = Event::findOne(["alias"=>$alias,'is_event' => true])) !== null) {
             return $model;
         } else {
             throw new NotFoundHttpException('The requested page does not exist.');