diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a7c7a7..6415106 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,15 +26,6 @@ jobs: strategy: matrix: include: - - php-version: '7.3' - test-suite: '3' - oc: '3.0.0.0' - - php-version: '7.3' - test-suite: '3' - oc: '3.0.0.2' - - php-version: '7.3' - test-suite: '3' - oc: '3.0.1.0' - php-version: '7.3' test-suite: '3' oc: '3.0.1.1' @@ -71,15 +62,6 @@ jobs: - php-version: '7.3' test-suite: '3' oc: '3.0.3.8' - - php-version: '7.4' - test-suite: '3' - oc: '3.0.0.0' - - php-version: '7.4' - test-suite: '3' - oc: '3.0.0.2' - - php-version: '7.4' - test-suite: '3' - oc: '3.0.1.0' - php-version: '7.4' test-suite: '3' oc: '3.0.1.1' diff --git a/CHANGELOG.md b/CHANGELOG.md index 352b9ee..f230e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## v4.1.15 +* Display module version + ## v4.1.14 * Added currency validation when configuring the module diff --git a/VERSION b/VERSION index 5888f1a..796262d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.14 +4.1.15 diff --git a/doc/Update module.md b/doc/Update module.md new file mode 100644 index 0000000..f9f978d --- /dev/null +++ b/doc/Update module.md @@ -0,0 +1,6 @@ +### Обновление версии модуля + +Для обновления версии модуля необходимо обновить следующие файлы: +* VERSION +* CHANGELOG.md +* src/upload/admin/controller/extension/module/retailcrm.php \ No newline at end of file diff --git a/src/upload/admin/controller/extension/module/retailcrm.php b/src/upload/admin/controller/extension/module/retailcrm.php index 0bec2f5..b4d501c 100644 --- a/src/upload/admin/controller/extension/module/retailcrm.php +++ b/src/upload/admin/controller/extension/module/retailcrm.php @@ -2,6 +2,8 @@ class ControllerExtensionModuleRetailcrm extends Controller { + const VERSION_MODULE = '4.1.15'; + private $_error = []; protected $log, $statuses, $payments, $deliveryTypes, $retailcrmApiClient, $moduleTitle, $tokenTitle; public $children, $template; @@ -317,6 +319,8 @@ class ControllerExtensionModuleRetailcrm extends Controller $_data = &$data; + $_data['module_version'] = self::VERSION_MODULE; + foreach ($text_strings as $text) { $_data[$text] = $this->language->get($text); } diff --git a/src/upload/admin/view/template/extension/module/retailcrm.twig b/src/upload/admin/view/template/extension/module/retailcrm.twig index 7f742ed..7ad02eb 100644 --- a/src/upload/admin/view/template/extension/module/retailcrm.twig +++ b/src/upload/admin/view/template/extension/module/retailcrm.twig @@ -9,7 +9,7 @@ -