From 3a1fba2c6f2f1a3fb96e5e130c5513b3aec622c0 Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Sun, 18 Jun 2017 13:18:23 +0630
Subject: [PATCH] Other Payments Bug fix

---
 app/views/origami/jcb/index.html.erb    | 8 +++++++-
 app/views/origami/master/index.html.erb | 8 +++++++-
 app/views/origami/mpu/index.html.erb    | 8 +++++++-
 app/views/origami/visa/index.html.erb   | 8 +++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 6d08b25a..9c239931 100644
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 // number key pad
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
@@ -141,7 +147,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#jcb_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_jcb %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
 	    $.ajax({type: "POST",
 	      url: "<%= origami_payment_jcb_path  %>",
 	      data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 5767ad0f..a545b656 100644
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
@@ -138,7 +144,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_master %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
     $.ajax({type: "POST",
       url: "<%= origami_payment_master_path  %>",
       data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f58ca552..59bc932f 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
@@ -138,7 +144,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#mpu_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_mpu %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
 	    $.ajax({type: "POST",
 	      url: "<%= origami_payment_mpu_path  %>",
 	      data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index e01ca696..81640c68 100644
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
@@ -138,7 +144,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_visa %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value"))){
     $.ajax({type: "POST",
       url: "<%= origami_payment_visa_path  %>",
       data: "amount="+ amount + "&sale_id="+ sale_id,