adyen-skinbuilder 0.4.2 → 0.4.3

data/lib/adyen-skinbuilder/server/views/js/default.js

@@ -95,6 +95,11 @@ function formValidate(form, group) {
 	} catch (err) {}
 	markErrorFields(errors);
 	setErrorMessages(errors, group);
+	
+	if(typeof resizeIframe != 'undefined'){
+		resizeIframe();
+	}
+	
 	return false;
 }
 
@@ -179,7 +184,6 @@ function validateElement(el) {
     return true;
 }
 
-
 function markErrorFields(errors) {
 	if(errors.length == 0) return;
 	for(var i = 0; i < errors.length; ++i) {
@@ -187,13 +191,17 @@ function markErrorFields(errors) {
 		if(! notNull(el)) continue;
 		if(el.type == "hidden") continue;
 		if (el.parentNode.nodeName == "DIV") {
-			el.parentNode.className = "errorDiv";
+			if(el.parentNode.className.indexOf('errorDiv') === -1){
+				el.parentNode.className += " errorDiv";
+			}
+		}
+		if(el.className.indexOf('errorField') === -1){
+			el.className += " errorField";
 		}
-		el.className = "errorField";
 	}
-	
 }
 
+
 function setOkMessages(messages) {
 	if ( notNull(document.getElementById("okFrameMessages"))) {
 		var messageHTML = "";
@@ -225,8 +233,10 @@ function setErrorMessages(errors,group) {
 	hideElement("okFrame");
 }
 
-
-function clearErrors(fields, dontHideErrorFrame) {
+function clearErrors(fields, dontHideErrorFrame, fieldClass) {
+	if(! fieldClass) {
+		fieldClass = "inputField";
+	}
 	for(var i = 0; i < fields.length; ++i) {
 		obj = document.getElementById(fields[i]);
 		
@@ -235,7 +245,7 @@ function clearErrors(fields, dontHideErrorFrame) {
 		if (obj.parentNode.nodeName == "DIV") {
 			obj.parentNode.className = "fieldDiv";
 		}
-		obj.className = "inputField";
+		obj.className = fieldClass;
 	}
 	if(! dontHideErrorFrame) {
 		hideElement("errorFrameValidationErrors");
@@ -348,6 +358,203 @@ function confirmMessage(f) {
 	return false;
 }
 
+function blockNonNumberEvents(e) {
+	var key;
+	var isCtrl = false;
+	var keychar;
+	var reg;
+		
+	if(window.event) {
+		key = e.keyCode;
+		isCtrl = window.event.ctrlKey
+	}
+	else if(e.which) {
+		key = e.which;
+		isCtrl = e.ctrlKey;
+	}
+	
+	if (isNaN(key)) return true;
+	
+	keychar = String.fromCharCode(key);
+	
+	// check for backspace or delete, or if Ctrl was pressed
+	if (key == 8 || isCtrl) {
+		return true;
+	}
+
+	reg = /[\d ]/;
+	
+	return reg.test(keychar);
+}
+
+var openedWindow, timer, issuerId, popupX, popupY = null;
+var issuerPopupSize = new Object();
+var popupOpened = false; 
+var selectedPopupBrand = null;
+
+var setSelectedPopupBrand = function(brand){
+	selectedPopupBrand = brand;
+};
+
+var validateAndOpenIfRequired = function(form, group, url){
+	var mygroup = group;
+	
+	if (group == "default" && selectedPopupBrand !== null){
+		mygroup = selectedPopupBrand;
+	}
+	
+	if (typeof openInPopup != 'undefined' && openInPopup[mygroup]){
+		return validateAndOpen(form, group,url);
+	} 
+	
+	return formValidate(form, group);
+};
+
+var validateAndOpen = function(form, group, url){
+	//enable re-opening popUp for 3D
+	submitOnlyOnce = function (f) {
+        return true;
+    };
+      
+    if(formValidate(form, group)){
+    	//check if window is in an iFrame
+    	if (popupX == null)	 popupX = "800";
+    	if (popupY == null) popupY = "600";
+    	
+    	if (issuerId != null) {
+    		var popupSize = issuerPopupSize[issuerId];
+    		if (popupSize != null){
+    			popupX = popupSize.x;
+    			popupY = popupSize.y;
+    		}
+    		
+            var element = document.getElementById("issuerId");
+            
+            if ( !element) {
+                element = document.createElement( 'input' );
+                element.type = 'hidden';
+                element.name = element.id = "issuerId";
+                form.appendChild( element );
+            }
+            
+        	if (group == "default" && selectedPopupBrand !== null){
+        		mygroup = selectedPopupBrand;
+        	}
+
+            element.setAttribute( 'value', issuerId );
+    	}
+    	
+    	
+    	if(selectedPopupBrand !== null){
+            var element = document.getElementById("brandCode");
+            
+            if ( !element) {
+                element = document.createElement( 'input' );
+                element.type = "hidden";
+                element.name = "brandCode";
+                element.value = selectedPopupBrand;
+                form.appendChild( element );
+            }
+    	}
+
+    	if (popupX > screen.width - 100) {
+    		popupX = screen.width - 100;
+    	}
+
+    	if (popupY > screen.height - 100) {
+    		popupY = screen.height - 100;
+    	}
+    	
+    	if (popupOpened) {
+    		return false;
+    	}
+    	
+    	popupOpened = true;
+    	openedWindow = window.open('',"mypopup", "width="+popupX+", height="+popupY+", scrollbars=yes, resizable=yes");
+    	openedWindow.focus();
+
+    	var pmcontent = document.getElementById("pmcontent");
+    	if (pmcontent != null) pmcontent.style.display="none";
+    	
+    	var foot = document.getElementById("foot");
+    	if (foot != null) foot.style.display="none";
+
+    	var cfooter = document.getElementById("cfooter");
+    	if (cfooter != null) cfooter.style.display="none";
+
+    	var waitingdiv = document.getElementById("waitingdiv");
+    	if (waitingdiv != null) waitingdiv.style.display="block";
+    	
+    	var usingPopUp = document.getElementById("usingPopUp");
+    	var previousUsingPopUp;
+    	if (usingPopUp != null){
+    		previousUsingPopUp = usingPopUp.value;
+    		usingPopUp.value="true";
+    	}
+    	
+    	form.submit();
+		
+    	document.getElementById("pmcontent").redirectCallback = function(){
+			setTimeout(function(){
+				
+				var ifr = parent.document.getElementById("myIFrame");
+			 	ifr.parentNode.removeChild(ifr);	
+			 
+			}, 5000);
+			
+			 
+		}
+		if(openedWindow){
+			timer = setInterval(checkChild, 500);
+		}
+
+        if (typeof popupOpenedHandler === 'function') {
+	    	popupOpenedHandler();
+		}
+    }
+    
+	if (typeof resizeIframe === 'function') {
+		resizeIframe();
+	}
+    
+    return false;
+}
+
+var issuerButtonClicked = function(butId){
+	issuerId = butId;
+}
+
+var checkChild = function(){
+	if (openedWindow.closed) {
+    	var pmcontent = document.getElementById("pmcontent");
+    	if (pmcontent != null) pmcontent.style.display="block";
+    	
+    	var foot = document.getElementById("foot");
+    	if (foot != null) foot.style.display="block";
+    	
+    	var cfooter = document.getElementById("cfooter");
+    	if (cfooter != null) cfooter.style.display="block";
+
+    	var waitingdiv = document.getElementById("waitingdiv");
+    	if (waitingdiv != null) waitingdiv.style.display="none";
+    	if (issuerId != null) {
+    		issuerId = null;
+            var element = document.getElementById("issuerId");
+            
+            if ( !element) {
+            	element.parentNode.removeChild(element);
+            }
+    	}
+        clearInterval(timer);
+        
+        popupOpened = false; 
+        
+    	if(typeof resizeIframe != 'undefined'){
+    		resizeIframe();
+    	}
+    }
+}
+
 //  vX library (Ajax, Extend, GetElement, Animation)
 var _=_?_:{}
 _.X=function(u,f,d,x){x=new(window.ActiveXObject?ActiveXObject:XMLHttpRequest)('Microsoft.XMLHTTP');x.open(d?'POST':'GET',u,1);d?x.setRequestHeader('Content-type','application/x-www-form-urlencoded'):0;x.onreadystatechange=function(){x.readyState>3&&f?f(x.responseText,x):0};x.send(d)}

data/lib/adyen-skinbuilder/server/views/layout.html.erb

@@ -1,11 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title><%= @skin.code %> - Adyen-Skinbuilder</title>
 
-    <link rel="stylesheet" media="screen" type="text/css" href="/hpp/css/reset.css" />
-
+    <link rel="shortcut icon" href="/sf/<%= @skin.code %>/img/favicon.ico" />
+    
+    <link rel="stylesheet" type="text/css" href="/hpp/css/reset.css" />
     <link rel="stylesheet" media="screen" type="text/css" href="/sf/<%= @skin.code %>/css/screen.css" />
     <link rel="stylesheet" media="print" type="text/css" href="/sf/<%= @skin.code %>/css/print.css" />
 
@@ -17,10 +19,10 @@
   </head>
   <body>
     <script type="text/javascript">
-    //<![CDATA[
+    //<![CDATA[ 
       var clientIPAddress = "127.0.0.1";
       var config = new Array();
-      config["pmmanimation"] = 0;
+      config["pmmanimation"] = 2;
     //]]>
     </script>
 
@@ -29,6 +31,6 @@
     <%= yield %>
 
     <!-- ### -->
-
+    
   </body>
 </html>

data/lib/adyen-skinbuilder/server/views/skin.html.erb

@@ -1,18 +1,13 @@
-<!-- ### inc/cheader_[locale].txt or inc/cheader.txt (fallback) ### -->
 <%= render_file "cheader" %>
 
 <% adyen_form_tag do %>
-  <!-- ### inc/pmheader_[locale].txt or inc/pmheader.txt (fallback) ### -->
   <%= render_file "pmheader" %>
 
   <%= adyen_payment_fields %>
 
-  <!-- ### inc/pmfooter_[locale].txt or inc/pmfooter.txt (fallback) ### -->
   <%= render_file "pmfooter" %>
 
-  <!-- ### inc/customfields_[locale].txt or inc/customfields.txt (fallback) ### -->
   <%= render_file "customfields" %>
 <% end %>
 
-<!-- ### inc/cfooter_[locale].txt or inc/cfooter.txt (fallback) ### -->
-<%= render_file "cfooter" %>
+<%= render_file "cfooter" %>

data/lib/adyen-skinbuilder/version.rb

@@ -1,5 +1,5 @@
 module Adyen
   module Skinbuilder
-    VERSION = '0.4.2'
+    VERSION = '0.4.3'
   end
 end

data/spec/lib/adyen-skinbuilder/server_spec.rb

@@ -97,7 +97,7 @@ describe 'SkinBuilder server' do
       end
 
       it 'returns adyen form' do
-        last_response.body.should include('<form id="pageform" action="" method="post" onsubmit="return formValidate(this);">')
+        last_response.body.should include('<form id="pageform" action="#" method="post"')
       end
 
       it 'returns order data' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adyen-skinbuilder
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Priit Haamer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -110,7 +110,6 @@ files:
 - lib/adyen-skinbuilder/server/views/_adyen_form.html.erb
 - lib/adyen-skinbuilder/server/views/_adyen_payment_fields.html.erb
 - lib/adyen-skinbuilder/server/views/css/reset.css
-- lib/adyen-skinbuilder/server/views/img/icons/error.png
 - lib/adyen-skinbuilder/server/views/img/pm/TESTBANK1.png
 - lib/adyen-skinbuilder/server/views/img/pm/TESTBANK10.png
 - lib/adyen-skinbuilder/server/views/img/pm/TESTBANK2.png
@@ -125,14 +124,18 @@ files:
 - lib/adyen-skinbuilder/server/views/img/pm/TESTBANKPENDING.png
 - lib/adyen-skinbuilder/server/views/img/pm/TESTBANKREFUSED.png
 - lib/adyen-skinbuilder/server/views/img/pm/amex_small.png
-- lib/adyen-skinbuilder/server/views/img/pm/card.png
-- lib/adyen-skinbuilder/server/views/img/pm/ideal.png
+- lib/adyen-skinbuilder/server/views/img/pm/bankTransfer_IBAN.png
+- lib/adyen-skinbuilder/server/views/img/pm/bankTransfer_NL.png
+- lib/adyen-skinbuilder/server/views/img/pm/directdebit_NL.png
+- lib/adyen-skinbuilder/server/views/img/pm/hyvesafrekenen.png
+- lib/adyen-skinbuilder/server/views/img/pm/maestro_small.png
 - lib/adyen-skinbuilder/server/views/img/pm/mc_small.png
+- lib/adyen-skinbuilder/server/views/img/pm/openinvoice.png
 - lib/adyen-skinbuilder/server/views/img/pm/unknown_small.png
-- lib/adyen-skinbuilder/server/views/img/pm/vias_small.png
-- lib/adyen-skinbuilder/server/views/img/pm/visa.png
 - lib/adyen-skinbuilder/server/views/img/pm/visa_small.png
 - lib/adyen-skinbuilder/server/views/index.html.erb
+- lib/adyen-skinbuilder/server/views/js/animatedcollapse.js
+- lib/adyen-skinbuilder/server/views/js/cc.js
 - lib/adyen-skinbuilder/server/views/js/default.js
 - lib/adyen-skinbuilder/server/views/layout.html.erb
 - lib/adyen-skinbuilder/server/views/skeleton.html
@@ -184,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Simple Sinatra server to make coding Adyen skins easier