Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill

app/views/origami/home/show.html.erb

@@ -476,12 +476,14 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         
-        // console.log(checkReceiptNoInFirstBillData(receipt_no));
+        discount="<%= @membership.discount%>"
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          if(checkReceiptNoInFirstBillData(receipt_no,"")){
-            $("#pay").show();
-          }else{
-            $("#pay").hide();
+          if (discount) {
+            if(checkReceiptNoInFirstBillData(receipt_no,"")){
+              $("#pay").show();
+            }else{
+              $("#pay").hide();
+            }
           }
         }
       /* end check first bill or not*/