OXDEV-8462 Fix smarty

OXID-eSales · Jul 15, 2024 · 4ed4bfd · 4ed4bfd
1 parent 85e8ffc
commit 4ed4bfd
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...smarty/templates/admin/user_greetings.tpl → views/smarty/admin/user_greetings.tpl b/...smarty/templates/admin/user_greetings.tpl → views/smarty/admin/user_greetings.tpl