Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/assets/javascripts/OQS.js

@@ -33,9 +33,25 @@ $(document).on('turbolinks:load', function() {
 
     $(".tables").on("click", function(){
 
-       var table_id = $(this).val();
-       $('#table_id').val(table_id);
-       oqs_id = $("#oqs_id").val();
+ 		active     = $(this).hasClass('selected-table');
+ 		if (active) {      
+	        $(this).removeClass('bg-blue');
+	        $(this).addClass('green');
+	        $(this).removeClass('selected-table');
+	    }else{      
+	        $(this).removeClass('green');
+	        $(this).addClass('bg-blue');
+	        $(this).addClass('selected-table');
+	    }
+ 		var list = document.getElementsByClassName('selected-table');
+		var i;
+		var table_id =[];
+		for (i = 0; i < list.length; i++) {
+		    table_id.push(list[i].value);
+		} 
+       	$('#table_id').val(table_id);
+
+        oqs_id = $("#oqs_id").val();
     	if (table_id){
     		var table = table_id
     	}else{

app/assets/javascripts/custom.js

@@ -13,6 +13,16 @@ $(document).ready(function() {
     touchScrollStep : 50
   });
 
+  $('#table-slimscroll').slimScroll({
+      height: height,
+      size: '5px',
+      color: 'rgba(0,0,0,0.5)',
+      alwaysVisible: false,
+      borderRadius: '0',
+      railBorderRadius: '0',
+      touchScrollStep : 50
+  });
+
   $('#order-detail-slimscroll').slimScroll({
     height: height-$('#order-detail-slimscroll').attr('data-height'),
     size: '5px',

app/assets/javascripts/origami.js

@@ -361,6 +361,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
 function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type) {
 	$("#loading_wrapper").hide();
     var jobj = $.parseJSON(resMsg);
+    $("#reference_no").val(jobj.REFNUM);
     if(jobj.STATUS == "Approved"){
         $.ajax({type: "POST",
          	url: "/origami/payment/"+payment_type,