RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-25 22:56:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79 from iyzoer/master

Browse Source
This commit is contained in:
Alex Lushpai 2018-03-13 15:08:53 +03:00 committed by GitHub
commit 003a2e5797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## v.3.0.3
* Исправлена ошибка с изменением пароля пользователя
## v.3.0.2 ## v.3.0.2
* Улучшена механика выгрузки изменений из RetailCRM на сайт * Улучшена механика выгрузки изменений из RetailCRM на сайт
* Улучшена механика выборки типов доставки на сайте * Улучшена механика выборки типов доставки на сайте

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

@ -761,6 +761,7 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
foreach ($customers as $customer) { foreach ($customers as $customer) {
$customer_id = $customer['externalId']; $customer_id = $customer['externalId'];
$customerData = $this->model_customer_customer->getCustomer($customer_id); $customerData = $this->model_customer_customer->getCustomer($customer_id);
$customerData['password'] = false;
$customerData['firstname'] = $customer['firstName']; $customerData['firstname'] = $customer['firstName'];
$customerData['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : ''; $customerData['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : '';
@ -781,7 +782,7 @@ class ModelExtensionRetailcrmHistoryV45 extends ModelExtensionRetailcrmHistory
$customerAddress['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : ''; $customerAddress['lastname'] = isset($customer['lastName']) ? $customer['lastName'] : '';
$customerAddress['address_1'] = $customer['address']['text']; $customerAddress['address_1'] = $customer['address']['text'];
$customerAddress['city'] = $customer['address']['city']; $customerAddress['city'] = $customer['address']['city'];
$customerAddress['postcode'] = $customer['address']['index'] ? $customer['address']['index'] : ''; $customerAddress['postcode'] = isset($customer['address']['index']) ? $customer['address']['index'] : '';
if (isset($customerCountry)) { if (isset($customerCountry)) {
$customerAddress['country_id'] = $customerCountry['country_id']; $customerAddress['country_id'] = $customerCountry['country_id'];