Merge pull request #2 from appinlet/1.0.1

2022-04-11: v1.0.1: Hotfix whitespace issue.

Author: bruce-atkinson

README.md

@@ -1,14 +1,14 @@
 # DPO_OpenCart
 
-## DPO Group plugin v1.0.0 for OpenCart v1.0.0
+## DPO Group plugin v1.0.1 for OpenCart v3.0.3.x
 
 This is the DPO Group plugin for OpenCart. Please feel free to contact
 the [DPO Group support team](https://dpogroup.com/contact-us/) should you require any assistance.
 
 ## Installation
 
 Please navigate to the [releases page](https://github.com/DPO-Group/DPO_OpenCart/releases), download the
-latest release (v1.0.0) and unzip. You will then be able to follow the integration guide PDF which is included in the
+latest release (v1.0.1) and unzip. You will then be able to follow the integration guide PDF which is included in the
 zip.
 
 ## Collaboration

changelog.txt

@@ -1,4 +1,6 @@
 =====================================
 Date	  : Version: Description
 =====================================
+2022-04-11: v1.0.1: Hotfix whitespace issue.
+
 2021-07-30: v1.0.0 : Initial release.

upload/catalog/model/extension/payment/dpopay.php

@@ -10,7 +10,7 @@
 
 class dpopay
 {
-    const DPO_URL_TEST = 'https://secure1.sandbox.directpay.online';
+    const DPO_URL_TEST = 'https://secure.3gdirectpay.com';
     const DPO_URL_LIVE = 'https://secure.3gdirectpay.com';
 
     private $dpoUrl;
@@ -78,32 +78,7 @@ public function createToken($data)
 
         $odate   = date('Y/m/d H:i');
         $postXml = <<<POSTXML
-        <?xml version="1.0" encoding="utf-8"?>
-        <API3G>
-        <CompanyToken>$compToken</CompanyToken>
-        <Request>createToken</Request>
-        <Transaction>
-        <PaymentAmount>$paymentAmount</PaymentAmount>
-        <PaymentCurrency>$paymentCurrency</PaymentCurrency>
-        <CompanyRef>$reference</CompanyRef>
-        <customerFirstName>$customerFirstName</customerFirstName>
-        <customerLastName>$customerLastName</customerLastName>
-        <customerAddress>$customerAddress</customerAddress>
-        <customerCity>$customerCity</customerCity>
-        <customerPhone>$customerPhone</customerPhone>
-        <RedirectURL>$redirectURL</RedirectURL>
-        <BackURL>$backURL</BackURL>
-        <customerEmail>$customerEmail</customerEmail>
-        <TransactionSource>opencart</TransactionSource>
-        </Transaction>
-        <Services>
-        <Service>
-        <ServiceType>$accountType</ServiceType>
-        <ServiceDescription>$reference</ServiceDescription>
-        <ServiceDate>$odate</ServiceDate>
-        </Service>
-        </Services>
-        </API3G>
+        <?xml version="1.0" encoding="utf-8"?> <API3G> <CompanyToken>$compToken</CompanyToken> <Request>createToken</Request> <Transaction> <PaymentAmount>$paymentAmount</PaymentAmount> <PaymentCurrency>$paymentCurrency</PaymentCurrency> <CompanyRef>$reference</CompanyRef> <customerFirstName>$customerFirstName</customerFirstName> <customerLastName>$customerLastName</customerLastName> <customerAddress>$customerAddress</customerAddress> <customerCity>$customerCity</customerCity> <customerPhone>$customerPhone</customerPhone> <RedirectURL>$redirectURL</RedirectURL> <BackURL>$backURL</BackURL> <customerEmail>$customerEmail</customerEmail> <TransactionSource>opencart</TransactionSource> </Transaction> <Services> <Service> <ServiceType>$accountType</ServiceType> <ServiceDescription>$reference</ServiceDescription> <ServiceDate>$odate</ServiceDate> </Service> </Services> </API3G>
 POSTXML;
 
         $curl = curl_init();