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

app/views/crm/customers/index.html.erb

@@ -138,6 +138,8 @@ $(function() {
 
   $(document).on('click',".customer_tr",function(){
      // if(this.checked){
+          $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
+            //$( "#checkbox_check" ).prop( "checked", true );
             var sale_id     = $("#sale_id").val() || 0;
             var customer_id = $(this).attr('data-ref');
 

app/views/origami/customers/index.html.erb

@@ -136,7 +136,7 @@
 
   $(document).on('click',".customer_tr",function(){
      // if(this.checked){
-            
+            $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
             var sale_id     = $("#sale_id").val() || 0;
             var customer_id = $(this).attr('data-ref');
 

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

@@ -93,7 +93,7 @@
     <hr>
     <div class="row">
       <div class="col-md-8">Cash</div>
-      <div class="col-md-4" id="amount" ><%= @cash %></div>
+      <div class="col-md-4" id="cash" ><%= @cash %></div>
     </div>
     <hr>
     <div class="row" id="credit_payment">
@@ -193,8 +193,11 @@ $(document).on('click', '.cashier_number', function(event){
           update_balance();
         break;
         case 'del' :
-          var cash=$('#amount').text();
+          var cash=$('#cash').text();
-          $('#cash').text(cash.substr(0,cash.length-1));
+          if(cash.length == 1)
+            $('#cash').text("0.0");
+          else
+            $('#cash').text(cash.substr(0,cash.length-1));
           update_balance();
         break;
         case 'clr':
@@ -258,7 +261,7 @@ function update_balance(){
   var card = $('#others').text();
   var amount_due = $('#amount_due').text();
   var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card)
-  var result = amount_due - total
+  var result = amount_due - total;
   $('#balance').text(result.toFixed(2));
 }
 </script>

app/views/transactions/sales/show.html.erb

@@ -23,7 +23,7 @@
                 <th>Receipt Date </th>
                 <th>Receipt no</th>
                 <th>Cashier</th>
-                <th>OSales status</th>
+                <th>Sales status</th>
                 <th>Receipt generated at</th>
               </tr>
             </thead>