From 0797b9b7f13cfe1754cc687bf9bf29af8210ac3b Mon Sep 17 00:00:00 2001 From: iyzoer Date: Wed, 16 Aug 2017 15:04:57 +0300 Subject: [PATCH 1/5] fix check api version --- admin/controller/extension/module/retailcrm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/controller/extension/module/retailcrm.php b/admin/controller/extension/module/retailcrm.php index 13533e7..9f4d30b 100644 --- a/admin/controller/extension/module/retailcrm.php +++ b/admin/controller/extension/module/retailcrm.php @@ -546,7 +546,7 @@ class ControllerExtensionModuleRetailcrm extends Controller $response = $this->retailcrm->statisticUpdate(); - if (!$response->isSuccessful()) { + if ($response['errorMsg'] == 'API method not found') { $this->_error['warning'] = $this->language->get('text_error_api'); } From 9245f35b83566722dcda7b48cfcb0880b2af6a9e Mon Sep 17 00:00:00 2001 From: iyzoer Date: Fri, 18 Aug 2017 14:39:18 +0300 Subject: [PATCH 2/5] fix validate form --- admin/controller/extension/module/retailcrm.php | 4 ++-- admin/language/en-gb/extension/module/retailcrm.php | 2 +- admin/language/ru-ru/extension/module/retailcrm.php | 2 +- system/library/retailcrm/RetailcrmProxy.php | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin/controller/extension/module/retailcrm.php b/admin/controller/extension/module/retailcrm.php index 9f4d30b..a6ae5ee 100644 --- a/admin/controller/extension/module/retailcrm.php +++ b/admin/controller/extension/module/retailcrm.php @@ -544,9 +544,9 @@ class ControllerExtensionModuleRetailcrm extends Controller ); } - $response = $this->retailcrm->statisticUpdate(); + $response = $this->retailcrm->getDeliveryTypes(); - 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 index 1d59139..7ad2027 100644 --- a/admin/language/en-gb/extension/module/retailcrm.php +++ b/admin/language/en-gb/extension/module/retailcrm.php @@ -41,7 +41,7 @@ $_['field_email'] = 'Email'; $_['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 index 1e6c044..6bfdd57 100644 --- a/admin/language/ru-ru/extension/module/retailcrm.php +++ b/admin/language/ru-ru/extension/module/retailcrm.php @@ -41,7 +41,7 @@ $_['field_email'] = 'Email'; $_['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 index 591245a..70d199f 100644 --- 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); From 2b2dbc4a481c0f0938a769f042c14cdcefa1a2b5 Mon Sep 17 00:00:00 2001 From: iyzoer Date: Fri, 18 Aug 2017 15:40:37 +0300 Subject: [PATCH 3/5] fix call API method in admin controller --- admin/controller/extension/module/retailcrm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/controller/extension/module/retailcrm.php b/admin/controller/extension/module/retailcrm.php index a6ae5ee..0525b8a 100644 --- a/admin/controller/extension/module/retailcrm.php +++ b/admin/controller/extension/module/retailcrm.php @@ -544,7 +544,7 @@ class ControllerExtensionModuleRetailcrm extends Controller ); } - $response = $this->retailcrm->getDeliveryTypes(); + $response = $this->retailcrm->deliveryTypesList(); if ($response == false) { $this->_error['warning'] = $this->language->get('text_error_api'); From 0185de6dc3604ecc4c9bed318fc6357b8b675b57 Mon Sep 17 00:00:00 2001 From: iyzoer Date: Tue, 29 Aug 2017 09:49:43 +0300 Subject: [PATCH 4/5] fix param method in customFieldsEdit --- system/library/retailcrm/RetailcrmApiClient5.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/library/retailcrm/RetailcrmApiClient5.php b/system/library/retailcrm/RetailcrmApiClient5.php index bf80d53..2c71346 100644 --- a/system/library/retailcrm/RetailcrmApiClient5.php +++ b/system/library/retailcrm/RetailcrmApiClient5.php @@ -236,7 +236,7 @@ class RetailcrmApiClient5 return $this->client->makeRequest( "/custom-fields/$entity/edit/{$customField['code']}", - $this->client::METHOD_POST, + RetailcrmHttpClient::METHOD_POST, array('customField' => json_encode($customField)) ); } From 9f745439885ed0eb6f195596d52d7582004bbc56 Mon Sep 17 00:00:00 2001 From: iyzoer Date: Tue, 29 Aug 2017 10:19:34 +0300 Subject: [PATCH 5/5] add load model --- admin/model/extension/retailcrm/order.php | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/model/extension/retailcrm/order.php b/admin/model/extension/retailcrm/order.php index a097a04..b848aa4 100644 --- a/admin/model/extension/retailcrm/order.php +++ b/admin/model/extension/retailcrm/order.php @@ -57,6 +57,7 @@ class ModelExtensionRetailcrmOrder extends Model { private function process($order_data) { $order = array(); + $this->load->model('catalog/product'); $this->moduleTitle = $this->getModuleTitle(); $payment_code = $order_data['payment_code']; $delivery_code = $order_data['shipping_code'];