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

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

@@ -163,18 +163,18 @@
              </thead>
              <tbody>
                <%
-
                  count = 0
                  sub_total = 0
                  if @status_sale == "sale"
                   @sale_array[0].sale_items.each do |sale_item|
-                    count += 1
-                  sub_total = sub_total + sale_item.price
+
+                    sub_total = sub_total + sale_item.price
                %>
                <input type="hidden" id="sale_id" value="<%= @sale_array[0].sale_id %>">
                <%
                # Can't check for discount
                 unless sale_item.price == 0
+                    count += 1
                 %>
                <tr>
                  <td><%= count %></td>
@@ -439,7 +439,7 @@ $("#first_bill").on('click', function(){
   $.ajax({
       type: "GET",
         url: ajax_url,
-        success:function(result){          
+        success:function(result){
           location.reload();
         }
     });
@@ -452,11 +452,11 @@ $('#pay').on('click',function() {
    $.ajax({
       type: "POST",
         url: '/origami/sale/'+ sale_id + "/rounding_adj",
-        success:function(result){          
+        success:function(result){
           window.location.href = '/origami/sale/'+ sale_id + "/payment";
         }
     });
-   
+
 });
 
 // Bill Request

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

@@ -334,6 +334,7 @@ $( document ).ready(function() {
  });
 
  $('#pay').click(function() {
+    $('#pay').text("Processing, Please wait!")
      if($('#balance').text() > 0){
         alert(" Insufficient Amount!")
      }else{
@@ -351,6 +352,7 @@ $( document ).ready(function() {
           if($('#balance').text() < 0){
             alert("Changed amount  " + $('#balance').text() * (-1) )
           }else{
+            $('#pay').text("Pay")
             alert("Thank you")
           }