Merge branch 'r-1902001-01' into foodcourt

2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -41,7 +41,7 @@
 						<% end %>
 						<tr>
 							<% @payment_methods.each do |method| %>
-								<th><%= t("views.right_panel.detail.#{method} Sales") %></th>
+								<th><%= t("views.right_panel.detail.#{method.parameterize == 'paymal' ? 'card_sales' : method.parameterize}") %></th>
 							<% end %>
 							<th><%= t("views.right_panel.detail.cash_sales") %></th>
 							<th><%= t("views.right_panel.detail.credit_sales") %></th>