From 2a47d6e723189e8898b764e7b54b29c15560cfd4 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Wed, 18 Jan 2017 13:55:49 +0200
Subject: [PATCH] Ntr

---
 common/modules/product/models/Import.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/common/modules/product/models/Import.php b/common/modules/product/models/Import.php
index fbc4e7f..034df9e 100755
--- a/common/modules/product/models/Import.php
+++ b/common/modules/product/models/Import.php
@@ -60,17 +60,19 @@ class Import extends Model {
     public function goPrices($from = 0, $limit = null) {
         set_time_limit(0);
         $new_products = $linked_products = 0;
-        if (file_exists(Yii::getAlias('@uploadDir/goPrices.lock'))) {
-            return 'Task already executed';
-        }
-        $ff = fopen(Yii::getAlias('@uploadDir/goPrices.lock'), 'w+');
-        fclose($ff);
+
 
         if ( !($handle = $this->getProductsFile('uploadFilePrices')) ) {
             $this->errors[] = 'File not found';
             return FALSE;
         }
 
+        if (file_exists(Yii::getAlias('@uploadDir/goPrices.lock'))) {
+            return 'Task already executed';
+        }
+        $ff = fopen(Yii::getAlias('@uploadDir/goPrices.lock'), 'w+');
+        fclose($ff);
+
         $filesize = filesize(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFilePrices'));
         if ($from) {
             fseek($handle, $from);
@@ -221,16 +223,17 @@ class Import extends Model {
 
         set_time_limit(0);
         $new_products = $linked_products = 0;
-        if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
-            return 'Task already executed';
-        }
-        $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
-        fclose($ff);
+
 
         if ( !($handle = $this->getProductsFile('uploadFileProducts')) ) {
             $this->errors[] = 'File not found';
             return FALSE;
         }
+        if (file_exists(Yii::getAlias('@uploadDir/goProducts.lock'))) {
+            return 'Task already executed';
+        }
+        $ff = fopen(Yii::getAlias('@uploadDir/goProducts.lock'), 'w+');
+        fclose($ff);
 
         $filesize = filesize(Yii::getAlias('@uploadDir') .'/'. Yii::getAlias('@uploadFileProducts'));
 
--
libgit2 0.21.4