Added option to add sender address to digital post

Author: jekuaitk

CHANGELOG.md

@@ -14,6 +14,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - [PR-301](https://github.com/OS2Forms/os2forms/pull/301)
   Add address information to Digital Post shipments to ensure "*fjernprint*"
   can be sent.
+- Add option to add sender (address) to Digital Post shipments.
 
 ## [5.0.0] 2025-11-18
 

modules/os2forms_digital_post/src/EventSubscriber/Os2formsDigitalPostSubscriber.php

@@ -31,7 +31,9 @@ public function onPrintRender(PrintHtmlAlterEvent $event): void {
       $submission = $event->getEntities()[0];
       if ($submission instanceof WebformSubmissionInterface) {
         // Check whether generation is for digital post.
-        if ($lookupResult = $this->getDigitalPostContext($submission)) {
+        if ($context = $this->getDigitalPostContext($submission)) {
+          $lookupResult = $context['lookupResult'];
+          $senderAddress = $context['senderAddress'];
 
           // Combine address parts.
           $streetAddress = $lookupResult->getStreet();
@@ -52,7 +54,11 @@ public function onPrintRender(PrintHtmlAlterEvent $event): void {
           }
 
           // Generate address HTML.
-          $addressHtml = '<div id="envelope-window-digital-post"><div class="h-card">';
+          $addressHtml = '<div id="envelope-window-digital-post">';
+          if (!empty($senderAddress)) {
+            $addressHtml .= '<div id="sender-address-digital-post">' . htmlspecialchars($senderAddress) . '</div>';
+          }
+          $addressHtml .= '<div class="h-card">';
           $addressHtml .= '<div class="p-name">' . htmlspecialchars($lookupResult->getName()) . '</div>';
           if ($lookupResult instanceof CprLookupResult && $lookupResult->getCoName()) {
             $addressHtml .= '<div class="p-name p-co-name">c/o ' . htmlspecialchars($lookupResult->getCoName()) . '</div>';
@@ -90,15 +96,18 @@ public static function getSubscribedEvents(): array {
   /**
    * Indicate Digital Post context in the current session.
    */
-  public function setDigitalPostContext(WebformSubmissionInterface $submission, CompanyLookupResult|CprLookupResult $lookupResult): void {
+  public function setDigitalPostContext(WebformSubmissionInterface $submission, CompanyLookupResult|CprLookupResult $lookupResult, string $senderAddress = ''): void {
     $key = $this->createSessionKeyFromSubmission($submission);
-    $this->session->set($key, $lookupResult);
+    $this->session->set($key, [
+      'lookupResult' => $lookupResult,
+      'senderAddress' => $senderAddress,
+    ]);
   }
 
   /**
    * Check for Digital Post context in the current session.
    */
-  public function getDigitalPostContext(WebformSubmissionInterface $submission): CompanyLookupResult|CprLookupResult|null {
+  public function getDigitalPostContext(WebformSubmissionInterface $submission): ?array {
     $key = $this->createSessionKeyFromSubmission($submission);
 
     return $this->session->get($key);

modules/os2forms_digital_post/src/Helper/AbstractMessageHelper.php

@@ -61,7 +61,8 @@ protected function getMainDocument(WebformSubmissionInterface $submission, array
     // @Drupal\entity_print\Renderer::generateHtml,
     // To indicate digital post context and get the necessary information,
     // we add a flag to the session.
-    $this->digitalPostSubscriber->setDigitalPostContext($submission, $recipientData);
+    $senderAddress = $handlerSettings[WebformHandlerSF1601::MEMO_MESSAGE][WebformHandlerSF1601::SENDER_ADDRESS] ?? '';
+    $this->digitalPostSubscriber->setDigitalPostContext($submission, $recipientData, $senderAddress);
     $content = $instance::getFileContent($element, $submission);
     $this->digitalPostSubscriber->deleteDigitalPostContext($submission);
 

modules/os2forms_digital_post/src/Plugin/WebformHandler/WebformHandlerSF1601.php

@@ -31,6 +31,7 @@ final class WebformHandlerSF1601 extends WebformHandlerBase {
   public const MESSAGE_HEADER_LABEL = 'message_header_label';
   public const RECIPIENT_ELEMENT = 'recipient_element';
   public const ATTACHMENT_ELEMENT = 'attachment_element';
+  public const SENDER_ADDRESS = 'sender_address';
 
   /**
    * Maximum length of sender label.
@@ -131,6 +132,14 @@ public function buildConfigurationForm(array $form, FormStateInterface $formStat
       '#maxlength' => self::MESSAGE_HEADER_LABEL_MAX_LENGTH,
     ];
 
+    $form[self::MEMO_MESSAGE][self::SENDER_ADDRESS] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Sender address'),
+      '#description' => $this->t('Optional sender address shown on the printed document. Displayed as a single line above the recipient name.'),
+      '#required' => FALSE,
+      '#default_value' => $this->configuration[self::MEMO_MESSAGE][self::SENDER_ADDRESS] ?? NULL,
+    ];
+
     $form[self::MEMO_ACTIONS] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Actions'),