diff --git a/zmsticketprinter/src/Zmsticketprinter/Index.php b/zmsticketprinter/src/Zmsticketprinter/Index.php index fd7e9500c..af9b789c1 100644 --- a/zmsticketprinter/src/Zmsticketprinter/Index.php +++ b/zmsticketprinter/src/Zmsticketprinter/Index.php @@ -43,12 +43,14 @@ public function readResponse( $currentLang = 'de'; } - $translations = []; + $translations = [ + 'printText' => '' + ]; $languages = []; $defaultLanguage = 'de'; if ($languageConfig) { - $defaultLanguage = $languageConfig['defaultLanguage']; + $defaultLanguage = $languageConfig['defaultLanguage'] ?? ''; foreach ($languageConfig['languages'] as $language) { $languages[] = $language['language']; @@ -62,6 +64,10 @@ public function readResponse( } } + if (empty($currentLang) || $currentLang === 'de') { + $translations['printText'] = $languageConfig['defaultPrintText'] ?? ''; + } + $ticketprinterHelper = (new Helper\Ticketprinter($args, $request)); $ticketprinter = $ticketprinterHelper->getEntity(); $ticketprinter->testValid(); diff --git a/zmsticketprinter/src/Zmsticketprinter/Process.php b/zmsticketprinter/src/Zmsticketprinter/Process.php index 45fcef163..3dd0a4c1c 100644 --- a/zmsticketprinter/src/Zmsticketprinter/Process.php +++ b/zmsticketprinter/src/Zmsticketprinter/Process.php @@ -32,6 +32,7 @@ public function readResponse( $validator = $request->getAttribute('validator'); $scopeId = $validator->getParameter('scopeId')->isNumber()->getValue(); $requestId = $validator->getParameter('requestId')->isNumber()->getValue(); + $printText = $validator->getParameter('printText')->isString()->getValue(); if (null === $scopeId) { throw new Exception\ScopeNotFound(); } @@ -55,6 +56,7 @@ public function readResponse( 'ticketprinter' => $ticketprinterHelper->getEntity(), 'organisation' => $ticketprinterHelper->getOrganisation(), 'process' => $process, + 'printText' => $printText, 'waitingTime' => $queueListHelper->getEstimatedWaitingTime(), 'waitingClients' => ($queueListHelper->getClientsBefore()), 'config' => $config, diff --git a/zmsticketprinter/templates/block/content/buttons.twig b/zmsticketprinter/templates/block/content/buttons.twig index 32fae5e59..9a40ec4be 100644 --- a/zmsticketprinter/templates/block/content/buttons.twig +++ b/zmsticketprinter/templates/block/content/buttons.twig @@ -14,6 +14,7 @@ {{ hiddenfield({ "name": "scopeId", "value": ticketprinter.buttons|first.scope.id }) }} {{ hiddenfield({ "name": "clusterId", "value": ticketprinter.buttons|first.cluster.id }) }} {{ hiddenfield({ "name": "requestId", "value": button.requestId }) }} + {{ hiddenfield({ "name": "printText", "value": translations['printText'] }) }} {% set label = buttonLabelPrefix ~ ticketprinter.buttons|first.name %} {% if ticketprinter.buttons|first.type == "link" %} {% set label = "Information" %} @@ -43,6 +44,7 @@ {{ hiddenfield({ "name": "scopeId", "value": button.scope.id }) }} {{ hiddenfield({ "name": "clusterId", "value": button.cluster.id }) }} {{ hiddenfield({ "name": "requestId", "value": button.requestId }) }} + {{ hiddenfield({ "name": "printText", "value": translations['printText'] }) }} {% set label = buttonLabelPrefix ~ button.name %}
{{ formbutton({ "type":"submit", "name": "Eintragen", "class": "eintragen" ~ disabled, "label": translations[button.requestId] ?? label|trans, "value": "Wartenummer anfordern", "disabled": disabled }) }} @@ -69,6 +71,7 @@ {{ hiddenfield({ "name": "scopeId", "value": button.scope.id }) }} {{ hiddenfield({ "name": "clusterId", "value": button.cluster.id }) }} {{ hiddenfield({ "name": "requestId", "value": button.requestId }) }} + {{ hiddenfield({ "name": "printText", "value": translations['printText'] }) }} {% set label = buttonLabelPrefix ~ button.name %}
diff --git a/zmsticketprinter/templates/block/content/print.twig b/zmsticketprinter/templates/block/content/print.twig index 5105ee448..a43aaacdd 100644 --- a/zmsticketprinter/templates/block/content/print.twig +++ b/zmsticketprinter/templates/block/content/print.twig @@ -4,7 +4,10 @@
{{ process.queue.number }}
- {{ process.scope.contact.name }}
+ {{ process.scope.contact.name }} +
+ {% if printText %}{{ printText }}{% endif %} +
{{ process.queue.arrivalTime|format_date(pattern="EE dd. MMMM Y") }}, {{ process.queue.arrivalTime|format_date(pattern="HH:mm") }} {% trans %}Uhr{% endtrans %}