RetailCRM-Mirror/prestashop-module
1
0
Fork 0
mirror of https://github.com/retailcrm/prestashop-module.git synced 2025-03-02 19:33:14 +03:00
Code Issues Projects Releases Wiki Activity

fix for validation on marketplace, edit validation form for saving settings

Browse Source
This commit is contained in:
iyzoer 2017-09-01 10:10:46 +03:00 committed by Akolzin Dmitry
parent 9d40ea1952
commit 54a476eed0
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retailcrm/config_ru.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>retailcrm</name>
<displayName><![CDATA[RetailCRM]]></displayName>
<version><![CDATA[1.6]]></version>
<description><![CDATA[Модуль интеграции с RetailCRM]]></description>
<author><![CDATA[Retail Driver LCC]]></author>
<tab><![CDATA[export]]></tab>
<confirmUninstall><![CDATA[Вы уверены, что хотите удалить модуль?]]></confirmUninstall>
<is_configurable>1</is_configurable>
<need_instance>1</need_instance>
<limited_countries></limited_countries>
</module>

9
retailcrm/retailcrm.php
View File

@ -3,7 +3,7 @@
* @author Retail Driver LCC
* @copyright RetailCRM
* @license GPL
* @version 2.2.0
* @version 2.1.2
* @link https://retailcrm.ru
*
*/
@ -80,7 +80,7 @@ class RetailCRM extends Module
}
public function getContent()
{
{
$output = null;
$address = Configuration::get('RETAILCRM_ADDRESS');
$token = Configuration::get('RETAILCRM_API_TOKEN');
@ -420,7 +420,7 @@ class RetailCRM extends Module
unset($comment);
foreach ($orderdb->getProducts() as $item) {
if(isset($item['product_attribute_id']) && $item['product_attribute_id'] > 0) {
if (isset($item['product_attribute_id']) && $item['product_attribute_id'] > 0) {
$productId = $item['product_id'] . '#' . $item['product_attribute_id'];
} else {
$productId = $item['product_id'];
@ -439,7 +439,7 @@ class RetailCRM extends Module
}
public function hookActionOrderStatusPostUpdate($params)
{
{
$delivery = json_decode(Configuration::get('RETAILCRM_API_DELIVERY'), true);
$payment = json_decode(Configuration::get('RETAILCRM_API_PAYMENT'), true);
$status = json_decode(Configuration::get('RETAILCRM_API_STATUS'), true);
@ -679,6 +679,7 @@ class RetailCRM extends Module
$response = $api->deliveryTypesList();
if ($response !== false) {
return true;
}