Fix swish payment methods when running it with the swish app (#793)

* For some payment methods like swish with resultCode pending we store this into the property adyenPaymentData instead of paymentData. Check if adyenPaymentData exists if so add this as paymentData in request. This will solve issues for Swish payment method. We need to refactor a lot of code to make everywhere to use consistency in the naming this will be a separate story to be picked up.

* Update Controller/Process/Result.php

* Update Controller/Process/Result.php

* Update Controller/Process/Result.php
Co-authored-by: Alessio Zampatti <alessio.zampatti@adyen.com>
Co-authored-by: Ángel Campos <angel.campos@adyen.com>
Co-authored-by: Alessio Zampatti <alessio.zampatti@adyen.com>

Controller/Process/Result.php

@@ -390,11 +390,29 @@ class Result extends \Magento\Framework\App\Action\Action
         $request = [];
 
         if (!empty($this->_session->getLastRealOrder()) &&
-            !empty($this->_session->getLastRealOrder()->getPayment()) &&
-            !empty($this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation("paymentData"))
+            !empty($this->_session->getLastRealOrder()->getPayment())
         ) {
-            $request['paymentData'] = $this->_session->getLastRealOrder()->getPayment()->
-            getAdditionalInformation("paymentData");
+            if (!empty($this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation('paymentData'))) {
+                $request['paymentData'] = $this->_session->getLastRealOrder()->getPayment()->
+                getAdditionalInformation('paymentData');
+
+                // remove paymentData from db
+                $this->_session->getLastRealOrder()->getPayment()->unsAdditionalInformation('paymentData');
+                $this->_session->getLastRealOrder()->getPayment()->save();
+            }
+
+            // for pending payment that redirect we store this under adyenPaymentData
+            // TODO: refactor the code in the plugin that all paymentData is stored in paymentData and not in adyenPaymentData
+            if (!empty($this->_session->getLastRealOrder()->getPayment()->getAdditionalInformation('adyenPaymentData'))) {
+                $request['paymentData'] = $this->_session->getLastRealOrder()->getPayment()->
+                getAdditionalInformation("adyenPaymentData");
+
+                // remove paymentData from db
+                $this->_session->getLastRealOrder()->getPayment()->unsAdditionalInformation('adyenPaymentData');
+                $this->_session->getLastRealOrder()->getPayment()->save();
+            }
+        } else {
+            $this->_adyenLogger->addError("Can't load the order id from the session");
         }
 
         $request["details"] = $response;