From 2d71d58ab8a2a1ae56bbb98496cf930acf5ad5f3 Mon Sep 17 00:00:00 2001 From: Ricardo Jacobs Date: Wed, 8 Jun 2016 11:00:55 +0200 Subject: [PATCH] Also use store url at redirecturl. --- app/code/community/Mollie/Mpm/controllers/ApiController.php | 5 ++++- changelog.mdown | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/code/community/Mollie/Mpm/controllers/ApiController.php b/app/code/community/Mollie/Mpm/controllers/ApiController.php index 883c58df..537c4f12 100644 --- a/app/code/community/Mollie/Mpm/controllers/ApiController.php +++ b/app/code/community/Mollie/Mpm/controllers/ApiController.php @@ -167,10 +167,13 @@ public function paymentAction () $session->setMollieQuoteId($session->getQuoteId()); } + $store_code = Mage::app()->getStore()->getCode(); + $store_url = Mage::app()->getStore($store_code)->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK); + // Assign required value's $amount = $this->getAmount($order); $description = str_replace('%', $order->getIncrementId(), Mage::helper('mpm/data')->getConfig('mollie', 'description')); - $redirect_url = Mage::getUrl('mpm/api/return') . '?order_id=' . intval($order_id) . '&utm_nooverride=1'; + $redirect_url = str_replace('/admin/', $store_url, Mage::getUrl('mpm/api/return') . '?order_id=' . intval($order_id) . '&utm_nooverride=1'); $method = $this->getRequest()->getParam('method_id', NULL); $issuer = $this->getRequest()->getParam('issuer', NULL); diff --git a/changelog.mdown b/changelog.mdown index b4960d0b..c1e9e80e 100644 --- a/changelog.mdown +++ b/changelog.mdown @@ -3,7 +3,7 @@ # Changelog # ## Changes in release 4.2.3 ## -+ Using store url at webhook to truly enable multistore functions. ++ Using store url at webhook/redirecturl to truly enable multistore functions. + Added bank transfer due date (This will send a email to the customer when he/she uses bank transfer) ## Changes in release 4.2.2 ##