Merge pull request #37 from wirecard/TPWDCEE-826

#55 Better popup loading on small screens
qenta-cee · Feb 15, 2018 · 36c1ec8 · 36c1ec8
2 parents 602723b + ca53d1c
commit 36c1ec8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/app/code/community/Wirecard/CheckoutSeamless/Helper/Data.php b/app/code/community/Wirecard/CheckoutSeamless/Helper/Data.php
@@ -33,7 +33,7 @@
 class Wirecard_CheckoutSeamless_Helper_Data extends Mage_Payment_Helper_Data
 {
 
-    protected $_pluginVersion = '4.2.6';
+    protected $_pluginVersion = '4.2.7';
     protected $_pluginName = 'Wirecard/CheckoutSeamless';
 
     /**

diff --git a/app/code/community/Wirecard/CheckoutSeamless/Model/Abstract.php b/app/code/community/Wirecard/CheckoutSeamless/Model/Abstract.php
@@ -53,7 +53,7 @@ abstract class Wirecard_CheckoutSeamless_Model_Abstract extends Mage_Payment_Mod
     protected $_defaultLocale = 'en';
 
     protected $_order;
-    protected $_pluginVersion = '4.2.5';
+    protected $_pluginVersion = '4.2.7';
     protected $_pluginName = 'Wirecard/CheckoutSeamless';
 
     protected $_formBlockType = 'wirecard_checkoutseamless/form';

diff --git a/app/code/community/Wirecard/CheckoutSeamless/etc/config.xml b/app/code/community/Wirecard/CheckoutSeamless/etc/config.xml
@@ -34,7 +34,7 @@
 <config>
     <modules>
         <Wirecard_CheckoutSeamless>
-            <version>4.2.6</version>
+            <version>4.2.7</version>
         </Wirecard_CheckoutSeamless>
     </modules>
     <global>

diff --git a/js/wirecard/checkoutseamless/processing.js b/js/wirecard/checkoutseamless/processing.js
@@ -125,11 +125,16 @@ Event.observe(window, 'load', function () {
                                     window.location.href = innerResponse.url;
                                 }
                                 else {
+                                    var width = 500;
+                                    if (document.body.clientWidth < 500) {
+                                        width = document.body.clientWidth;
+                                    }
                                     var oPopup = new Window({
                                         id:'popup_window',
                                         className: 'magento',
+                                        windowClassName: 'magentopopup',
                                         url: innerResponse.url,
-                                        width: 500,
+                                        width: width,
                                         height: 500,
                                         minimizable: false,
                                         maximizable: false,
@@ -144,7 +149,7 @@ Event.observe(window, 'load', function () {
                                     });
                                     oPopup.setZIndex(100);
                                     oPopup.showCenter(true);
-                                    console.log(oPopup);
+                                    $('#popup_window_content').width(width);
                                 }
                             }
                             else {