Merge pull request #56 from wirecard/confirmationRespo

Exit after printing confirmation message
qenta-cee · Jul 24, 2017 · 92f2dac · 92f2dac
2 parents df4a42c + 20225c1
commit 92f2dac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/Frontend/WirecardCheckoutSeamless/Bootstrap.php b/Frontend/WirecardCheckoutSeamless/Bootstrap.php
@@ -64,7 +64,7 @@ public function getCapabilities()
      */
     public function getVersion()
     {
-        return '1.10.2';
+        return '1.10.3';
     }
 
     /**

diff --git a/Frontend/WirecardCheckoutSeamless/Controllers/Frontend/WirecardCheckoutSeamless.php b/Frontend/WirecardCheckoutSeamless/Controllers/Frontend/WirecardCheckoutSeamless.php
@@ -235,8 +235,7 @@ public function confirmAction()
 
             if (!$return->validate()) {
                 Shopware()->Pluginlogger()->info('WirecardCheckoutSeamless: '. __METHOD__ . ':Validation error: invalid response');
-                print \WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString('Validation error: invalid response');
-                return;
+                die(\WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString('Validation error: invalid response'));
             }
 
             $sql = Shopware()->Db()->select()
@@ -249,8 +248,7 @@ public function confirmAction()
             $sessionData = unserialize(base64_decode($data['session']));
             if(!is_array($sessionData)) {
                 Shopware()->Pluginlogger()->info('WirecardCheckoutSeamless: '. __METHOD__ . ':Validation error: invalid session data');
-                print \WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString('Validation error: invalid session data');
-                return;
+                die(\WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString('Validation error: invalid session data'));
             }
 
             // restore session
@@ -508,11 +506,10 @@ public function confirmAction()
 
         } catch (Exception $e) {
             Shopware()->Pluginlogger()->info('WirecardCheckoutSeamless: '.__METHOD__ . ':' . $e->getMessage());
-            print WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString(htmlspecialchars($e->getMessage()));
-            return;
+            die(WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString(htmlspecialchars($e->getMessage())));
         }
 
-        print WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString($message);
+        die(WirecardCEE_QMore_ReturnFactory::generateConfirmResponseString($message));
     }
 
     /**

diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ Our [Online Guides](https://guides.wirecard.at/shop_plugins:shopware_wcs:start "
 
 Be careful after installing/updating the plugin from the GitHub master branch. Your Shopware installation will notify you about an upgrade at the [Shopware store](http://store.shopware.com/wdcee00444/wirecard-checkout-seamless.html). **This upgrade will revert the plugin to the latest version on the Shopware store.**
 
-**For Shopware versions higher than 5.2.8 our plugin is incompatible with the _statistics plugin_ from Shopware AG.**
 **For Shopware versions 5.2.22 - 5.2.24 there can be problems with the shopversion from Shopware AG.**
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ public function getCapabilities() @@
          */
         public function getVersion()
         {
-            return '1.10.2';
+            return '1.10.3';
         }
         /**
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,6 @@ Our [Online Guides](https://guides.wirecard.at/shop_plugins:shopware_wcs:start "

		Be careful after installing/updating the plugin from the GitHub master branch. Your Shopware installation will notify you about an upgrade at the [Shopware store](http://store.shopware.com/wdcee00444/wirecard-checkout-seamless.html). This upgrade will revert the plugin to the latest version on the Shopware store.

		For Shopware versions higher than 5.2.8 our plugin is incompatible with the _statistics plugin_ from Shopware AG.
		For Shopware versions 5.2.22 - 5.2.24 there can be problems with the shopversion from Shopware AG.


Expand Down