Merge pull request #21 from wirecard/TPWDCEE-1773

Tpwdcee 1773
qenta-cee · Jul 30, 2018 · d4362c9 · d4362c9
2 parents 1f97022 + 9837e73
commit d4362c9
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
-# Wirecard Checkout Page plugin for VirtueMart 3.0
+# Wirecard Checkout Page plugin for VirtueMart 3
 
 [![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](https://raw.githubusercontent.com/wirecard/VirtueMart3-WCP/master/LICENSE)
 [![PHP v5.6](https://img.shields.io/badge/PHP-v5.6-yellow.svg)](http://www.php.net)
+[![Joomla v3.8.10](https://img.shields.io/badge/Joomla-v3.8.10-green.svg)](https://www.joomla.org)
+[![VirtueMart v3.2.14](https://img.shields.io/badge/VirtueMart-v3.2.14-green.svg)](https://www.virtuemart.de/)
 
-Wirecard Checkout Page plugin for VirtueMart 3.0
+Wirecard Checkout Page plugin for VirtueMart 3
 
-Tested with	Joomla 3.8.3/VirtueMart 3.2.12.
+Tested with	Joomla 3.8.10/VirtueMart 3.2.14.
 
 Our [Online Guides](https://guides.wirecard.at/) provide further information on payment methods and additional features. Please observe our [terms of use](https://guides.wirecard.at/shop_plugins:info#terms_of_use) regarding plugins.
 

diff --git a/language/de-DE/de-DE.plg_vmpayment_wirecardceecheckout.ini b/language/de-DE/de-DE.plg_vmpayment_wirecardceecheckout.ini
@@ -7,16 +7,10 @@
 VMPAYMENT_WIRECARDCEECHECKOUT = "Wirecard Checkout Page"
 
 VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_TITLE = "<strong>Wirecard Checkout Page</strong>"
-VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION = "<div>
-    <a href="https://www.wirecard.at/" target="_blank" title="www.wirecard.at"><img src="../images/stories/virtuemart/payment/wirecard.png" /></a><br />
-    <h3>Wirecard - Your Full Service Payment Provider - Comprehensive solutions from one single source</h3>Wirecard is one of the world's leading providers of outsourcing and white label solutions for electronic payment transactions.<br /><br /> As independent provider of payment solutions, we accompany our customers along the entire business development. Our payment solutions are perfectly tailored to suit e-Commerce requirements and have made us Austria's leading payment service provider. Customization, competence, and commitment.<br />
-    <br />
-    <p><a href=\"https://guides.wirecard.at/doku.php/plugins_general\" target=\"_blank\">General information regarding Wirecard Shop Plugins</a></p>
-    <br />
-    </div>"
+VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION = "<div><a href=\"https://www.wirecard.at/\" target=\"_blank\" title=\"www.wirecard.at\"><img src=\"../images/stories/virtuemart/payment/wirecard.png\" /></a><br /><h3>Wirecard - Your Full Service Payment Provider - Comprehensive solutions from one single source</h3>Wirecard is one of the world's leading providers of outsourcing and white label solutions for electronic payment transactions.<br /><br /> As independent provider of payment solutions, we accompany our customers along the entire business development. Our payment solutions are perfectly tailored to suit e-Commerce requirements and have made us Austria's leading payment service provider. Customization, competence, and commitment.<br /><br /><p><a href=\"https://guides.wirecard.at/doku.php/plugins_general\" target=\"_blank\">General information regarding Wirecard Shop Plugins</a></p><br /></div>"
 
 VMPAYMENT_WIRECARDCEECHECKOUT_CONFIGURATION = "Konfiguration"
-VMPAYMENT_WIRECARDCEECHECKOUT_CONFIGURATION_DESC = "Zum Testen der Integration eine vordefinierte Konfiguration auswählen. Für Produktivsysteme "Production" auswählen."
+VMPAYMENT_WIRECARDCEECHECKOUT_CONFIGURATION_DESC = "Zum Testen der Integration eine vordefinierte Konfiguration auswählen. Für Produktivsysteme \"Production\" auswählen."
 VMPAYMENT_WIRECARDCEECHECKOUT_MODE_PRODUCTION = "Production"
 VMPAYMENT_WIRECARDCEECHECKOUT_MODE_DEMO = "Demo"
 VMPAYMENT_WIRECARDCEECHECKOUT_MODE_TEST = "Test without 3-D Secure"
@@ -244,7 +238,7 @@ VMPAYMENT_WIRECARDCEECHECKOUT_CREDITORID = "Gläubiger-ID"
 VMPAYMENT_WIRECARDCEECHECKOUT_DUEDATE = "Fälligkeitsdatum"
 
 VMPAYMENT_WIRECARDCEECHECKOUT_IFRAMEBREAKOUT_REDIRECT = "Sie werden nun weitergeleitet."
-VMPAYMENT_WIRECARDCEECHECKOUT_IFRAMEBREAKOUT_CLICK = 'Falls Sie nicht weitergeleitet werden, klicken Sie bitte <a href="#" onclick="iframeBreakout()">hier</a>.'
+VMPAYMENT_WIRECARDCEECHECKOUT_IFRAMEBREAKOUT_CLICK = "Falls Sie nicht weitergeleitet werden, klicken Sie bitte <a href=\"#\" onclick=\"iframeBreakout()\">hier</a>."
 
 VMPAYMENT_WIRECARDCEECHECKOUT_INVALID_RESPONSE = "Ungültige Rückmeldung."
 VMPAYMENT_WIRECARDCEECHECKOUT_INITIATE_PAYMENT_ERROR = "Fehler bei Zahlungsinitiierung."

diff --git a/language/de-DE/de-DE.plg_vmpayment_wirecardceecheckout.sys.ini b/language/de-DE/de-DE.plg_vmpayment_wirecardceecheckout.sys.ini
@@ -0,0 +1,8 @@
+; @date : $Date$
+; @Id $Id$
+; @Revision : $Revision$
+; @author Wirecard CEE
+; @package VMPayment
+; @subpackage VirtueMart payment Wirecard Checkout Page
+
+VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION = "<div><a href=\"https://www.wirecard.at/\" target=\"_blank\" title=\"www.wirecard.at\"><img src=\"../images/stories/virtuemart/payment/wirecard.png\" /></a><br /><h3>Wirecard - Your Full Service Payment Provider - Comprehensive solutions from one single source</h3>Wirecard is one of the world's leading providers of outsourcing and white label solutions for electronic payment transactions.<br /><br /> As independent provider of payment solutions, we accompany our customers along the entire business development. Our payment solutions are perfectly tailored to suit e-Commerce requirements and have made us Austria's leading payment service provider. Customization, competence, and commitment.<br /><br /><p><a href=\"https://guides.wirecard.at/doku.php/plugins_general\" target=\"_blank\">General information regarding Wirecard Shop Plugins</a></p><br /></div>"
diff --git a/language/en-GB/en-GB.plg_vmpayment_wirecardceecheckout.ini b/language/en-GB/en-GB.plg_vmpayment_wirecardceecheckout.ini
@@ -7,16 +7,10 @@
 VMPAYMENT_WIRECARDCEECHECKOUT = "Wirecard Checkout Page"
 
 VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_TITLE = "<strong>Wirecard Checkout Page</strong>"
-VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION = "<div>
-    <a href="https://www.wirecard.at/" target="_blank" title="www.wirecard.at"><img src="../images/stories/virtuemart/payment/wirecard.png" /></a><br />
-    <h3>Wirecard - Your Full Service Payment Provider - Comprehensive solutions from one single source</h3>Wirecard is one of the world's leading providers of outsourcing and white label solutions for electronic payment transactions.<br /><br /> As independent provider of payment solutions, we accompany our customers along the entire business development. Our payment solutions are perfectly tailored to suit e-Commerce requirements and have made us Austria's leading payment service provider. Customization, competence, and commitment.<br />
-    <br />
-    <p><a href=\"https://guides.wirecard.at/doku.php/plugins_general\" target=\"_blank\">General information regarding Wirecard Shop Plugins</a></p>
-    <br />
-    </div>"
+VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION = "<div><a href=\"https://www.wirecard.at/\" target=\"_blank\" title=\"www.wirecard.at\"><img src=\"../images/stories/virtuemart/payment/wirecard.png\" /></a><br /><h3>Wirecard - Your Full Service Payment Provider - Comprehensive solutions from one single source</h3>Wirecard is one of the world's leading providers of outsourcing and white label solutions for electronic payment transactions.<br /><br /> As independent provider of payment solutions, we accompany our customers along the entire business development. Our payment solutions are perfectly tailored to suit e-Commerce requirements and have made us Austria's leading payment service provider. Customization, competence, and commitment.<br /><br /><p><a href=\"https://guides.wirecard.at/doku.php/plugins_general\" target=\"_blank\">General information regarding Wirecard Shop Plugins</a></p><br /></div>"
 
 VMPAYMENT_WIRECARDCEECHECKOUT_CONFIGURATION = "Configuration"
-VMPAYMENT_WIRECARDCEECHECKOUT_CONFIGURATION_DESC = "For integration, select predefined configuration settings or \"production\" for live systems"
+VMPAYMENT_WIRECARDCEECHECKOUT_CONFIGURATION_DESC = "For integration, select predefined configuration settings or \"Production\" for live systems"
 VMPAYMENT_WIRECARDCEECHECKOUT_MODE_PRODUCTION = "Production"
 VMPAYMENT_WIRECARDCEECHECKOUT_MODE_DEMO = "Demo"
 VMPAYMENT_WIRECARDCEECHECKOUT_MODE_TEST = "Test without 3-D Secure"
@@ -244,7 +238,7 @@ VMPAYMENT_WIRECARDCEECHECKOUT_CREDITORID = "Creditor ID"
 VMPAYMENT_WIRECARDCEECHECKOUT_DUEDATE = "Due date"
 
 VMPAYMENT_WIRECARDCEECHECKOUT_IFRAMEBREAKOUT_REDIRECT = "You will be redirected in a moment."
-VMPAYMENT_WIRECARDCEECHECKOUT_IFRAMEBREAKOUT_CLICK = 'If the redirect does not work please click <a href="#" onclick="iframeBreakout()">here</a>.'
+VMPAYMENT_WIRECARDCEECHECKOUT_IFRAMEBREAKOUT_CLICK = "If the redirect does not work please click <a href=\"#\" onclick=\"iframeBreakout()\">here</a>."
 
 VMPAYMENT_WIRECARDCEECHECKOUT_INVALID_RESPONSE = "Payment initialization request was invalid."
 VMPAYMENT_WIRECARDCEECHECKOUT_INITIATE_PAYMENT_ERROR = "Error during payment initialization."

diff --git a/language/en-GB/en-GB.plg_vmpayment_wirecardceecheckout.sys.ini b/language/en-GB/en-GB.plg_vmpayment_wirecardceecheckout.sys.ini
@@ -0,0 +1,8 @@
+; @date : $Date$
+; @Id $Id$
+; @Revision : $Revision$
+; @author Wirecard CEE
+; @package VMPayment
+; @subpackage VirtueMart payment Wirecard Checkout Page
+
+VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION = "<div><a href=\"https://www.wirecard.at/\" target=\"_blank\" title=\"www.wirecard.at\"><img src=\"../images/stories/virtuemart/payment/wirecard.png\" /></a><br /><h3>Wirecard - Your Full Service Payment Provider - Comprehensive solutions from one single source</h3>Wirecard is one of the world's leading providers of outsourcing and white label solutions for electronic payment transactions.<br /><br /> As independent provider of payment solutions, we accompany our customers along the entire business development. Our payment solutions are perfectly tailored to suit e-Commerce requirements and have made us Austria's leading payment service provider. Customization, competence, and commitment.<br /><br /><p><a href=\"https://guides.wirecard.at/doku.php/plugins_general\" target=\"_blank\">General information regarding Wirecard Shop Plugins</a></p><br /></div>"
diff --git a/update/plg_vmpayment_wirecardceecheckout_update.xml b/update/plg_vmpayment_wirecardceecheckout_update.xml
@@ -105,4 +105,19 @@
         <maintainerurl>https://www.wirecard.at/</maintainerurl>
         <targetplatform name="joomla" version="3.6"/>
     </update>
+    <update>
+        <name>Wirecard Checkout Page</name>
+        <description>Wirecard - Your Full Service Payment Provider</description>
+        <type>plugin</type>
+        <folder>vmpayment</folder>
+        <element>wirecardceecheckout</element>
+        <version>1.7.6</version>
+        <client>site</client>
+        <downloads>
+            <downloadurl type="full" format="zip">https://github.com/wirecard/virtuemart3-wcp/archive/1.7.6.zip</downloadurl>
+        </downloads>
+        <maintainer>Wirecard</maintainer>
+        <maintainerurl>https://www.wirecard.at/</maintainerurl>
+        <targetplatform name="joomla" version="3.6"/>
+    </update>
 </updates>
diff --git a/wirecardceecheckout.php b/wirecardceecheckout.php
@@ -54,7 +54,7 @@ class plgVmPaymentwirecardceecheckout extends vmPSPlugin
 
 	protected static $WINDOW_NAME = 'WirecardCEECheckoutFrame';
 	protected static $PLUGIN_NAME = 'VirtueMart2_CheckoutPage';
-	protected static $PLUGIN_VERSION = '1.7.5';
+	protected static $PLUGIN_VERSION = '1.7.6';
 
 	protected $_method;
 	protected $_order;

diff --git a/wirecardceecheckout.xml b/wirecardceecheckout.xml
@@ -36,7 +36,7 @@
     <authorUrl>http://www.wirecard.at/</authorUrl>
     <copyright>Copyright (C) 2013 Wirecard. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-    <version>1.7.5</version>
+    <version>1.7.6</version>
     <description>VMPAYMENT_WIRECARDCEECHECKOUT_PAYMENT_DESCRIPTION</description>
 
     <files>
@@ -76,10 +76,14 @@
         <filename>wirecard.png</filename>
     </media>
 
-    <languages>
-        <language tag="en-GB">en-GB.plg_vmpayment_wirecardceecheckout.ini</language>
-        <language tag="de-DE">de-DE.plg_vmpayment_wirecardceecheckout.ini</language>
-    </languages>
+    <fileset>
+        <files folder="language/de-DE" target="language/de-DE">
+            <filename>en-GB.plg_vmpayment_wirecardceecheckout.ini</filename>
+        </files>
+        <files folder="language/en-GB" target="language/en-GB">
+            <filename>de-DE.plg_vmpayment_wirecardceecheckout.ini</filename>
+        </files>
+    </fileset>
 
     <vmconfig>
         <fields name="params">