Sofort 7.0.2

tronet-dev · Jan 16, 2018 · c03ba61 · c03ba61
1 parent 65e6fe6
commit c03ba61
Show file tree

Hide file tree

Showing 23 changed files with 993 additions and 412 deletions.
diff --git a/build/Changelog.txt b/build/Changelog.txt
@@ -86,4 +86,8 @@
 
 ==7.0.1==
 *CHANGED: replace SOFORT logo with new one by KLARNA
-*CHANGED: update the name of SOFORT
+*CHANGED: update the name of SOFORT
+
+==7.0.2==
+*CHANGED: updated texts and images
+*CHANGED: performance update
diff --git a/build/Install.sql b/build/Install.sql
@@ -7,7 +7,7 @@ SET
     `OXID`          = 'trosofortgateway_su',
     `OXACTIVE`      = 1,
     `OXDESC`        = 'Sofort.',
-    `OXDESC_1`      = 'Pay now.',
+    `OXDESC_1`      = 'Online bank transfer.',
     `OXADDSUM`      = 0,
     `OXADDSUMTYPE`  = 'abs',
     `OXADDSUMRULES` = 15,

diff --git a/build/Readme.txt b/build/Readme.txt
@@ -8,7 +8,7 @@ tronet GmbH
 tro
 
 ==Version==
-7.0.1
+7.0.2
 
 ==Link==
 http://www.tronet.media
@@ -47,7 +47,6 @@ payment => tronet/trosofortueberweisung/application/controllers/trosofortueberwe
 oxbasket => tronet/trosofortueberweisung/application/models/trosofortueberweisungoxbasket
 oxbasketitem => tronet/trosofortueberweisung/application/models/trosofortueberweisungoxbasketitem
 navigation => tronet/trosofortueberweisung/application/controllers/admin/trosofortueberweisung_navigation
-oxlist => tronet/trosofortueberweisung/application/models/trosofortueberweisungreleaseoxlist
 
 ==Libraries==
 SofortLib-PHP-Payment-2.1.2 (/copy_this/tronet/trosofortueberweisung/library/)
diff --git a/build/readme_en.pdf b/build/readme_en.pdf
diff --git a/docs/readme_en.docx b/docs/readme_en.docx
diff --git a/...tronet/trosofortueberweisung/application/controllers/admin/trosofortueberweisung_main.php b/...tronet/trosofortueberweisung/application/controllers/admin/trosofortueberweisung_main.php
@@ -189,16 +189,23 @@ protected function _renderUpdateNotificationFailedMessage($oException)
          * @return string
          * @author tronet GmbH
          * @since  7.0.0
+         * @version  7.0.2
          */
         public function troCheckForChanges()
         {
+            $sTroCheckedChangesFailedMessage = '';
             $oSOFORTConfig = oxNew('trosofortueberweisungconfig');
             $sDownloadLinkRaw = $oSOFORTConfig->getTroMetaHashLinkRaw();
             $sDownloadFile = sprintf($sDownloadLinkRaw, $this->getCurrentVersion());
 
             if ($this->_troUrlExists($sDownloadFile))
             {
-                $oXML = file_get_contents($sDownloadFile);
+                /** @var trosofortueberweisungcurl $oSOFORTcURL */
+                $oSOFORTcURL = oxNew('trosofortueberweisungcurl', $sDownloadFile);
+                $oSOFORTcURL->curlSetOpt(CURLOPT_RETURNTRANSFER, 1);
+                $oXML = $oSOFORTcURL->curlExec();
+                $oSOFORTcURL->closeCh();
+
                 if ($oXML)
                 {
                     $oXml = new \SimpleXMLElement($oXML);
@@ -208,19 +215,28 @@ public function troCheckForChanges()
                 }
                 else
                 {
+                    if ($oSOFORTcURL->getErrorNumber() > 0)
+                    {
+                        $aErrorCodes = $oSOFORTcURL->getErrorCodes();
+                        $sErrorCodeName = $aErrorCodes[$oSOFORTcURL->getErrorNumber()];
+                        $sLanguageKey = 'TRO_SOFORT_' . $sErrorCodeName;
+                        $sTroCheckedChangesFailedMessage = oxRegistry::getLang()->translateString( $sLanguageKey );
+                    }
                     $aChangedFiles = array('changedCoreFiles' => 0);
                     $blTroCheckedChangesFailed = true;
                 }
             }
             else
             {
+                $sTroCheckedChangesFailedMessage = oxRegistry::getLang()->translateString('TRO_SOFORT_CURLE_COULDNT_CONNECT');
                 $aChangedFiles = array('changedCoreFiles' => 0);
                 $blTroCheckedChangesFailed = true;
             }
 
             $this->addTplParam('aTroChangedFiles', $aChangedFiles);
             $this->addTplParam('blTroCheckedChanges', true);
             $this->addTplParam('blTroCheckedChangesFailed', $blTroCheckedChangesFailed);
+            $this->addTplParam('sTroCheckedChangesFailedMessage', $sTroCheckedChangesFailedMessage);
         }
 
         /**
@@ -234,10 +250,12 @@ public function troCheckForChanges()
         protected function _troUrlExists($sUrl)
         {
             $aFileHeaders = @get_headers($sUrl);
-            if($aFileHeaders[0] == 'HTTP/1.1 404 Not Found') {
+            if ($aFileHeaders[0] == 'HTTP/1.1 404 Not Found')
+            {
                 $blUrlExists = false;
             }
-            else {
+            else
+            {
                 $blUrlExists = true;
             }
 

diff --git a/...dules/tronet/trosofortueberweisung/application/controllers/trosofortueberweisungorder.php b/...dules/tronet/trosofortueberweisung/application/controllers/trosofortueberweisungorder.php
@@ -38,8 +38,8 @@ public function continueExecute()
              */
 
             // additional check if we really really have a user now
-            if (!$oUser = $this->getUser())
-            {
+            $oUser = $this->getUser();
+            if (!$oUser) {
                 return 'user';
             }