Merge pull request #22 from RichardCardGate/master

Fix: add-on compatibility.

app/addons/cardgate/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <addon scheme="3.0" edition_type="ROOT,ULT:VENDOR">
     <id>cardgate</id>
-    <version>4.5.0</version>
+    <version>1.0</version>
     <default_language>en</default_language>
     <priority>100</priority>
     <status>active</status>

app/addons/cardgate/func.php

@@ -23,7 +23,8 @@ function fn_cardgate_install_payment_processors(){
 		'Paysafecash' => 'paysafecash',
 		'Przelewy24' => 'przelewy24',
 		'Sofortbanking' => 'sofortbanking',
-		'SofortPay' => 'sofortpay'
+		'SofortPay' => 'sofortpay',
+		'SprayPay' => 'spraypay'
 	);
 
 	foreach ($payments as $naam => $paymentcode) {

app/payments/cardgate/cardgate-clientlib-php/composer.json

@@ -2,7 +2,7 @@
 	"name": "cardgate/cardgate-clientlib-php",
 	"description": "CardGate API client library for PHP",
 	"homepage": "https://github.com/cardgate/cardgate-clientlib-php",
-	"version": "1.1.12",
+	"version": "1.1.15",
 	"license": "MIT",
 	"authors": [
 		{
@@ -19,7 +19,8 @@
 		"afterpay", "bitcoin", "directdebit"
 	],
 	"require" : {
-		"php": "~5.6.0|~7.0.0|~7.1.0|~7.2.0|~7.3.0"
+		"php": "~5.6.0|~7.0.0|~7.1.0|~7.2.0|~7.3.0|~7.4.0",
+		"ext-json": "*"
 	},
 	"autoload": {
 		"psr-4": {

app/payments/cardgate/cardgate-clientlib-php/src/Client.php

@@ -35,7 +35,7 @@ final class Client {
 		/**
 		 * Client version.
 		 */
-		const CLIENT_VERSION = "1.1.12";
+		const CLIENT_VERSION = "1.1.15";
 
 		/**
 		 * Url to use for production.
@@ -382,46 +382,12 @@ public function getLastResult() {
 		 * @access public
 		 * @api
 		 */
-		static public function pullConfig( $sToken_, $bTestmode_ = FALSE ) {
+		public function pullConfig( $sToken_ ) {
 			if ( ! is_string( $sToken_ ) ) {
 				throw new Exception( 'Client.Token.Invalid', 'invalid token for settings pull: ' . $sToken_ );
 			}
-
 			$sResource = "pullconfig/{$sToken_}/";
-			$sUrl = ( $bTestmode_ ? self::URL_STAGING : self::URL_PRODUCTION ) . $sResource;
-
-			$rCh = curl_init();
-			curl_setopt( $rCh, CURLOPT_URL, $sUrl );
-			curl_setopt( $rCh, CURLOPT_RETURNTRANSFER, 1 );
-			curl_setopt( $rCh, CURLOPT_TIMEOUT, 60 );
-			curl_setopt( $rCh, CURLOPT_HEADER, FALSE );
-			curl_setopt( $rCh, CURLOPT_HTTPHEADER, [
-				'Content-Type: application/json',
-				'Accept: application/json'
-			] );
-			if ( $bTestmode_ ) {
-				curl_setopt( $rCh, CURLOPT_SSL_VERIFYPEER, FALSE );
-				curl_setopt( $rCh, CURLOPT_SSL_VERIFYHOST, 0 );
-			} else {
-				curl_setopt( $rCh, CURLOPT_SSL_VERIFYPEER, TRUE ); // verify SSL peer
-				curl_setopt( $rCh, CURLOPT_SSL_VERIFYHOST, 2 ); // check for valid common name and verify host
-			}
-
-			if ( FALSE == ( $sResults = curl_exec( $rCh ) ) ) {
-				$sError = curl_error( $rCh );
-				curl_close( $rCh );
-				throw new Exception( 'Client.Request.Curl.Error', $sError );
-			} else {
-				curl_close( $rCh );
-			}
-			if ( NULL === ( $aResults = json_decode( $sResults, TRUE ) ) ) {
-				throw new Exception( 'Client.Request.JSON.Invalid', 'remote gave invalid JSON: ' . $sResults );
-			}
-			if ( isset( $aResults['error'] ) ) {
-				throw new Exception( 'Client.Request.Remote.' . $aResults['error']['code'], $aResults['error']['message'] );
-			}
-
-			return $aResults;
+			return $this->doRequest($sResource);
 		}
 
 		/**
@@ -536,7 +502,7 @@ public function doRequest( $sResource_, $aData_ = NULL, $sHttpMethod_ = 'POST' )
 			}
 
 			if ( 'POST' == $sHttpMethod_ ) {
-				$this->_sLastRequest = json_encode( $aData_ );
+				$this->_sLastRequest = json_encode( $aData_, JSON_PARTIAL_OUTPUT_ON_ERROR );
 				curl_setopt( $rCh, CURLOPT_URL, $sUrl );
 				curl_setopt( $rCh, CURLOPT_POST, TRUE );
 				curl_setopt( $rCh, CURLOPT_POSTFIELDS, $this->_sLastRequest );

app/payments/cardgate/cardgate-clientlib-php/src/Method.php

@@ -132,6 +132,16 @@ final class Method {
 		 */
 		const GIFTCARD = 'giftcard';
 
+		/**
+		 * EPS
+		 */
+		const EPS = 'eps';
+
+		/**
+		 * SprayPay
+		 */
+		const SPRAYPAY = 'spraypay';
+
 		/**
 		 * The client associated with this payment method.
 		 * @var Client

app/payments/cardgate/cardgate-clientlib-php/tests/apiUnitTest.php

@@ -3,17 +3,8 @@ class apiUnitTest extends \PHPUnit\Framework\TestCase {
 
 	private $_oClient;
 
-	protected function setUp() {
-		$this->_oClient = new cardgate\api\Client( 1, 'fake_key', TRUE );
-		parent::setUp();
-	}
-
-	protected function tearDown() {
-		$this->_oClient = NULL;
-		parent::tearDown();
-	}
-
 	public function testCreateClientInstance() {
+		$this->_oClient = new cardgate\api\Client( 1, 'fake_key', TRUE );
 		$this->_oClient->setLanguage( 'nl' );
 		$this->assertEquals( 'nl', $this->_oClient->getLanguage(), 'language not set' );
 		$this->_oClient->version()->setPlatformName( 'PHP' );
@@ -24,6 +15,7 @@ public function testCreateClientInstance() {
 		$this->assertEquals( 'Test Implementation', $this->_oClient->version()->getPluginName(), 'plugin name not set' );
 		$this->_oClient->version()->setPluginVersion( '0.0.1' );
 		$this->assertEquals( '0.0.1', $this->_oClient->version()->getPluginVersion(), 'plugin version not set' );
+		$this->_oClient = NULL;
 	}
 
 }

app/payments/cardgate/cardgate.php

@@ -100,7 +100,7 @@ class Cardgate
     // version
     const pluginName = 'cs_cart';
 
-    const pluginVersion = '4.5.0';
+    const pluginVersion = '4.5.1';
 
     public function __construct($merchant_id, $api_key, $site_id)
     {

app/payments/cardgatespraypay.php

@@ -0,0 +1,7 @@
+<?php
+$paymentcode = 'spraypay';
+$filename = 'cardgatespraypay';
+$redirect = true;
+
+include_once 'cardgate/base.php';
+?>

design/backend/templates/views/payments/components/cc_processors/cardgatespraypay.tpl

@@ -0,0 +1 @@
+<p>{__("text_cardgate_settings")}</p>