From 4ed4bfd65778aa7fcc36c1764ac73aab88722005 Mon Sep 17 00:00:00 2001
From: Tatyana Koleva <tatjana.koleva@dnhsoft.com>
Date: Mon, 15 Jul 2024 17:57:49 +0300
Subject: [PATCH] OXDEV-8462 Fix smarty

---
 composer.json                                         | 2 +-
 metadata.php                                          | 2 +-
 tests/Codeception/acceptance.suite.yml                | 6 +++---
 views/admin_smarty/de/module_options.php              | 9 +++++++++
 views/admin_smarty/en/module_options.php              | 9 +++++++++
 views/smarty/{templates => }/admin/user_greetings.tpl | 0
 6 files changed, 23 insertions(+), 5 deletions(-)
 rename views/smarty/{templates => }/admin/user_greetings.tpl (100%)

diff --git a/composer.json b/composer.json
index 7417b45..b859e23 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
 
         "tests-codeception": [
             "Composer\\Config::disableProcessTimeout",
-            "THEME_ID=apex MODULE_IDS=oe_moduletemplate SHOP_ROOT_PATH=/var/www vendor/bin/codecept run acceptance -c tests/codeception.yml --no-redirect"
+            "THEME_ID=flow MODULE_IDS=oe_moduletemplate SHOP_ROOT_PATH=/var/www vendor/bin/codecept run acceptance -c tests/codeception.yml --no-redirect"
         ],
 
         "tests-all": [
diff --git a/metadata.php b/metadata.php
index 8dbe812..46aadb3 100644
--- a/metadata.php
+++ b/metadata.php
@@ -33,7 +33,7 @@
     ],
     'templates'   => [
         '@oe_moduletemplate/templates/greetingtemplate.tpl' => 'views/smarty/templates/greetingtemplate.tpl',
-        '@oe_moduletemplate/templates/admin/user_greetings.tpl' => 'views/smarty/templates/admin/user_greetings.tpl',
+        '@oe_moduletemplate/admin/user_greetings.tpl' => 'views/smarty/admin/user_greetings.tpl',
     ],
     'events' => [
         'onActivate' => '\OxidEsales\ModuleTemplate\Core\ModuleEvents::onActivate',
diff --git a/tests/Codeception/acceptance.suite.yml b/tests/Codeception/acceptance.suite.yml
index 8c034c6..614d9c6 100644
--- a/tests/Codeception/acceptance.suite.yml
+++ b/tests/Codeception/acceptance.suite.yml
@@ -49,9 +49,9 @@ modules:
     - \OxidEsales\Codeception\Module\Translation\TranslationsModule:
         shop_path: '%SHOP_SOURCE_PATH%'
         paths:
-          - Application/views/apex
-          - Application/views/admin_twig
-          - ../vendor/oxid-esales/module-template/views/admin_twig
+          - Application/views/flow/translations
+          - Application/views/admin_smarty
+          - ../vendor/oxid-esales/module-template/views/admin_smarty
           - ../vendor/oxid-esales/module-template/translations
     - \OxidEsales\Codeception\Module\OxideshopModules
 step_decorators:
diff --git a/views/admin_smarty/de/module_options.php b/views/admin_smarty/de/module_options.php
index 9c0edf4..c7fa1c7 100644
--- a/views/admin_smarty/de/module_options.php
+++ b/views/admin_smarty/de/module_options.php
@@ -9,6 +9,15 @@
 
 $aLang = [
     'charset' => 'UTF-8',
+    'tbcluser_greetings' => 'Greetings',
+
+    'OEMODULETEMPLATE_GREETING_TITLE' => 'Admin controller example',
+    'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Greeting message: ',
+    'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'No greeting message added!',
+    'OEMODULETEMPLATE_ALLOW_GREETING' => 'Allow user to set greeting',
+    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Example of extending admin template',
+
+    # Module settings
     'SHOP_MODULE_GROUP_oemoduletemplate_main' => 'Einstellungen',
     'SHOP_MODULE_oemoduletemplate_GreetingMode' => 'Begrüßungsmodus',
     'SHOP_MODULE_oemoduletemplate_GreetingMode_generic' => 'höflich',
diff --git a/views/admin_smarty/en/module_options.php b/views/admin_smarty/en/module_options.php
index 4ff6e99..c5ef721 100644
--- a/views/admin_smarty/en/module_options.php
+++ b/views/admin_smarty/en/module_options.php
@@ -9,6 +9,15 @@
 
 $aLang = [
     'charset' => 'UTF-8',
+    'tbcluser_greetings' => 'Greetings',
+
+    'OEMODULETEMPLATE_GREETING_TITLE' => 'Admin controller example',
+    'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Greeting message: ',
+    'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'No greeting message added!',
+    'OEMODULETEMPLATE_ALLOW_GREETING' => 'Allow user to set greeting',
+    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Example of extending admin template',
+
+    # Module settings
     'SHOP_MODULE_GROUP_oemoduletemplate_main' => 'Settings',
     'SHOP_MODULE_oemoduletemplate_GreetingMode' => 'Greeting mode',
     'SHOP_MODULE_oemoduletemplate_GreetingMode_generic' => 'generic',
diff --git a/views/smarty/templates/admin/user_greetings.tpl b/views/smarty/admin/user_greetings.tpl
similarity index 100%
rename from views/smarty/templates/admin/user_greetings.tpl
rename to views/smarty/admin/user_greetings.tpl