From fb0e832ea697592d3cb923cfc9e1b87ab96f5181 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Thu, 7 Jun 2018 11:02:23 +0630
Subject: [PATCH] Modified in Close Cashier,Other Charges and Survey minus sugn

---
 .../origami/other_charges/index.html.erb      | 12 ++++--
 app/views/origami/shifts/show.html.erb        |  7 +++-
 app/views/origami/surveys/_form.html.erb      | 42 +++++++++++++++----
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index bf119be0..fe74f057 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -96,9 +96,9 @@
   				<div class="form-horizontal">
   					<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">	
   					  <div class="bottom-5">										
-  							<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" onkeypress="return isNumberKey(event);" />		
+  							<input type="number" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" onkeypress="return isNumberKey(event);", onkeyup="otherCharges(this.value);" />		
                 <br><span id="other-charges-amountErr" style="color:red;"></span>					
-  						</div>						
+  						</div>		
   						<div class="bottom-5">
   							<textarea id="reasons" name="reasons" rows="2" class="form-control" placeholder="Reasons"></textarea>
   						</div>
@@ -208,7 +208,13 @@
 </div>
 </div>
 <script type="text/javascript">
-var cashier_type = "<%= @cashier_type %>";
+
+  function otherCharges(val){
+    var aa = parseInt(val);
+    if(isNaN(aa)) $("#other-charges-amount").val("");
+  }
+  
+  var cashier_type = "<%= @cashier_type %>";
 
 	$(document).ready(function(){   
     setHeaderBreadCrumb(_OTHER_CHARGES_);
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 09230d7c..f9e923e8 100755
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -24,7 +24,7 @@
           <span style='font-size:20px;'><b><%= t :closing_balance %></b></span>
         </div>
         <div class='col-md-6'>
-          <span style='font-size:20px;'><b><input type='number' class="form-control" id='closing_balance_amount' value='' onkeypress="return isNumberKey(event);" onkeyup="notNegative(this.value);"></b></span>
+          <span style='font-size:20px;'><b><input type='number' class="form-control" id='closing_balance_amount' value='' onkeypress="return isNumberKey(event);" onkeyup="closeCashier(this.value);"></b></span>
         </div>
       </div>
     </div>
@@ -59,6 +59,11 @@
 </div>
 <script>
 
+  function closeCashier(val){
+    var aa = parseInt(val);
+    if(isNaN(aa)) $("#closing_balance_amount").val("");
+  }
+
   function isNumberKey(evt) {
     var charCode = (evt.which) ? evt.which : event.keyCode;
     if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
diff --git a/app/views/origami/surveys/_form.html.erb b/app/views/origami/surveys/_form.html.erb
index 99120a0b..77f59d41 100755
--- a/app/views/origami/surveys/_form.html.erb
+++ b/app/views/origami/surveys/_form.html.erb
@@ -9,24 +9,24 @@
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                   <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10', :onChange => "total_customer();" }%>
+                   <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyChild(this.value);" }%>
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10', :onkeyup => "total_customer();" }%>
+                  <%= f.input :adult, input_html: { value: @survey_data.adult, class: 'col-md-10', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyAdult(this.value);" }%> 
                 </div>
               </div>
             </div>  
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :male , input_html: { value: @survey_data.male, class: 'col-md-10' }%>
+                  <%= f.input :male , input_html: { value: @survey_data.male, class: 'col-md-10', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyMale(this.value);" }%> 
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :female , input_html: { value: @survey_data.female, class: 'col-md-10' }%>
+                  <%= f.input :female , input_html: { value: @survey_data.female, class: 'col-md-10', :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyFemale(this.value);" }%>
                 </div>
               </div>
             </div>   
@@ -67,24 +67,24 @@
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :child , input_html: { class: 'col-md-10' ,min:'1', :onChange => "total_customer();"}%>
+                  <%= f.input :child , input_html: { class: 'col-md-10' ,min:'1', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyChild(this.value);" }%>
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :adult , input_html: { class: 'col-md-10' ,min:'1', :onChange => "total_customer();"}%>     
+                  <%= f.input :adult , input_html: { class: 'col-md-10' ,min:'1', :onChange => "total_customer();", :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyAdult(this.value);" }%> 
                 </div>
               </div>
             </div>  
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :male , input_html: { min:'1',class: 'col-md-10' }%>
+                  <%= f.input :male , input_html: { min:'1',class: 'col-md-10' , :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyMale(this.value);" }%> 
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-                  <%= f.input :female , input_html: { min:'1',class: 'col-md-10' }%>   
+                  <%= f.input :female , input_html: { min:'1',class: 'col-md-10' , :onkeypress => "return isNumberKey(event);", :onkeyup => "surveyFemale(this.value);" }%> 
                 </div>
               </div>
             </div>
@@ -243,6 +243,32 @@
 </div>
 
 <script type="text/javascript">
+
+  function isNumberKey(evt) {
+    var charCode = (evt.which) ? evt.which : event.keyCode;
+    if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
+      return false;
+    } else {
+      return true;
+    }      
+  }
+  function surveyChild(val){
+    var aa = parseInt(val);
+    if(isNaN(aa)) $("#survey_child").val("");
+  }
+  function surveyAdult(val){
+    var aa = parseInt(val);
+    if(isNaN(aa)) $("#survey_adult").val("");
+  }
+  function surveyMale(val){
+    var aa = parseInt(val);
+    if(isNaN(aa)) $("#survey_male").val("");
+  }
+  function surveyFemale(val){
+    var aa = parseInt(val);
+    if(isNaN(aa)) $("#survey_female").val("");
+  }
+
 var cashier_type = "<%= @cashier_type %>"; 
   $(document).ready(function(){
     /* check webview loaded*/