From 7aa1627e905e09957cf642fb69bc69cb7dbf1147 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 6 Dec 2017 13:43:22 +0630
Subject: [PATCH] update call waiter and sale item

---
 app/views/reports/saleitem/index.html.erb | 2 +-
 config/application.rb                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 86dc85b4..faad445d 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -202,7 +202,7 @@
 								<td colspan="5">&nbsp;</td>
 								<td style="border-top:2px solid grey;">Net Amount</td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= grand_total + total_tax%></td> 
+								<td style="border-top:2px solid grey;"><%= grand_total.to_f + total_tax.to_f%></td> 
 							</tr>
 							<!-- <tr>
 								<td colspan="5">&nbsp;</td>
diff --git a/config/application.rb b/config/application.rb
index b83917cc..6a3bc551 100755
--- a/config/application.rb
+++ b/config/application.rb
@@ -18,6 +18,6 @@ module SXRestaurants
 
     config.active_record.time_zone_aware_types = [:datetime, :time]
     config.active_job.queue_adapter = :sidekiq
-    config.time_zone = 'Asia/Rangoon'    
+    config.time_zone = 'Asia/Rangoon'
   end
 end