Fix validate form on saved settings (#43)

retailcrm · Aug 18, 2017 · 05a47a9 · 05a47a9
1 parent 82d93de
commit 05a47a9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/admin/controller/extension/module/retailcrm.php b/admin/controller/extension/module/retailcrm.php
@@ -544,9 +544,9 @@ private function validate()
             );
         }
 
-        $response = $this->retailcrm->statisticUpdate();
+        $response = $this->retailcrm->deliveryTypesList();
 
-        if ($response['errorMsg'] == 'API method not found') {
+        if ($response == false) {
             $this->_error['warning'] = $this->language->get('text_error_api');
         }
 

diff --git a/admin/language/en-gb/extension/module/retailcrm.php b/admin/language/en-gb/extension/module/retailcrm.php
@@ -41,7 +41,7 @@
 $_['field_phone']                = 'Phone';
 $_['text_require']               = 'Require';
 $_['text_error_collector_fields']= 'Fill in the field names Daemon Collector';
-$_['text_error_api']             = 'The selected version of the API is unavailable';
+$_['text_error_api']             = 'The selected version of the API or method is unavailable';
 
 $_['retailcrm_dict_delivery']    = 'Shipment methods';
 $_['retailcrm_dict_status']      = 'Order statuses';

diff --git a/admin/language/ru-ru/extension/module/retailcrm.php b/admin/language/ru-ru/extension/module/retailcrm.php
@@ -41,7 +41,7 @@
 $_['field_phone']                = 'Телефон';
 $_['text_require']               = 'Обязательно для заполнения';
 $_['text_error_collector_fields']= 'Заполните названия полей формы Демон Collector';
-$_['text_error_api']             = 'Недоступна выбранная версия API';
+$_['text_error_api']             = 'Недоступна выбранная версия API или метод.';
 
 $_['retailcrm_dict_delivery']    = 'Способы доставки';
 $_['retailcrm_dict_status']      = 'Статусы';

diff --git a/system/library/retailcrm/RetailcrmProxy.php b/system/library/retailcrm/RetailcrmProxy.php
@@ -10,8 +10,9 @@ class RetailcrmProxy
     private $api;
     private $log;
 
-    public function __construct($url, $key, $log, $version = 'v4')
+    public function __construct($url, $key, $log, $version)
     {   
+        if (!$version) $version = 'v4';
         switch ($version) {
             case 'v5':
                 $this->api = new RetailcrmApiClient5($url, $key);