Merge pull request #38 from wirecard/TPWDCEE-685

Tpwdcee 685
qenta-cee · Jan 24, 2018 · 3a38258 · 3a38258
2 parents 57cf415 + 83aac9d
commit 3a38258
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/gambio_updater/updates/wcp_2.0/configuration.ini b/gambio_updater/updates/wcp_2.0/configuration.ini
@@ -1,6 +1,6 @@
 [update_properties]
-version = 2.2.3
-name = Wirecard WCP v2.2.5
+version = 2.2.6
+name = Wirecard WCP v2.2.6
 key = wcp
 revision = 0
 type = update

diff --git a/includes/modules/payment/wcp.php b/includes/modules/payment/wcp.php
@@ -40,7 +40,7 @@
 
 define('TABLE_PAYMENT_WCP', 'payment_wirecard_checkout_page');
 define('INIT_SERVER_URL', 'https://checkout.wirecard.com/page/init-server.php');
-define('WCP_PLUGIN_VERSION', '2.2.5');
+define('WCP_PLUGIN_VERSION', '2.2.6');
 define('WCP_PLUGIN_NAME', 'GambioGX2_WCP');
 define('MODULE_PAYMENT_WCP_WINDOW_NAME', 'wirecardCheckoutPageIFrame');
 
@@ -115,10 +115,8 @@ function process_button() {
 		    $consumerDeviceId = md5($customerId . "_" . $timestamp);
 		    $_SESSION['wcp-consumerDeviceId'] = $consumerDeviceId;
 	    }
-	    $ratepay = '<script language="JavaScript">var di = {t:"'.$consumerDeviceId.'",v:"WDWL",l:"Checkout"};</script>';
-	    $ratepay .= '<script type="text/javascript" src="//d.ratepay.com/'.$consumerDeviceId.'/di.js"></script>';
-	    $ratepay .= '<noscript><link rel="stylesheet" type="text/css" href="//d.ratepay.com/di.css?t='.$consumerDeviceId.'&v=WDWL&l=Checkout"></noscript>';
-	    $ratepay .= '<object type="application/x-shockwave-flash" data="//d.ratepay.com/WDWL/c.swf" width="0" height="0"><param name="movie" value="//d.ratepay.com/WDWL/c.swf" /><param name="flashvars" value="t='.$consumerDeviceId.'&v=WDWL"/><param name="AllowScriptAccess" value="always"/></object>';
+
+       $ratepay = "";
 
 	    return $ratepay;
     }

diff --git a/includes/modules/payment/wcp_installment.php b/includes/modules/payment/wcp_installment.php
@@ -154,11 +154,15 @@ function process_button() {
 			$consumerDeviceId = md5($customerId . "_" . $timestamp);
 			$_SESSION['wcp-consumerDeviceId'] = $consumerDeviceId;
 		}
-		$ratepay = '<script language="JavaScript">var di = {t:"'.$consumerDeviceId.'",v:"WDWL",l:"Checkout"};</script>';
-		$ratepay .= '<script type="text/javascript" src="//d.ratepay.com/'.$consumerDeviceId.'/di.js"></script>';
-		$ratepay .= '<noscript><link rel="stylesheet" type="text/css" href="//d.ratepay.com/di.css?t='.$consumerDeviceId.'&v=WDWL&l=Checkout"></noscript>';
-		$ratepay .= '<object type="application/x-shockwave-flash" data="//d.ratepay.com/WDWL/c.swf" width="0" height="0"><param name="movie" value="//d.ratepay.com/WDWL/c.swf" /><param name="flashvars" value="t='.$consumerDeviceId.'&v=WDWL"/><param name="AllowScriptAccess" value="always"/></object>';
-		$process_button_string .= $ratepay;
+
+        if(wcp_core::constant("MODULE_PAYMENT_WCP_INSTALLMENT_PROVIDER") == "RatePay")
+        {
+            $ratepay = '<script language="JavaScript">var di = {t:"'.$consumerDeviceId.'",v:"WDWL",l:"Checkout"};</script>';
+            $ratepay .= '<script type="text/javascript" src="//d.ratepay.com/'.$consumerDeviceId.'/di.js"></script>';
+            $ratepay .= '<noscript><link rel="stylesheet" type="text/css" href="//d.ratepay.com/di.css?t='.$consumerDeviceId.'&v=WDWL&l=Checkout"></noscript>';
+            $ratepay .= '<object type="application/x-shockwave-flash" data="//d.ratepay.com/WDWL/c.swf" width="0" height="0"><param name="movie" value="//d.ratepay.com/WDWL/c.swf" /><param name="flashvars" value="t='.$consumerDeviceId.'&v=WDWL"/><param name="AllowScriptAccess" value="always"/></object>';
+            $process_button_string .= $ratepay;
+        }
 
 		return $process_button_string;
 	}

diff --git a/includes/modules/payment/wcp_invoice.php b/includes/modules/payment/wcp_invoice.php
@@ -155,11 +155,15 @@ function process_button() {
 		    $consumerDeviceId = md5($customerId . "_" . $timestamp);
 		    $_SESSION['wcp-consumerDeviceId'] = $consumerDeviceId;
 	    }
-	    $ratepay = '<script language="JavaScript">var di = {t:"'.$consumerDeviceId.'",v:"WDWL",l:"Checkout"};</script>';
-	    $ratepay .= '<script type="text/javascript" src="//d.ratepay.com/'.$consumerDeviceId.'/di.js"></script>';
-	    $ratepay .= '<noscript><link rel="stylesheet" type="text/css" href="//d.ratepay.com/di.css?t='.$consumerDeviceId.'&v=WDWL&l=Checkout"></noscript>';
-	    $ratepay .= '<object type="application/x-shockwave-flash" data="//d.ratepay.com/WDWL/c.swf" width="0" height="0"><param name="movie" value="//d.ratepay.com/WDWL/c.swf" /><param name="flashvars" value="t='.$consumerDeviceId.'&v=WDWL"/><param name="AllowScriptAccess" value="always"/></object>';
-	    $process_button_string .= $ratepay;
+
+        if(wcp_core::constant("MODULE_PAYMENT_WCP_INVOICE_PROVIDER") == "RatePay")
+        {
+            $ratepay = '<script language="JavaScript">var di = {t:"'.$consumerDeviceId.'",v:"WDWL",l:"Checkout"};</script>';
+            $ratepay .= '<script type="text/javascript" src="//d.ratepay.com/'.$consumerDeviceId.'/di.js"></script>';
+            $ratepay .= '<noscript><link rel="stylesheet" type="text/css" href="//d.ratepay.com/di.css?t='.$consumerDeviceId.'&v=WDWL&l=Checkout"></noscript>';
+            $ratepay .= '<object type="application/x-shockwave-flash" data="//d.ratepay.com/WDWL/c.swf" width="0" height="0"><param name="movie" value="//d.ratepay.com/WDWL/c.swf" /><param name="flashvars" value="t='.$consumerDeviceId.'&v=WDWL"/><param name="AllowScriptAccess" value="always"/></object>';
+            $process_button_string .= $ratepay;
+        }
 
 	    return $process_button_string;
     }