From 4fb5030c23d68dc7646d11c6c9ae84ed19c2689d Mon Sep 17 00:00:00 2001 From: Eugene Polozov Date: Sat, 29 May 2021 18:37:46 +0300 Subject: [PATCH] Bump version, fixed formatting --- CHANGELOG.md | 11 +++++++ VERSION | 2 +- retailcrm/retailcrm.php | 16 ++++++---- .../{upgrade-3.2.7.php => upgrade-3.3.0.php} | 11 ++++--- retailcrm/views/templates/admin/settings.tpl | 32 +++++++++---------- 5 files changed, 44 insertions(+), 28 deletions(-) rename retailcrm/upgrade/{upgrade-3.2.7.php => upgrade-3.3.0.php} (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 769b4c6..3c5d542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## v3.3.0 +* Добавлена возможность ручной выгрузки архива клиентов и заказов в RetailCRM +* Добавлены фильтры для упрощенной модификации данных +* Изменен путь хранения логов, добавлена автоматическая очистка старых логов +* Изменен путь для файлов кастомизации модуля, файлы необходимо размещать в папке /custom/classes внутри модуля +* Включение debug-режима в модуле перенесено в настройки в базе данных +* Улучшена работа JobManager, добавлена страница с отладочной информацией о работе +* Добавлена команда для сброса метки истории из RetailCRM +* Добавлена команда для очистки старых файлов логов +* Исправлена ошибка с форматом тегов при обновлении клиентов + ## v3.2.6 * Исправлена ошибка при сохранении настроек модуля на старых версиях PrestaShop diff --git a/VERSION b/VERSION index 34cde56..15a2799 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.6 +3.3.0 diff --git a/retailcrm/retailcrm.php b/retailcrm/retailcrm.php index 40a8fc4..b0051bc 100644 --- a/retailcrm/retailcrm.php +++ b/retailcrm/retailcrm.php @@ -130,7 +130,7 @@ class RetailCRM extends Module { $this->name = 'retailcrm'; $this->tab = 'export'; - $this->version = '3.2.6'; + $this->version = '3.3.0'; $this->author = 'DIGITAL RETAIL TECHNOLOGIES SL'; $this->displayName = $this->l('retailCRM'); $this->description = $this->l('Integration module for retailCRM'); @@ -282,7 +282,7 @@ class RetailCRM extends Module } elseif (!empty($exportCustomers)) { return $this->export($exportCustomers, 'customer'); } elseif ($updateSinceId) { - return $this->updateSinceId(); + return $this->updateSinceId(); } elseif ($downloadLogs) { return $this->downloadLogs($logNames); } else { @@ -385,12 +385,14 @@ class RetailCRM extends Module */ public function export($step, $entity = 'order') { - if (!Tools::getValue('ajax')) + if (!Tools::getValue('ajax')) { return RetailcrmJsonResponse::invalidResponse('This method allow only in ajax mode'); + } $step--; - if ($step < 0) + if ($step < 0) { return RetailcrmJsonResponse::invalidResponse('Invalid request data'); + } $api = RetailcrmTools::getApiClient(); @@ -421,8 +423,9 @@ class RetailCRM extends Module public function updateSinceId() { - if (!Tools::getValue('ajax')) + if (!Tools::getValue('ajax')) { return RetailcrmJsonResponse::invalidResponse('This method allow only in ajax mode'); + } $api = RetailcrmTools::getApiClient(); @@ -440,8 +443,9 @@ class RetailCRM extends Module public function downloadLogs($name = '') { - if (!Tools::getValue('ajax')) + if (!Tools::getValue('ajax')) { return false; + } if (!empty($name)) { if (false === ($filePath = RetailcrmLogger::checkFileName($name))) { diff --git a/retailcrm/upgrade/upgrade-3.2.7.php b/retailcrm/upgrade/upgrade-3.3.0.php similarity index 95% rename from retailcrm/upgrade/upgrade-3.2.7.php rename to retailcrm/upgrade/upgrade-3.3.0.php index 6f48c85..10ceeed 100644 --- a/retailcrm/upgrade/upgrade-3.2.7.php +++ b/retailcrm/upgrade/upgrade-3.3.0.php @@ -41,13 +41,13 @@ if (!defined('_PS_VERSION_')) { } /** - * Upgrade module to version 3.2.7 + * Upgrade module to version 3.3.0 * * @param \RetailCRM $module * * @return bool */ -function upgrade_module_3_2_7($module) +function upgrade_module_3_3_0($module) { if ('retailcrm' != $module->name) { return false; @@ -71,13 +71,14 @@ function retailcrm_upgrade_recursive_copy($src, $dst, $childFolder = '') { $dir = opendir($src); - if(!file_exists($dst)) { + if (!file_exists($dst)) { mkdir($dst); } if ($childFolder != '') { - if(!file_exists($dst . '/' . $childFolder)) + if (!file_exists($dst . '/' . $childFolder)) { mkdir($dst . '/' . $childFolder); + } while (false !== ($file = readdir($dir))) { if (($file != '.') && ($file != '..')) { @@ -101,4 +102,4 @@ function retailcrm_upgrade_recursive_copy($src, $dst, $childFolder = '') } closedir($dir); -} \ No newline at end of file +} diff --git a/retailcrm/views/templates/admin/settings.tpl b/retailcrm/views/templates/admin/settings.tpl index 1338db2..3c4264c 100644 --- a/retailcrm/views/templates/admin/settings.tpl +++ b/retailcrm/views/templates/admin/settings.tpl @@ -197,21 +197,21 @@
{l s='Orders' mod='retailcrm'}
+ class="retail-circle__content" value="{$ordersCount|escape:'htmlall':'UTF-8'}"/> + value="{$exportOrdersStepSize|escape:'htmlall':'UTF-8'}"/>
{l s='Customers' mod='retailcrm'}
+ title="{l s='Customers without orders' mod='retailcrm'}: {$exportCustomersCount|escape:'htmlall':'UTF-8'}" + class="retail-circle__content" value="{$customersCount|escape:'htmlall':'UTF-8'}"/> + value="{$exportCustomersCount|escape:'htmlall':'UTF-8'}"/> + value="{$exportCustomersStepSize|escape:'htmlall':'UTF-8'}"/>
{if isset($jobsNames[$key]) } - {l s=$jobsNames[$key] mod='retailcrm'} + {l s=$jobsNames[$key] mod='retailcrm'} {else} - {$key} + {$key|escape:'htmlall':'UTF-8'} {/if} - {if isset($item['lastRun'])}{$item['lastRun']|date_format:'Y-m-d H:i:s'}{/if} + {if isset($item['lastRun'])}{$item['lastRun']|date_format:'Y-m-d H:i:s'|escape:'htmlall':'UTF-8'}{/if} {if $key === $currentJob || $key === $currentJobCli} ⌛ @@ -317,13 +317,13 @@ {if isset($item['error']['message'])} - -