From a06074a97831ba5a1be4f9dc14aa5bc234016324 Mon Sep 17 00:00:00 2001
From: Neur0toxine <pashok9825@gmail.com>
Date: Wed, 22 Jul 2020 15:23:52 +0300
Subject: [PATCH] Do not check key existence for job manager

---
 CHANGELOG.md                          |  3 +++
 VERSION                               |  2 +-
 retailcrm/lib/RetailcrmCli.php        |  6 ++----
 retailcrm/lib/RetailcrmJobManager.php | 17 ++++-------------
 retailcrm/retailcrm.php               |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3d19c8..7099eaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v3.1.1
+* Улучшена работа джобов
+
 ## v3.1.0
 * Поддержка смены клиента в заказе
 
diff --git a/VERSION b/VERSION
index fd2a018..94ff29c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/retailcrm/lib/RetailcrmCli.php b/retailcrm/lib/RetailcrmCli.php
index 9c2a6b9..de17b8e 100644
--- a/retailcrm/lib/RetailcrmCli.php
+++ b/retailcrm/lib/RetailcrmCli.php
@@ -326,10 +326,8 @@ class RetailcrmCli
      */
     public static function clearCurrentJob($job)
     {
-        if (Configuration::hasKey(self::CURRENT_TASK_CLI)) {
-            if (is_null($job) || self::getCurrentJob() == $job) {
-                return Configuration::deleteByName(self::CURRENT_TASK_CLI);
-            }
+        if (is_null($job) || self::getCurrentJob() == $job) {
+            return Configuration::deleteByName(self::CURRENT_TASK_CLI);
         }
 
         return true;
diff --git a/retailcrm/lib/RetailcrmJobManager.php b/retailcrm/lib/RetailcrmJobManager.php
index 5d2cbf1..88c0c60 100644
--- a/retailcrm/lib/RetailcrmJobManager.php
+++ b/retailcrm/lib/RetailcrmJobManager.php
@@ -351,10 +351,8 @@ class RetailcrmJobManager
      */
     public static function clearCurrentJob($job)
     {
-        if (Configuration::hasKey(self::CURRENT_TASK)) {
-            if (is_null($job) || self::getCurrentJob() == $job) {
-                return Configuration::deleteByName(self::CURRENT_TASK);
-            }
+        if (is_null($job) || self::getCurrentJob() == $job) {
+            return Configuration::deleteByName(self::CURRENT_TASK);
         }
 
         return true;
@@ -368,15 +366,8 @@ class RetailcrmJobManager
      */
     public static function reset()
     {
-        $result = true;
-
-        if (Configuration::hasKey(self::CURRENT_TASK)) {
-            $result = Configuration::deleteByName(self::CURRENT_TASK);
-        }
-
-        if (Configuration::hasKey(self::LAST_RUN_NAME)) {
-            $result = $result && Configuration::deleteByName(self::LAST_RUN_NAME);
-        }
+        $result = Configuration::deleteByName(self::CURRENT_TASK);
+        $result = $result && Configuration::deleteByName(self::LAST_RUN_NAME);
 
         self::unlock();
 
diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php
index a5cdf52..02a073e 100644
--- a/retailcrm/retailcrm.php
+++ b/retailcrm/retailcrm.php
@@ -117,7 +117,7 @@ class RetailCRM extends Module
     {
         $this->name = 'retailcrm';
         $this->tab = 'export';
-        $this->version = '3.1.0';
+        $this->version = '3.1.1';
         $this->author = 'DIGITAL RETAIL TECHNOLOGIES SL';
         $this->displayName = $this->l('retailCRM');
         $this->description = $this->l('Integration module for retailCRM');