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

2017-11-30 11:24:24 +06:30
parent 3c2bf42022 b3dae8c018
commit d15be90a9e
1 changed files with 1 additions and 1 deletions
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -92,7 +92,7 @@
 					<tbody>
 					    <% total = 0 %>
 						<% @pyament_method.each do |payment| %>
-							<% total += payment.payment_amount %>							
+							<% total += payment.payment_amount + payment.outstanding_amount %>							
 							<tr> 
 								<% if @shift_from.nil? && @shift_to.nil? %>
 								<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%></td>