diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/orgiami.js index 1abc6f65..86db6a91 100644 --- a/app/assets/javascripts/orgiami.js +++ b/app/assets/javascripts/orgiami.js @@ -152,13 +152,19 @@ $(document).on('click', '.cashier_number', function(event){ }); function update_balance(){ - var discount_amount = $('#discount-amount').val(); - var sub_total = $('#order-sub-total').text(); - var tax = $('#order-Tax').text(); + var discount_type = $('#discount-type').val(); + var discount_amount = $('#discount-amount').val(); + var sub_total = $('#order-sub-total').text(); + var tax = $('#order-Tax').text(); - var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; - $('#order-discount').text(discount_amount); - $('#order-grand-total').text(total); + // For Percentage Discount + if(discount_type='1'){ + discount-amount=(sub_total*discount-amount)/100; + } + + var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; + $('#order-discount').text(discount_amount); + $('#order-grand-total').text(total); } diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 32093621..d4d2f177 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -90,7 +90,7 @@
-