From 0b491165a12251d4574d108a07cc586350c6da37 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Thu, 8 Oct 2015 13:13:39 +0300
Subject: [PATCH] Importers CRUD

---
 backend/components/ImageSizer.php          | 17 +++++++++++++----
 backend/components/base/BaseController.php | 47 ++++++++++++++++++++++++++++++++++++++---------
 backend/components/views/image_sizer.php   | 21 ++++++++++++---------
 backend/controllers/SiteController.php     |  6 +++++-
 backend/models/ImageSizerForm.php          |  4 +++-
 backend/views/layouts/column.php           |  8 ++++++++
 backend/views/user/_form.php               |  2 +-
 backend/web/css/AdminLTE.css               |  4 ++--
 8 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/backend/components/ImageSizer.php b/backend/components/ImageSizer.php
index bccb202..3d3161d 100644
--- a/backend/components/ImageSizer.php
+++ b/backend/components/ImageSizer.php
@@ -12,8 +12,8 @@ use yii\base\Widget;
 
 class ImageSizer extends Widget
 {
-    public $height;
-    public $width;
+    public $height = 0;
+    public $width = 0;
     public $field;
     public $file;
     public $model;
@@ -43,8 +43,17 @@ class ImageSizer extends Widget
 
     }
 
-    public function getGalley(){
-        return $this->gallery;
+    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/base/BaseController.php b/backend/components/base/BaseController.php
index 00b6654..87d48b2 100644
--- a/backend/components/base/BaseController.php
+++ b/backend/components/base/BaseController.php
@@ -17,10 +17,7 @@ use yii\imagine\Image;
 
 class BaseController extends Controller {
 
-    public function beforeAction($action) {
-        $this->enableCsrfValidation = false;
-        return parent::beforeAction($action);
-    }
+
 
     private function resizeImg($w, $h, $imageAlias,$imageAliasSave){
         $img = Image::getImagine()->open(Yii::getAlias($imageAlias));
@@ -56,6 +53,35 @@ class BaseController extends Controller {
 
     }
 
+    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);
+        }
+    }
+
 
     public function actionDownloadPhoto()
     {
@@ -64,6 +90,8 @@ class BaseController extends Controller {
 
         if ($model->load(Yii::$app->request->post())) {
 
+            $this->deleteImages($model->old_img);
+
             $model->file = UploadedFile::getInstance($model, 'file');
 
             $md5_file = md5_file($model->file->tempName);
@@ -88,20 +116,21 @@ class BaseController extends Controller {
 
             } else {
 
-                $imageLink = $imageOrigAlias;
+                $imageLink = '/storage/'.$md5_file.'/'.'original'.'.'.$model->file->extension;
 
             }
 
-            if($model->multi){
-
-                return json_encode(['link'=>$imageLink]);
 
-            } else {
+            if($model->multi){
                 $view = $this->renderPartial('@app/components/views/_gallery_item', [
                     'item' => ['image'=>$imageLink],
                 ]);
 
                 return json_encode(['link'=>$imageLink, 'view' =>$view]);
+
+
+            } else {
+                return json_encode(['link'=>$imageLink]);
             }
 
 
diff --git a/backend/components/views/image_sizer.php b/backend/components/views/image_sizer.php
index a66cca0..20fd8ca 100644
--- a/backend/components/views/image_sizer.php
+++ b/backend/components/views/image_sizer.php
@@ -41,12 +41,11 @@ $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
 <?= $form->field( new \backend\models\ImageSizerForm(), 'file')->fileInput(['id'=>$field, 'data-url'=>"/admin/site/download-photo" ]); ?>
 
 <?= $form->field($model,$field)->hiddenInput(['id' => "{$field}_picture_link"]) ?>
-<?= $form->field(new \backend\models\ImageSizerForm(),'height')->hiddenInput(['value' => $height])->label(false) ?>
-<?= $form->field(new \backend\models\ImageSizerForm(), 'width')->hiddenInput(['value' => $width])->label(false) ?>
-
-
+    <input type="hidden" name="ImageSizerForm[width]" value="<?=$width?>"/>
+    <input type="hidden" name="ImageSizerForm[height]" value="<?=$height?>"/>
+    <input type="hidden" name="ImageSizerForm[old_img]" value="<?=$model->$field?>"/>
 <div id="<?= $field?>_img_block">
-    <?= $model->$field ? Html::img('/'.$model->$field): '' ?>
+    <?= $model->$field ? Html::img($model->$field): '' ?>
 </div>
 
 <script>
@@ -70,13 +69,14 @@ $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
     <?= $form->field( new \backend\models\ImageSizerForm(), 'file')->fileInput(['id'=>$field, 'data-url'=>"/admin/site/download-photo", 'multiple'=> 'multiple']); ?>
 
     <?= $form->field($model,$field)->hiddenInput(['id' => "{$field}_picture_link"]) ?>
-    <?= $form->field(new \backend\models\ImageSizerForm(),'height')->hiddenInput(['value' => $height])->label(false) ?>
-    <?= $form->field(new \backend\models\ImageSizerForm(), 'width')->hiddenInput(['value' => $width])->label(false) ?>
-    <?= $form->field(new \backend\models\ImageSizerForm(), 'multi')->hiddenInput(['value' => $multi])->label(false) ?>
+    <input type="hidden" name="ImageSizerForm[width]" value="<?=$width?>"/>
+    <input type="hidden" name="ImageSizerForm[height]" value="<?=$height?>"/>
+    <input type="hidden" name="ImageSizerForm[multi]" value="<?=$multi?>"/>
+
     <div id="<?= $field?>_img_block">
         <?php
 
-        foreach($this->context->getGalley() as  $image){
+        foreach($this->context->getGallery() as  $image){
             echo $this->render('_gallery_item', [ 'item' => ['image'=>$image]]);
         }
         ?>
@@ -101,6 +101,9 @@ $this->registerJsFile('@web/js/vendor/bower/jquery-file-upload/js/jquery.fileupl
                 var gallery = $("#<?= $field?>_picture_link");
                 var urls = gallery.val();
                 gallery.val(urls.replace(url+',', ""));
+                $.post( "/admin/site/delete-image",{old_img: url},  function( data ) {
+                    $( ".result" ).html( data );
+                });
             })
 
         })
diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
index 15e627b..5fc05d2 100644
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@@ -11,6 +11,10 @@ use yii\filters\VerbFilter;
  */
 class SiteController extends BaseController
 {
+    public function beforeAction($action) {
+        $this->enableCsrfValidation = false;
+        return parent::beforeAction($action);
+    }
 
     public $layout = '/column';
     /**
@@ -23,7 +27,7 @@ class SiteController extends BaseController
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['login', 'error', 'download-photo' ],
+                        'actions' => ['login', 'error', 'download-photo','delete-image' ],
                         'allow' => true,
                     ],
                     [
diff --git a/backend/models/ImageSizerForm.php b/backend/models/ImageSizerForm.php
index 69158eb..92f430a 100644
--- a/backend/models/ImageSizerForm.php
+++ b/backend/models/ImageSizerForm.php
@@ -19,6 +19,7 @@ class ImageSizerForm extends Model
     public $model;
     public $form;
     public $multi;
+    public $old_img;
 
     /**
      * @return array the validation rules.
@@ -27,7 +28,8 @@ class ImageSizerForm extends Model
     {
         return [
             [['width', 'height'], 'integer'],
-            [['field', 'model', 'form'], 'string', 'max' => 255],
+            [['field', 'multi','old_img'], 'string', 'max' => 255],
+            [['model', 'form',], 'string'],
             [['file'], 'file'],
         ];
     }
diff --git a/backend/views/layouts/column.php b/backend/views/layouts/column.php
index a00f095..844737d 100644
--- a/backend/views/layouts/column.php
+++ b/backend/views/layouts/column.php
@@ -295,6 +295,14 @@ $this->beginContent('@app/views/layouts/main.php');
                             ['label' => 'Администраторы', 'url' => ['user/index']],
                         ],
                         ],
+                        ['label' => 'Ценообразование', 'url' => ['#'], 'items' => [
+                            ['label' => 'Курс', 'url' => ['accounts/index']],
+                            ['label' => 'Типы цен', 'url' => ['importers/index']],
+                            ['label' => 'Коэфициенты на поставщиков', 'url' => ['user/index']],
+                            ['label' => 'Коэфициенты на импорт поставщиков', 'url' => ['user/index']],
+                            ['label' => 'Коэфициенты на группы RG', 'url' => ['user/index']],
+                        ],
+                        ],
                     ],
                     'submenuTemplate' => "\n<ul class='treeview-menu'>\n{items}\n</ul>\n",
                 ]);
diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php
index 558f441..f2dede2 100644
--- a/backend/views/user/_form.php
+++ b/backend/views/user/_form.php
@@ -33,7 +33,7 @@ use yii\helpers\ArrayHelper;
     ], 'id', 'name')) ?>
 
 
-    <?= \backend\components\ImageSizer::widget(['form'=>$form, 'model'=> $model, 'field'=>'photo','width'=>200,'height'=>200,'multi'=>true, 'gallery' => []]); ?>
+    <?= \backend\components\ImageSizer::widget(['form'=>$form, 'model'=> $model, 'field'=>'photo','width'=>200,'height'=>200,'multi'=>false, 'gallery' =>$model->photo]); ?>
 
     <?= $form->field($model, 'contacts')->textInput(['maxlength' => true]) ?>
 
diff --git a/backend/web/css/AdminLTE.css b/backend/web/css/AdminLTE.css
index bccd8bd..93e60d9 100644
--- a/backend/web/css/AdminLTE.css
+++ b/backend/web/css/AdminLTE.css
@@ -67,7 +67,7 @@ body {
   -moz-transition: -moz-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
   -o-transition: -o-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
   transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
-  margin-left: 230px;
+  margin-left: 280px;
   z-index: 820;
 }
 .layout-top-nav .content-wrapper,
@@ -419,7 +419,7 @@ a:focus {
   left: 0;
   padding-top: 50px;
   min-height: 100%;
-  width: 230px;
+  width: 280px;
   z-index: 810;
   -webkit-transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
   -moz-transition: -moz-transform 0.3s ease-in-out, width 0.3s ease-in-out;
--
libgit2 0.21.4