Alternate fix for Mollie url issue #6

Author: eileenmcnaughton

CRM/Core/Payment/OmnipayMultiProcessor.php

@@ -810,12 +810,14 @@ public function processPaymentNotification($params) {
     $_REQUEST = $params;
     try {
       $response = $this->gateway->completePurchase($params)->send();
-
       if ($response->getTransactionId()) {
         $this->setTransactionID($response->getTransactionId());
       }
     }
     catch (\Omnipay\Common\Exception\InvalidRequestException $e) {
+      $q = explode('/', CRM_Utils_Array::value(CRM_Core_Config::singleton()->userFrameworkURLVar, $_GET, ''));
+      array_pop($q);
+      $this->setTransactionID(array_pop($q));
       $this->redirectOrExit('success');
     }
 

CRM/Core/Payment/PaymentExtended.php

@@ -184,7 +184,7 @@ protected function getGoBackUrl($qfKey) {
   protected function getNotifyUrl($allowLocalHost = FALSE) {
     if (omnipaymultiprocessor__versionAtLeast(4.6)) {
       $url = CRM_Utils_System::url(
-        'civicrm/payment/ipn/' . $this->_paymentProcessor['id'],
+        'civicrm/payment/ipn/' . $this->transaction_id . '/' . $this->_paymentProcessor['id'],
         array(),
         TRUE,
         NULL,
@@ -214,9 +214,7 @@ protected function getNotifyUrl($allowLocalHost = FALSE) {
    */
   protected function storeReturnUrls($qfKey, $participantID = NULL, $eventID = NULL) {
     CRM_Core_Session::singleton()->set("ipn_success_url_{$this->transaction_id}", $this->getReturnSuccessUrl($qfKey));
-    CRM_Core_Session::singleton()->set("ipn_success_url_fallback", $this->getReturnSuccessUrl($qfKey));
     CRM_Core_Session::singleton()->set("ipn_fail_url_{$this->transaction_id}", $this->getReturnFailUrl($qfKey, $participantID, $eventID));
-    CRM_Core_Session::singleton()->set("ipn_fail_url_fallback", $this->getReturnFailUrl($qfKey, $participantID, $eventID));
   }
 
   /**
@@ -239,7 +237,7 @@ protected function storeTransparentRedirectFormData($key, $data) {
    *   Url to redirect to
    */
   protected function getStoredUrl($type) {
-    return CRM_Core_Session::singleton()->get("ipn_{$type}_url_" . ($this->transaction_id ? : 'fallback'));
+    return CRM_Core_Session::singleton()->get("ipn_{$type}_url_{$this->transaction_id}");
   }
 
   /**