diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index e1cdb699..c32e66c0 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -139,6 +139,8 @@
  <!-- Column One -->
 <script>
 $(document).ready(function(){
+  localStorage.removeItem("tax_type");
+  
   var webview = <%= @webview %>;
 
   showHideNavbar(webview,"index");
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 5f24494f..f1979aef 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -622,6 +622,7 @@
 <script>
   var cashier_type = "cashier";
     $(document).ready(function () {
+      localStorage.removeItem("tax_type");
       /* check webview loaded*/
       var webview = <%= @webview %>;
       showHideNavbar(webview);
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index b1c9dde6..f83c1d55 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -678,6 +678,8 @@ var customer_name = "<%= @customer.name %>";
       $('#cash').text(localStorage.getItem("cash"));
     }
     update_balance();
+    //checkChangableTax
+    checkChangableTax();
 
     // Disable click event cash to prevent
     $(".payment .cash-color").off('click');
@@ -743,7 +745,7 @@ var customer_name = "<%= @customer.name %>";
             var credit = $('#credit').text();
             var card   = $('#card').text();
 
-            var tax_type = $("input:radio[name=tax_type]:checked").val();
+            var tax_type = localStorage.getItem("tax_type") ? localStorage.getItem("tax_type") : '';
 
             if (credit <= 0) {
               calculate_member_discount(sale_id);
@@ -842,7 +844,7 @@ var customer_name = "<%= @customer.name %>";
     //           }
     //         })
     //   }else{
-    //     swal("Opps","You are not authorized for void","warning")
+    //     swal("Oops","You are not authorized for void","warning")
     //   }
     // });
     
@@ -1018,6 +1020,7 @@ var customer_name = "<%= @customer.name %>";
       $('#balance').text(parseFloat(result));
     <% end %>
   }
+
   function customer_display_view(data,status) {
      $.ajax({
         type: "POST",
@@ -1288,7 +1291,7 @@ var customer_name = "<%= @customer.name %>";
                  // overall_foc();
                }
              }else{
-               swal("Opps",result.message,"warning")
+               swal("Oops",result.message,"warning");
              }
           }
       });
@@ -1413,14 +1416,22 @@ var customer_name = "<%= @customer.name %>";
 
   /* Start function for tax changable */
   $(".change_tax").on("click",function(){
-    $("#change_taxModal").modal({show: true, backdrop: false, keyboard: false});
+    var balance = parseFloat($("#balance").text());
+    var sub_total = parseFloat($("#sub-total").text());
+    var total_tax = parseFloat($("#total_tax").text());
+    if(balance > 0 && (balance >= total_tax)){
+      $("#change_taxModal").modal({show: true, backdrop: false, keyboard: false});
+    }
+    else{
+      swal("Oops","You cann't change tax!","warning");
+    }
   });
 
   $("button[name=tax_type]").on("click", function(){
     var type = $(this).attr("data-value");
     var cashier_type = '<%= @cashier_type %>';
     var sale_id = $('#sale_id').text();
-    console.log(type);
+    localStorage.removeItem("tax_type");
     swal({
       title: "Alert",
       text: "Are you sure want to change tax?",
@@ -1437,6 +1448,8 @@ var customer_name = "<%= @customer.name %>";
           data: {sale_id: sale_id, cashier_type: cashier_type, tax_type: type},
           success:function(data){ 
             if(data.status){
+              // console.log(type);
+              localStorage.setItem("tax_type", type);
               window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment';
             } 
           }
@@ -1447,4 +1460,16 @@ var customer_name = "<%= @customer.name %>";
     });
   });
   /* End function for tax changable */
+
+  /* check change tax is available or not*/
+  function checkChangableTax(){
+    var balance = parseFloat($("#balance").text());
+    var sub_total = parseFloat($("#sub-total").text());
+    var total_tax = parseFloat($("#total_tax").text());
+    if(balance > 0 && (balance >= total_tax)){
+      $(".change_tax").show();
+    }else{
+      $(".change_tax").hide();
+    }
+  }
 </script>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 9ee77b99..61e1f9fe 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -603,6 +603,7 @@
 <script>
 var cashier_type = "cashier";
 $(document).ready(function(){
+  localStorage.removeItem("tax_type");
    /* check webview loaded*/
     var webview = <%= @webview %>;
     showHideNavbar(webview);