fixed company tasx id and live mode troubles

ratepay · Nov 18, 2014 · 5c813f0 · 5c813f0
1 parent c48e459
commit 5c813f0
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 13 deletions.
diff --git a/DOCS/changelog.txt b/DOCS/changelog.txt
@@ -1,3 +1,16 @@
+***********************************************************
+**********| Version 1.0.2 - Released 2014-11-18 |**********
+***********************************************************
+
+* Fixed live mode
+* Changed sandbox text/label
+
+***********************************************************
+**********| Version 1.0.1 - Released 2014-11-17 |**********
+***********************************************************
+
+* Fixed company tax id
+
 ***********************************************************
 **********| Version 1.0.0 - Released 2014-11-12 |**********
 ***********************************************************

diff --git a/DOCS/installation.txt b/DOCS/installation.txt
diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ RatePAY GmbH - OpenCart Payment Page Connector
 |------|----------
 |Author | `Aarne Welschlau`
 |Shop Version | `1.5.6.x`
-|Version | `1.0.0`
+|Version | `1.0.2`
 |Link | `http://www.ratepay.com`
 |Mail | `integration@ratepay.com`
-|Description | `Initial Version`
+|Description | `Fixed live mode - Changed sandbox text/label`
 |Installation | `see separate installation manual`
diff --git a/admin/language/de_DE/payment/ratepay.php b/admin/language/de_DE/payment/ratepay.php
@@ -16,8 +16,8 @@
 
 $_['ratepay_status_text']        = 'Status';
 
-$_['ratepay_sandbox_text']       = 'Sandbox';
-$_['ratepay_sandbox_help']       = 'Der Sandbox-Modul dient dem Modultest. Alle Requests werden gegen das RatePAY Integrations-Gateway gesendet.';
+$_['ratepay_sandbox_text']       = 'Test-Modus';
+$_['ratepay_sandbox_help']       = 'Der Test-Modus (Sandbox) dient dem Modultest. Alle Requests werden gegen das RatePAY Integrations-Gateway gesendet.';
 
 $_['ratepay_title_text']         = 'Bezeichnung';
 $_['ratepay_title_help']         = 'Benennung innerhalb der Zahlartenauswahl';

diff --git a/admin/language/english/payment/ratepay.php b/admin/language/english/payment/ratepay.php
@@ -16,22 +16,22 @@
 
 $_['ratepay_status_text']        = 'Status';
 
-$_['ratepay_sandbox_text']       = 'Sandbox';
-$_['ratepay_sandbox_help']       = 'Der Sandbox-Modul dient dem Modultest. Alle Requests werden gegen das RatePAY Integrations-Gateway gesendet.';
+$_['ratepay_sandbox_text']       = 'Test Mode';
+$_['ratepay_sandbox_help']       = '';
 
 $_['ratepay_title_text']         = 'Title';
-$_['ratepay_title_help']         = 'Benennung innerhalb der Zahlartenauswahl';
+$_['ratepay_title_help']         = '';
 
 $_['ratepay_description_text']   = 'Description';
 
 $_['ratepay_profile_id_text']    = 'Profile Id';
 $_['ratepay_security_code_text'] = 'Securiy Code';
 
 $_['ratepay_order_status_text']  = 'Order status';
-$_['ratepay_order_status_help']  = 'Bestellstatus nach erfolgreicher Bestellannahme durch RatePAY';
+$_['ratepay_order_status_help']  = '';
 
 $_['ratepay_limits_text']        = 'Order limits';
-$_['ratepay_limits_help']        = 'Die Grenzwerte innerhalb derer RatePAY als Zahlart verfügbar sein soll';
+$_['ratepay_limits_help']        = '';
 $_['ratepay_limit_max_text']     = 'Minimum amout (EUR)';
 $_['ratepay_limit_min_text']     = 'Maximum amout (EUR)';
 
@@ -40,10 +40,10 @@
 $_['ratepay_b2b_text']           = 'B2B/<br/>business customers';
 
 $_['ratepay_pp_editable_text']   = 'PayPage - Customer data editable';
-$_['ratepay_pp_editable_help']   = 'Der Käufer soll die Möglichkeit haben seine Adressdaten auf der RatePAY Payment Page zu verändern';
+$_['ratepay_pp_editable_help']   = '';
 
 $_['ratepay_pp_basket_text']     = 'PayPage - Show basket';
-$_['ratepay_pp_basket_help']     = 'Dem Käufer wird auf der RatePAY Payment Page der Warenkorb angezeigt';
+$_['ratepay_pp_basket_help']     = '';
 
 $_['ratepay_sort_order_text']    = 'Sort order';
 

diff --git a/catalog/controller/payment/ratepay.php b/catalog/controller/payment/ratepay.php
@@ -289,7 +289,12 @@ private function _getRequestObject() {
                 $this->session->data['order_id']
             )
         );
-        $requestObject->setSandBoxUrl($helperConnection->getRatepayPayPageApiUrl($this->config->get('ratepay_sandbox')));
+
+        if ($this->config->get('ratepay_sandbox')) {
+            $requestObject->setSandBoxUrl($helperConnection->getRatepayPayPageApiUrl(true));
+        } else {
+            $requestObject->setLiveUrl($helperConnection->getRatepayPayPageApiUrl(false));
+        }
 
         return $requestObject;
     }

diff --git a/catalog/view/theme/default/template/payment/ratepay_failure.tpl b/catalog/view/theme/default/template/payment/ratepay_failure.tpl
diff --git a/ratepay/helper/RatepayGatewayConnection.php b/ratepay/helper/RatepayGatewayConnection.php
diff --git a/ratepay/helper/RatepayVersion.php b/ratepay/helper/RatepayVersion.php
@@ -2,7 +2,7 @@
 
 class RatepayHelperVersion
 {
-    private $_version = '1.0.0';
+    private $_version = '1.0.2';
 
     public function getRatepayVersion()
     {