FEAT #12510 TIME 0:30 Merge custom fields contacts

src/app/contact/controllers/ContactController.php

@@ -511,7 +511,9 @@ class ContactController
         $afnorAddress[4] = substr($args['address_number'].' '.$args['address_street'], 0, 38);
 
         // Ligne 5
-        $afnorAddress[5] = '';
+        if (!empty($args['address_additional2'])) {
+            $afnorAddress[5] = substr($args['address_additional2'], 0, 38);
+        }
 
         // Ligne 6
         $args['address_postcode'] = strtoupper($args['address_postcode']);

src/app/contentManagement/controllers/MergeController.php

@@ -180,13 +180,18 @@ class MergeController
                     'id' => $args['recipientId'],
                     'select' => [
                         'civility', 'firstname', 'lastname', 'company', 'department', 'function', 'address_number', 'address_street', 'address_town',
-                        'address_additional1', 'address_additional2', 'address_postcode', 'address_town', 'address_country', 'phone', 'email'
+                        'address_additional1', 'address_additional2', 'address_postcode', 'address_town', 'address_country', 'phone', 'email', 'custom_fields'
                     ]
                 ]);
                 $recipient['civility'] = ContactModel::getCivilityLabel(['civilityId' => $recipient['civility']]);
                 $postalAddress = ContactController::getContactAfnor($recipient);
                 unset($postalAddress[0]);
                 $recipient['postal_address'] = implode("\n", $postalAddress);
+                $customFields = json_decode($recipient['custom_fields'], true);
+                unset($recipient['custom_fields']);
+                foreach ($customFields as $key => $customField) {
+                    $recipient["customField_{$key}"] = is_array($customField) ?  implode("\n", $customField) : $customField;
+                }
             } elseif ($args['recipientType'] == 'user') {
                 $recipient = UserModel::getById(['id' => $args['recipientId'], 'select' => ['firstname', 'lastname']]);
             } elseif ($args['recipientType'] == 'entity') {