merge with r-19

2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -813,8 +813,10 @@
        if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
          if (discount) {
            if(checkReceiptNoInFirstBillData(receipt_no,"")){
+              $("button.change_tax").hide();
              $("#pay").show();
            }else{
+              $("button.change_tax").show();
              $("#pay").hide();
            }
          }