diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 03aea036..1365842f 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -46,7 +46,10 @@
<%= t("views.right_panel.detail.cash_sales") %> |
<%= t("views.right_panel.detail.credit_sales") %> |
<%= t("views.right_panel.detail.void_amount") %> |
- <%= t("views.right_panel.detail.mmqr_void_amount") %> |
+ <% mmqr = PaymentMethodSetting.find_by(payment_method: 'MMQR') %>
+ <% if mmqr.present? && mmqr.is_active %>
+ <%= t("views.right_panel.detail.mmqr_void_amount") %> |
+ <% end %>
<%= t("views.right_panel.detail.foc_sales") %> |
(<%= t("views.right_panel.detail.discount") %>) |
<% if @tax_profiles.present? %>
@@ -101,7 +104,9 @@
<%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%> |
<%= number_format(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_format(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% if mmqr.present? && mmqr.is_active %>
+ <%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% end %>
<%= number_format(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>) |
@@ -131,7 +136,9 @@
<%= number_format(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% if mmqr.present? && mmqr.is_active %>
+ <%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% end %>
<%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) |
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index ba0de956..305bf6d3 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -35,7 +35,10 @@
<%= t("views.right_panel.detail.cash_sales") %> |
<%= t("views.right_panel.detail.credit_sales") %> |
<%= t("views.right_panel.detail.void_amount") %> |
- <%= t("views.right_panel.detail.mmqr_void_amount") %> |
+ <% mmqr = PaymentMethodSetting.find_by(payment_method: 'MMQR') %>
+ <% if mmqr.present? && mmqr.is_active %>
+ <%= t("views.right_panel.detail.mmqr_void_amount") %> |
+ <% end %>
<%= t("views.right_panel.detail.foc_sales") %> |
(<%= t("views.right_panel.detail.discount") %>) |
<% if @tax_profiles.present? %>
@@ -89,7 +92,10 @@
<%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%> |
<%= number_format(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_format(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% if mmqr.present? && mmqr.is_active %>
+ <%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% end %>
+
<%= number_format(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>) |
@@ -119,7 +125,9 @@
<%= number_format(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
<%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
- <%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% if mmqr.present? && mmqr.is_active %>
+ <%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
+ <% end %>
<%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%> |
(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>) |
diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
index 176761ce..65217c56 100755
--- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb
@@ -33,14 +33,17 @@
-->
-
-
-
-
+ <% mmqr = PaymentMethodSetting.find_by(payment_method: 'MMQR') %>
+ <% if mmqr.present? && mmqr.is_active %>
+
+
+
+
+ <% end %>