Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 407c1dee f36f2e82
Showing 2 changed files with 8 additions and 10 deletions Show diff stats
common/models/Customer.php
frontend/controllers/SiteController.php
@@ -109,7 +109,6 @@
                         'citizenship',
                         'passport',
                         'email',
-                        'image',
                     ],
                     'required',
                 ],
@@ -145,20 +144,19 @@
         }
-        public function upload($file)
+        public function upload()
         {
             /**
              * @var \yii\web\UploadedFile $file;
              */
-            $this->file = $file;
-            if (!empty($file)) {
+            if (!empty($this->file) and $this->validate()) {
                 if (!file_exists(\Yii::getAlias('@storage/customers/'))) {
                     FileHelper::createDirectory(\Yii::getAlias('@storage/customers/'));
                 }
-
-	            if ($file->saveAs(\Yii::getAlias('@storage/customers/') . $file->baseName.'_'.Yii::$app->security->generateRandomString(5).'.'.$file->extension)) {
-                    $this->image = '/storage/customers/'.$file->baseName.'_'.Yii::$app->security->generateRandomString(5).'.'.$file->extension;
-                    $this->file->name = $file->baseName.'_'.Yii::$app->security->generateRandomString(5).'.'.$file->extension;;
+                $filename = $this->file->baseName.'_'.Yii::$app->security->generateRandomString(5).'.'.$this->file->extension;
+	            if ($this->file->saveAs(\Yii::getAlias('@storage/customers/') . $filename)) {
+                    $this->image = '/storage/customers/'.$filename;
+                    $this->file->name = $filename;
                     return true;
                 }
                 return false;
@@ -155,8 +155,8 @@
         {
             $model = new Customer();
             if ($model->load(\Yii::$app->request->post())){
-                
-                if ($model->upload(UploadedFile::getInstance($model, 'file')) and  $model->save()){
+                 $model->file = UploadedFile::getInstance($model, 'file');
+                if ($model->upload() and  $model->save()){
                     \Yii::$app->session->setFlash('success', \Yii::t('app', 'Дякуемо за реєстрацію. Підтвердження участі буде відправлено на вказаний email'));
                    return $this->redirect(['site/index']);
                 }