feat(ZMS-1711): reorganize custom templates

it-at-m · Dec 14, 2023 · 7ee1ca6 · 7ee1ca6
1 parent f26c7f7
commit 7ee1ca6
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/zmsentities/src/Zmsentities/Helper/Messaging.php b/zmsentities/src/Zmsentities/Helper/Messaging.php
@@ -195,23 +195,24 @@ public static function getNotificationContent(Process $process, Config $config,
 
     protected static function getTemplate($type, $status, ?Process $process = null)
     {
+        $template = null;
+        if (Property::__keyExists($type, self::$templates)) {
+            if (Property::__keyExists($status, self::$templates[$type])) {
+                $template = self::$templates[$type][$status];
+            }
+        }
+
         if ($process) {
             $provider = $process->scope->provider;
             $providerName = $provider->displayName;
             $providerTemplateName = self::getProviderTemplateName($providerName);
-            $providerTemplate = 'custom/' . $type . '/' .  $status . '/' . $providerTemplateName . '.twig';
+            $providerTemplateFolder = 'custom/' . $providerTemplateName . '/';
 
-            if (file_exists(TemplateFinder::getTemplatePath() . '/messaging/' . $providerTemplate)) {
-                return $providerTemplate;
+            if (file_exists(TemplateFinder::getTemplatePath() . '/messaging/' . $providerTemplateFolder . $template)) {
+                return $providerTemplateFolder . $template;
             }
         }
 
-        $template = null;
-        if (Property::__keyExists($type, self::$templates)) {
-            if (Property::__keyExists($status, self::$templates[$type])) {
-                $template = self::$templates[$type][$status];
-            }
-        }
         return $template;
     }