Merge branch 'config-fixes' into checkout-fixes

oxipay · Mar 23, 2017 · 81130f1 · 81130f1
2 parents e9d1185 + 3c49c76
commit 81130f1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/Oxipay/OxipayPaymentGateway/Controller/Checkout/SaveOrder.php b/Oxipay/OxipayPaymentGateway/Controller/Checkout/SaveOrder.php
@@ -1,8 +1,4 @@
 <?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
 namespace Oxipay\OxipayPaymentGateway\Controller\Checkout;
 
 use Magento\Framework\DataObject;
@@ -18,7 +14,7 @@ public function execute()
             'x_account_id'=>$this->getRequest()->getParam('x_account_id'),
             'x_reference'=>$this->getRequest()->getParam('x_reference'),
             'x_currency' =>$this->getRequest()->getParam('x_currency'),
-            'x_test'=>$this->getRequest()->getParam('x_test'),
+            'x_test'=>'false',
             'x_amount' => $this->getRequest()->getParam('x_amount'),
             'x_gateway_reference'=>$this->getRequest()->getParam('x_gateway_reference'),
             'x_timestamp' => $this->getRequest()->getParam('x_timestamp'),

diff --git a/Oxipay/OxipayPaymentGateway/Gateway/Request/AuthorizationRequest.php b/Oxipay/OxipayPaymentGateway/Gateway/Request/AuthorizationRequest.php
@@ -84,7 +84,7 @@ public function build(array $buildSubject)
 			'x_customer_shipping_city' => $shippingaddress->getCity(),
 			'x_customer_shipping_state' => $shippingaddress->getRegionCode(),
 			'x_customer_shipping_zip' => $shippingaddress->getPostcode(),
-			'x_test' => $this->config->getValue('test_mode', $order->getStoreId()) ? 'true' : 'false'
+			'x_test' => 'false'
         ];
 
         $merchantkey = $this->config->getValue(

diff --git a/Oxipay/OxipayPaymentGateway/etc/adminhtml/system.xml b/Oxipay/OxipayPaymentGateway/etc/adminhtml/system.xml
@@ -35,10 +35,6 @@
                 <field id="debug" translate="label" type="select" sortOrder="85" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Debug</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-				<field id="test_mode" translate="label" type="select" sortOrder="85" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Test Mode</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="allowspecific" translate="label" type="hidden" sortOrder="86" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Payment from Applicable Countries</label>

diff --git a/Oxipay/OxipayPaymentGateway/etc/config.xml b/Oxipay/OxipayPaymentGateway/etc/config.xml
@@ -15,7 +15,6 @@
                 <title>Oxipay</title>
                 <description>Pay the easier way</description>
                 <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
-                <test_mode>0</test_mode>
                 <gateway_url>https://secure.oxipay.com.au/Checkout?platform=default</gateway_url>
                 <allowspecific>1</allowspecific>
                 <specificcountry>AU,NZ</specificcountry>