Merge pull request #592 from FatchipRobert/MAG2-356-GooglePay-MerchantId

MAG2-356 - Added MerchantId configuration for GooglePay production mode

Author: jvarelmann

Model/Methods/GooglePay.php

@@ -149,6 +149,7 @@ public function getFrontendConfig()
         return [
             'merchantId' => $this->getMerchantId(),
             'storeName' => $this->getStoreName(),
+            'googlePayMerchantId' => $this->shopHelper->getConfigParam('google_pay_merchant_id', PayoneConfig::METHOD_GOOGLE_PAY, 'payment'),
             'operationMode' => $this->getOperationMode(),
         ];
     }

Test/Unit/Model/Methods/GooglePayTest.php

@@ -137,6 +137,7 @@ public function testGetFrontendConfig()
         $expected = [
             'merchantId' => $expectedConfigParam,
             'storeName' => $expectedConfigParam,
+            'googlePayMerchantId' => $expectedConfigParam,
             'operationMode' => $expectedConfigParam,
         ];
 
@@ -148,6 +149,7 @@ public function testGetFrontendConfigNoStoreConfig()
     {
         $expectedConfigParam = "testValue";
         $expectedStoreName = "storeFrontendName";
+        $expectedGooglePayMerchantId = "testValue";
 
         $this->quote->method('getStore')->willReturn($this->store);
         $this->store->method('getFrontendName')->willReturn($expectedStoreName);
@@ -157,13 +159,15 @@ public function testGetFrontendConfigNoStoreConfig()
                 ['mid', PayoneConfig::METHOD_GOOGLE_PAY, 'payone_payment', 'test', $expectedConfigParam],
                 ['mid', 'global', 'payone_general', null, $expectedConfigParam],
                 ['store_name', PayoneConfig::METHOD_GOOGLE_PAY, 'payment', 'test', null],
+                ['google_pay_merchant_id', PayoneConfig::METHOD_GOOGLE_PAY, 'payment', null, $expectedGooglePayMerchantId],
                 ['mode', PayoneConfig::METHOD_GOOGLE_PAY, 'payone_payment', 'test', $expectedConfigParam],
             ]
         );
 
         $expected = [
             'merchantId' => $expectedConfigParam,
             'storeName' => $expectedStoreName,
+            'googlePayMerchantId' => $expectedGooglePayMerchantId,
             'operationMode' => $expectedConfigParam,
         ];
 
@@ -174,6 +178,7 @@ public function testGetFrontendConfigNoStoreConfig()
     public function testGetFrontendConfigStoreDoubleEmpty()
     {
         $expectedConfigParam = "testValue";
+        $expectedGooglePayMerchantId = "testValue";
 
         $this->quote->method('getStore')->willReturn(null);
 
@@ -182,13 +187,15 @@ public function testGetFrontendConfigStoreDoubleEmpty()
                 ['mid', PayoneConfig::METHOD_GOOGLE_PAY, 'payone_payment', 'test', $expectedConfigParam],
                 ['mid', 'global', 'payone_general', null, $expectedConfigParam],
                 ['store_name', PayoneConfig::METHOD_GOOGLE_PAY, 'payment', 'test', null],
+                ['google_pay_merchant_id', PayoneConfig::METHOD_GOOGLE_PAY, 'payment', null, $expectedGooglePayMerchantId],
                 ['mode', PayoneConfig::METHOD_GOOGLE_PAY, 'payone_payment', 'test', $expectedConfigParam],
             ]
         );
 
         $expected = [
             'merchantId' => $expectedConfigParam,
             'storeName' => 'Online Store',
+            'googlePayMerchantId' => $expectedGooglePayMerchantId,
             'operationMode' => $expectedConfigParam,
         ];
 

etc/adminhtml/system/payone_google_pay.xml

@@ -45,6 +45,11 @@
             <label>Instructions</label>
             <config_path>payment/payone_google_pay/instructions</config_path>
         </field>
+        <field id="google_pay_merchant_id" translate="label,comment" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>GooglePay MerchantId</label>
+            <config_path>payment/payone_google_pay/google_pay_merchant_id</config_path>
+            <comment>Needed for Live mode.</comment>
+        </field>
         <field id="store_name" translate="label,comment" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Store Name</label>
             <config_path>payment/payone_google_pay/store_name</config_path>

view/frontend/web/js/view/payment/method-renderer/google_pay-method.js

@@ -228,6 +228,11 @@ define(
                 paymentDataRequest.merchantInfo = {
                     merchantName: this.getFrontendConfigParam('storeName')
                 };
+
+                if (this.getFrontendConfigParam('operationMode') == "live") {
+                    paymentDataRequest.merchantInfo.merchantId = this.getFrontendConfigParam('googlePayMerchantId');
+                }
+
                 return paymentDataRequest;
             },
             addGooglePayButton: function () {