RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2025-04-04 13:53:37 +03:00
Code Issues Projects Releases Wiki Activity

Fix for opencart 3.0

Browse source
This commit is contained in:
Akolzin Dmitry 2018-02-26 13:15:10 +03:00
parent f2fd22ecba
commit 5f6e287541
6 changed files with 47 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
* Улучшена механика выгрузки изменений из RetailCRM на сайт
* Улучшена механика выборки типов доставки на сайте
* Добавлена возможность периодической выгрузки акционных цен для товаров
* Улучшена совместимость с Opencart 3.0
## v.2.4.3
* Устранены некоторые баги, добавлен вывод ошибок при выгрузке единичных заказов

3
admin/model/extension/retailcrm/history/v4_5.php
View file

@ -511,6 +511,7 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
'status' => 1,
'approved' => 1,
'safe' => 0,
'affiliate' => '',
'address' => array(
array(
'firstname' => isset($order['patronymic']) ? $order['firstName'] . ' ' . $order['patronymic'] : $order['firstName'],
@ -626,7 +627,7 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
if (isset($this->ocDelivery[$shippingModule][$data['shipping']]['title'])) {
$data['shipping_method'] = $this->ocDelivery[$shippingModule][$data['shipping']]['title'];
} else {
$data['shipping_method'] =$this->ocDelivery[$shippingModule]['title'];
$data['shipping_method'] = $this->ocDelivery[$shippingModule]['title'];
}
if (isset($payment)) {

2
admin/view/template/extension/module/retailcrm.twig
View file

@ -97,7 +97,7 @@
<label>{{ text_button_export_order }} № </label><input type="text" name="order_id">
<button type="button" id="export_order" data-toggle="tooltip" title="{{ text_button_export_order }}" class="btn btn-success"><i class="fa fa-download"></i></button>
</div>
{% if saved_settings.retailcrm_apiversion is defined and saved_settings.retailcrm_apiversion. != 'v3' %}
{% if saved_settings.retailcrm_apiversion is defined and saved_settings.retailcrm_apiversion != 'v3' %}
<h3>{{ special_price_settings }}</h3>
<div class="retailcrm_unit">
<label>{{ special_price_settings }}</label>

20
catalog/controller/api/retailcrm.php
View file

@ -131,17 +131,27 @@ class ControllerApiRetailcrm extends Controller
private function auth()
{
if (!isset($this->request->get['token'])
|| !$this->request->get['token']
if (!isset($this->request->get['key'])
|| !$this->request->get['key']
) {
return array('error' => 'Not found api key');
}
if (isset($this->request->get['token'])
&& !empty($this->request->get['token'])
if (isset($this->request->get['key'])
&& !empty($this->request->get['key'])
) {
$this->load->model('account/api');
$api = $this->model_account_api->getApiByKey($this->request->get['token']);
if ( version_compare(VERSION, '3.0', '<')) {
$api = $this->model_account_api->getApiByKey($this->request->get['key']);
} else {
$api = $this->model_account_api->login($this->request->get['username'], $this->request->get['key']);
if (empty($api)) {
$this->load->model('extension/retailcrm/api');
$api = $this->model_extension_retailcrm_api->login($this->request->get['username'], $this->request->get['key']);
}
}
if (!empty($api)) {
return $api;

11
catalog/model/extension/retailcrm/api.php Normal file
View file

@ -0,0 +1,11 @@
<?php
class ModelExtensionRetailcrmApi extends Model
{
public function login($username, $key)
{
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "api` WHERE `username` = '" . $this->db->escape($username) . "' AND `key` = '" . $this->db->escape($key) . "' AND status = '1'");
return $query->row;
}
}

21
system/library/retailcrm/OpencartApiClient.php
View file

@ -39,7 +39,7 @@ class OpencartApiClient {
$cookies[$params[5]] = $params[6];
}
if(isset($cookies[$cookieName])) {
if (isset($cookies[$cookieName])) {
return $cookies[$cookieName];
}
@ -50,7 +50,20 @@ class OpencartApiClient {
$opencartStoreInfo = $this->model_setting_store->getStore($this->opencartStoreId);
if ($this->apiToken !== false) {
$getParams['token'] = $this->apiToken;
if (version_compare(VERSION, '3.0', '<')) {
$getParams['key'] = $this->apiToken['key'];
} else {
$getParams['key'] = $this->apiToken['key'];
$getParams['username'] = $this->apiToken['username'];
if (isset($this->session->data['user_token'])) {
$getParams['api_token'] = $this->session->data['user_token'];
} else {
$session = $this->registry->get('session');
$session->start();
$getParams['api_token'] = $session->getId();
}
}
}
$postParams['fromApi'] = true;
@ -121,8 +134,8 @@ class OpencartApiClient {
return false;
}
if (isset($api['key'])) {
$this->apiToken = $api['key'];
if (isset($api) && !empty($api)) {
$this->apiToken = $api;
} else {
$this->apiToken = false;
}