Refactor add card metadata comment history

Author: aashwin-rvvup

src/Service/Card/CardMetaService.php

@@ -57,22 +57,23 @@ public function process(array $rvvupPaymentResponse, OrderInterface $order)
             ];
 
         $payment = $order->getPayment();
+        $message = "<strong>Rvvup Card Data:</strong> <br />";
+        $addHistoryComment = false;
         foreach ($keys as $key) {
             if (isset($rvvupPaymentResponse[$key])) {
-                $value = $this->mapCardValue($rvvupPaymentResponse[$key]);
                 $payment->setAdditionalInformation(Method::PAYMENT_TITLE_PREFIX . $key, $rvvupPaymentResponse[$key]);
-                $data[$key] = $key . ': ' . $value;
+                $message .= $key . ': ' . $this->mapCardValue($rvvupPaymentResponse[$key]) . ' <br />';
+                $addHistoryComment = true;
             }
         }
-        if (!empty($data)) {
+        if ($addHistoryComment) {
             try {
                 $historyComment = $this->orderStatusHistoryFactory->create();
                 $historyComment->setParentId($order->getEntityId());
                 $historyComment->setIsCustomerNotified(0);
                 $historyComment->setIsVisibleOnFront(0);
                 $historyComment->setStatus($order->getStatus());
-                $message = __("<strong>Rvvup Card Data:</strong> <br />" . implode("<br />", $data));
-                $historyComment->setComment($message);
+                $historyComment->setComment(__($message));
                 $this->orderManagement->addComment($order->getEntityId(), $historyComment);
             } catch (\Exception $e) {
                 $this->logger->error('Rvvup cards metadata comment failed with exception: ' . $e->getMessage());