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

2017-06-16 10:22:21 +06:30
parent f06235c2cf 87c3546974
commit 0e21117f05
16 changed files with 254 additions and 196 deletions
--- a/app/assets/javascripts/origami.js
+++ b/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;
 		}