From 95e3d37057bd469a642738acb8c4f9ada148d3b6 Mon Sep 17 00:00:00 2001 From: Igor Manjencic Date: Mon, 9 Dec 2024 14:28:08 +0100 Subject: [PATCH 1/3] feat(ZMS-3434): print extra info on ticket --- zmsticketprinter/src/Zmsticketprinter/Index.php | 8 +++++++- zmsticketprinter/src/Zmsticketprinter/Process.php | 2 ++ zmsticketprinter/templates/block/content/buttons.twig | 3 +++ zmsticketprinter/templates/block/content/print.twig | 6 +++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/zmsticketprinter/src/Zmsticketprinter/Index.php b/zmsticketprinter/src/Zmsticketprinter/Index.php index fd7e9500c..f8b378928 100644 --- a/zmsticketprinter/src/Zmsticketprinter/Index.php +++ b/zmsticketprinter/src/Zmsticketprinter/Index.php @@ -43,7 +43,9 @@ public function readResponse( $currentLang = 'de'; } - $translations = []; + $translations = [ + 'printText' => '' + ]; $languages = []; $defaultLanguage = 'de'; @@ -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..6f3f7f05b 100644 --- a/zmsticketprinter/templates/block/content/print.twig +++ b/zmsticketprinter/templates/block/content/print.twig @@ -4,7 +4,11 @@
{{ 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 %}
 From ef11b737c14bec592860a6dcc7757a553dbd7f00 Mon Sep 17 00:00:00 2001 From: Igor Manjencic Date: Mon, 9 Dec 2024 14:41:39 +0100 Subject: [PATCH 2/3] feat(ZMS-3434): fix missing index --- zmsticketprinter/src/Zmsticketprinter/Index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zmsticketprinter/src/Zmsticketprinter/Index.php b/zmsticketprinter/src/Zmsticketprinter/Index.php index f8b378928..af9b789c1 100644 --- a/zmsticketprinter/src/Zmsticketprinter/Index.php +++ b/zmsticketprinter/src/Zmsticketprinter/Index.php @@ -50,7 +50,7 @@ public function readResponse( $defaultLanguage = 'de'; if ($languageConfig) { - $defaultLanguage = $languageConfig['defaultLanguage']; + $defaultLanguage = $languageConfig['defaultLanguage'] ?? ''; foreach ($languageConfig['languages'] as $language) { $languages[] = $language['language']; @@ -65,7 +65,7 @@ public function readResponse( } if (empty($currentLang) || $currentLang === 'de') { - $translations['printText'] = $languageConfig['defaultPrintText']; + $translations['printText'] = $languageConfig['defaultPrintText'] ?? ''; } $ticketprinterHelper = (new Helper\Ticketprinter($args, $request)); From 72161b30714c796a95324edfe7562f8d5b2cf6a9 Mon Sep 17 00:00:00 2001 From: Igor Manjencic Date: Mon, 16 Dec 2024 11:19:30 +0100 Subject: [PATCH 3/3] feat(ZMS-3434): adjust text --- zmsticketprinter/templates/block/content/print.twig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/zmsticketprinter/templates/block/content/print.twig b/zmsticketprinter/templates/block/content/print.twig index 6f3f7f05b..a43aaacdd 100644 --- a/zmsticketprinter/templates/block/content/print.twig +++ b/zmsticketprinter/templates/block/content/print.twig @@ -5,9 +5,8 @@ {{ process.scope.contact.name }} - {% if printText %} - . {{ printText }} - {% endif %} +
+ {% 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 %}