Merge branch 'develop' into hotfix/remove-cpr

Author: rimi-itk

CHANGELOG.md

@@ -9,7 +9,11 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
 - Remove CPR from exception
+- Added more recipient field types
+- Fixed error logging.
 
 ## [1.1.0]
 

src/Helper/WebformHelperSF1601.php

@@ -291,7 +291,8 @@ public function processJob(Job $job): JobResult {
       return JobResult::success();
     }
     catch (\Exception $e) {
-      $this->error($e->getMessage(), [
+      $this->error('Error: @message', [
+        '@message' => $e->getMessage(),
         'handler_id' => 'os2forms_digital_post',
         'operation' => 'digital post send',
         'webform_submission' => $submission ?? NULL,

src/Plugin/WebformHandler/WebformHandlerSF1601.php

@@ -241,10 +241,17 @@ public function buildConfigurationForm(array $form, FormStateInterface $formStat
   private function getRecipientElements(): array {
     $elements = $this->getWebform()->getElementsDecodedAndFlattened();
 
+    $elementTypes = [
+      'textfield',
+      'cpr_element',
+      'cpr_value_element',
+      'cvr_element',
+      'cvr_value_element',
+    ];
     $elements = array_filter(
       $elements,
-      static function (array $element) {
-        return in_array($element['#type'], ['textfield'], TRUE);
+      static function (array $element) use ($elementTypes) {
+        return in_array($element['#type'], $elementTypes, TRUE);
       }
     );