Merge pull request #191 from michielgerritsen/bugfix/store-name-in-pa…

…yment-description Bugfix: The correct store name is now used when using the {storename} variable in the payment description
mollie · Aug 9, 2019 · 1efe205 · 1efe205
2 parents c17fb32 + df9a374
commit 1efe205
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Helper/General.php b/Helper/General.php
@@ -16,6 +16,7 @@
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\OrderRepository;
+use Magento\Store\Model\Information;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Config\Model\ResourceModel\Config;
 use Magento\Payment\Helper\Data as PaymentHelper;
@@ -859,15 +860,15 @@ public function resetCouponAfterCancellation($order)
     public function getPaymentDescription($method, $orderNumber, $storeId = 0)
     {
         $xpath = str_replace('%method%', 'mollie_methods_' . $method, self::XML_PATH_PAYMENT_DESCRIPTION);
-        $description = $this->getStoreConfig($xpath);
+        $description = $this->getStoreConfig($xpath, $storeId);
 
         if (!trim($description)) {
             $description = '{ordernumber}';
         }
 
         $replacements = [
             '{ordernumber}' => $orderNumber,
-            '{storename}' => $this->storeManager->getStore($storeId)->getName(),
+            '{storename}' => $this->getStoreConfig(Information::XML_PATH_STORE_INFO_NAME, $storeId),
         ];
 
         return str_replace(

diff --git a/Model/Client/Payments.php b/Model/Client/Payments.php
@@ -100,7 +100,7 @@ public function startTransaction(Order $order, $mollieApi)
         $method = $this->mollieHelper->getMethodCode($order);
         $paymentData = [
             'amount'         => $this->mollieHelper->getOrderAmountByOrder($order),
-            'description'    => $this->mollieHelper->getPaymentDescription($method, $order->getIncrementId()),
+            'description'    => $this->mollieHelper->getPaymentDescription($method, $order->getIncrementId(), $storeId),
             'billingAddress' => $this->getAddressLine($order->getBillingAddress()),
             'redirectUrl'    => $this->mollieHelper->getRedirectUrl($orderId, $paymentToken),
             'webhookUrl'     => $this->mollieHelper->getWebhookUrl(),

diff --git a/Test/Unit/Helper/GeneralTest.php b/Test/Unit/Helper/GeneralTest.php
@@ -8,6 +8,8 @@
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Model\Order as OrderModel;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Information;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Mollie\Api\MollieApiClient;
 use Mollie\Api\Resources\Order;
@@ -20,6 +22,11 @@ class GeneralTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+    }
+
     public function returnsTheCorrectDescriptionProvider()
     {
         return [
@@ -31,36 +38,28 @@ public function returnsTheCorrectDescriptionProvider()
         ];
     }
 
-    protected function setUp()
-    {
-        $this->objectManager = new ObjectManager($this);
-    }
-
     /**
      * @dataProvider returnsTheCorrectDescriptionProvider
      */
     public function testReturnsTheCorrectDescription($description, $expected)
     {
         $storeConfigMock = $this->createMock(ScopeConfigInterface::class);
-        $storeManagerMock = $this->createMock(StoreManagerInterface::class);
-        $storeMock = $this->createMock(StoreInterface::class);
-
-        $storeManagerMock->method('getStore')->willReturn($storeMock);
-        $storeMock->method('getName')->willReturn('My Test Store');
-
-        $storeConfigMock->method('getValue')->willReturn($description);
+        $storeConfigMock->method('getValue')
+            ->withConsecutive(
+                ['payment/mollie_methods_ideal/payment_description', ScopeInterface::SCOPE_STORE, 1],
+                [Information::XML_PATH_STORE_INFO_NAME, ScopeInterface::SCOPE_STORE, 1]
+            )
+            ->willReturnOnConsecutiveCalls($description, 'My Test Store');
 
         /** @var MollieHelper $instance */
-        $instance = $this->objectManager->getObject(MollieHelper::class, [
-            'storeManager' => $storeManagerMock,
-        ]);
+        $instance = $this->objectManager->getObject(MollieHelper::class);
 
         // The scopeConfig is burried in the context, use reflection to swap it with our mock
         $property = (new \ReflectionObject($instance))->getProperty('scopeConfig');
         $property->setAccessible(true);
         $property->setValue($instance, $storeConfigMock);
 
-        $result = $instance->getPaymentDescription('ideal', '0000025');
+        $result = $instance->getPaymentDescription('ideal', '0000025', 1);
 
         $this->assertSame($expected, $result);
     }