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

app/assets/javascripts/OQS.js

@@ -18,9 +18,9 @@
 
 $(document).ready(function(){
 	// auto refresh every 10 seconds
-	setTimeout(function(){
-	   window.location.reload(1);
-	}, 10000);
+	// setTimeout(function(){
+	//    window.location.reload(1);
+	// }, 10000);
 
 	$('.queue_station').on('click',function(){    
 	    var orderZone=$(this).children().children().children('.order-zone').text();

app/assets/javascripts/origami.js

@@ -158,10 +158,11 @@ $(document).ready(function(){
 
 		if(sale_item_id != null){
 			ajax_url = "/origami/" + sale_item_id + "/discount";
+			sub_total =  $("#"+sale_item_id).children().find("#item-total-price").text();
 		}
 
 		// For Percentage Discount
-		if(discount_type == 1){
+		if(discount_type == 1){			
 			discount_amount=(sub_total*discount_value)/100;
 		}