From 19528b189f79b5edffc81664a91b039acde603f5 Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 23 Jun 2017 09:50:37 +0630 Subject: [PATCH] Update --- app/views/origami/home/show.html.erb | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 1652c675..781f925b 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -142,7 +142,7 @@ sub_total = sub_total + sale_item.price %> - <% + <% # Can't check for discount unless sale_item.price == 0 %> @@ -259,22 +259,22 @@ <% if @dining.bookings.length >= 1 %> - - - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - <% else %> + + + + + + + <% else %> + + - - - + + <% end %> @@ -313,7 +313,7 @@ $(document).ready(function(){ var sale_id = $('#save_order_id').attr('data-order'); } - window.location.href = '/origami/'+ sale_id + "/customers" + window.location.href = '/origami/'+ sale_id + "/customers" }); // Discount for Payment @@ -324,7 +324,7 @@ $(document).ready(function(){ }else{ var sale_id = $('#save_order_id').attr('data-order'); } - + if(sale_id!=""){ window.location.href = '/origami/' + sale_id + '/discount' }