better keypad entry (like square)

triola · Jul 28, 2014 · 79667b6 · 79667b6
1 parent 559098b
commit 79667b6
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 46 deletions.
diff --git a/js/functions.js b/js/functions.js
@@ -0,0 +1,14 @@
+//process doge / btc
+
+function keypadEntry(current, keypressed){
+	amount = parseFloat(current);
+	add = parseFloat(keypressed);
+
+	if (keypressed != '00'){
+		amount = (amount*10)+(add/100);
+	} else {
+		amount = amount * 100;
+	}
+
+	return amount.toFixed(2);
+}
diff --git a/process_btc.php b/process_btc.php
@@ -10,6 +10,9 @@
 require_once("models/ajax_calls.php");
 ?>
 
+
+<script type="text/javascript" src="/js/functions.js"></script>
+
 <div class='container container_12'>
 	<div class="currency">
 		<img src="images/bitcoin.png">
@@ -18,8 +21,8 @@
 	</div>
 	<div class="amount">
 		<form method="post">
-			<label for="dollars" class="symbol"><?php echo $loggedInUser->currencySymbol();?></label>
-			<input type="number" name="dollars" id="dollars" class="dollars">
+			<label for="dollars" class="symbol"><?php echo $loggedInUser->currencySymbol();?></label>
+			<input type="number" name="dollars" id="dollars" class="dollars" value="0.00">
 			<div class="calc">
 				<div class="key">1</div>
 				<div class="key">2</div>
@@ -30,9 +33,9 @@
 				<div class="key">7</div>
 				<div class="key">8</div>
 				<div class="key">9</div>
-				<div class="btnkey">del</div>
+				<div class="btnkey">clr</div>
 				<div class="key">0</div>
-				<div class="key">.</div>
+				<div class="key">00</div>
 			</div>
 			<input type="submit" id="submit" >
 		</form>
@@ -78,33 +81,24 @@
 
 		//number pad jquery stuff
 		 $('.key').click(function(event){
-        var numBox = jQuery('#dollars');
-        if(this.innerHTML == '0'){
-            if (numBox.val().length > 0) {
-                numBox.val(numBox.val() + this.innerHTML);
-            }
-        }
-        else {
-            numBox.val(numBox.val() + this.innerHTML);
-        }
+        var numBox = jQuery('#dollars');
+
+        numBox.val(keypadEntry(numBox.val(), this.innerHTML));
+
         jQuery('#dollars').trigger("keyup");		
         event.stopPropagation();
     });
 
 
 
-    $('.btnkey').click(function(event){
-        if(this.innerHTML == 'del'){
+    $('.btnkey').click(function(event){
+        if(this.innerHTML == 'clr'){
             var numBox = jQuery('#dollars');
-            if(numBox.val().length > 0){
-                numBox.val( numBox.val().substring(0, numBox.val().length - 1));
-            }
+            numBox.val('0.00');
+            //trigger keyup to reprocess conversion
+			jQuery('#dollars').trigger("keyup");
+			event.stopPropagation();
         }
-        else{
-            document.getElementById('numBox').innerHTML = '';
-        }
-        jQuery('#dollars').trigger("keyup");
-        event.stopPropagation();
     });
 
 		jQuery('#dollars').keyup(function(){

diff --git a/process_doge.php b/process_doge.php
@@ -10,6 +10,9 @@
 require_once("models/ajax_calls.php");
 ?>
 
+
+<script type="text/javascript" src="/js/functions.js"></script>
+
 <div class='container container_12'>
 	<div class="currency">
 		<img src="images/dogecoin.png">
@@ -18,8 +21,8 @@
 	</div>
 	<div class="amount">
 		<form method="post">
-			<label for="dollars" class="symbol"><?php echo $loggedInUser->currencySymbol();?></label>
-			<input type="number" name="dollars" id="dollars" class="dollars">
+			<label for="dollars" class="symbol"><?php echo $loggedInUser->currencySymbol();?></label>
+			<input type="number" name="dollars" id="dollars" class="dollars" value="0.00">
 			<div class="calc">
 				<div class="key">1</div>
 				<div class="key">2</div>
@@ -29,10 +32,10 @@
 				<div class="key">6</div>
 				<div class="key">7</div>
 				<div class="key">8</div>
-				<div class="key">9</div>
-				<div class="btnkey">del</div>
+				<div class="key">9</div>
+				<div class="btnkey">clr</div>
 				<div class="key">0</div>
-				<div class="key">.</div>
+				<div class="key">00</div>
 			</div>
 			<input type="submit" id="submit" >
 		</form>
@@ -79,33 +82,25 @@
 
 		//number pad jquery stuff
 		 $('.key').click(function(event){
-        var numBox = jQuery('#dollars');
-        if(this.innerHTML == '0'){
-            if (numBox.val().length > 0) {
-                numBox.val(numBox.val() + this.innerHTML);
-            }
-        }
-        else {
-            numBox.val(numBox.val() + this.innerHTML);
-        }
+        var numBox = jQuery('#dollars');
+
+        numBox.val(keypadEntry(numBox.val(), this.innerHTML));
+
         jQuery('#dollars').trigger("keyup");
         event.stopPropagation();
     });
 
 
 
+
     $('.btnkey').click(function(event){
-        if(this.innerHTML == 'del'){
+        if(this.innerHTML == 'clr'){
             var numBox = jQuery('#dollars');
-            if(numBox.val().length > 0){
-                numBox.val( numBox.val().substring(0, numBox.val().length - 1));
-            }
+            numBox.val('0.00');
+            //trigger keyup to reprocess conversion
+			jQuery('#dollars').trigger("keyup");
+			event.stopPropagation();
         }
-        else{
-            document.getElementById('numBox').innerHTML = '';
-        }
-        jQuery('#dollars').trigger("keyup");
-        event.stopPropagation();
     });