toggle mmqr cancel amount in dailysale and filter in void sale

app/views/reports/dailysale/index.html.erb

@@ -46,7 +46,10 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
-									<th style='text-align:center;'><%= t("views.right_panel.detail.mmqr_void_amount") %></th>
+                                    <% mmqr = PaymentMethodSetting.find_by(payment_method: 'MMQR') %>
+                                    <% if mmqr.present? && mmqr.is_active %>
+                                      <th style='text-align:center;'><%= t("views.right_panel.detail.mmqr_void_amount") %></th>
+                                    <% end %>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
 									<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
 									<% if @tax_profiles.present? %>
@@ -101,7 +104,9 @@
 									<td style='text-align:right;'><%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='color:red;text-align:right;'><%= number_format(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='color:red;text-align:right;'><%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<% if mmqr.present? && mmqr.is_active %>
+									    <td style='color:red;text-align:right;'><%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+                                    <% end %>
 									<td style='text-align:right;'><%= number_format(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 									<td style='text-align:right;'>(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
@@ -131,7 +136,9 @@
 									<td style='text-align:right;'><%= number_format(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='color:red;text-align:right;'><%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='color:red;text-align:right;'><%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<% if mmqr.present? && mmqr.is_active %>
+									    <td style='color:red;text-align:right;'><%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<% end %>
 									<td style='text-align:right;'><%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'>(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
 

app/views/reports/dailysale/index.xls.erb

@@ -35,7 +35,10 @@
                  <th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
                  <th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
                  <th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
-                 <th style='text-align:center;'><%= t("views.right_panel.detail.mmqr_void_amount") %></th>
+                 <% mmqr = PaymentMethodSetting.find_by(payment_method: 'MMQR') %>
+                 <% if mmqr.present? && mmqr.is_active %>
+                   <th style='text-align:center;'><%= t("views.right_panel.detail.mmqr_void_amount") %></th>
+                 <% end %>
                  <th style='text-align:center;'><%= t("views.right_panel.detail.foc_sales") %></th>
                  <th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
                  <% if @tax_profiles.present? %>
@@ -89,7 +92,10 @@
 								<td style='text-align:right;'><%= number_format(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='color:red;text-align:right;'><%= number_format(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								<td style='color:red;text-align:right;'><%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+                                <% if mmqr.present? && mmqr.is_active %>
+                                  <td style='color:red;text-align:right;'><%= number_format(sale[:mmqr_cancelled_void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+                                <% end %>
+
 								<td style='text-align:right;'><%= number_format(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 
 								<td style='text-align:right;'>(<%= number_format(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
@@ -119,7 +125,9 @@
 								<td style='text-align:right;'><%= number_format(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'><%= number_format(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='color:red;text-align:right;'><%= number_format(void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-								<td style='color:red;text-align:right;'><%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<% if mmqr.present? && mmqr.is_active %>
+								    <td style='color:red;text-align:right;'><%= number_format(mmqr_void, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+								<% end %>
 								<td style='text-align:right;'><%= number_format(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 								<td style='text-align:right;'>(<%= number_format(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
 

app/views/reports/void_sale/_shift_sale_report_filter.html.erb

@@ -33,14 +33,17 @@
 				<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;">
 				</select>
 			</div> -->
-			<div class="form-group col-lg-3 col-md-3 col-sm-3 mbl-style">
+			<% mmqr = PaymentMethodSetting.find_by(payment_method: 'MMQR') %>
-				<label class="font-20 mbl_lbl">Status</label>
+            <% if mmqr.present? && mmqr.is_active %>
-				<select class="form-control select" name="void_filter" id="void_filter" style="height: 37px;">
+    			<div class="form-group col-lg-3 col-md-3 col-sm-3 mbl-style">
-                    <option value="" <%= 'selected' if params[:void_filter].blank? %>>ALL</option>
+    				<label class="font-20 mbl_lbl">Status</label>
-                    <option value="void" <%= 'selected' if params[:void_filter] == 'void' %>>Void</option>
+    				<select class="form-control select" name="void_filter" id="void_filter" style="height: 37px;">
-                    <option value="cancelled_mmqr" <%= 'selected' if params[:void_filter] == 'cancelled_mmqr' %>>Cancelled Payment (MMQR)</option>
+                        <option value="" <%= 'selected' if params[:void_filter].blank? %>>ALL</option>
-                </select>
+                        <option value="void" <%= 'selected' if params[:void_filter] == 'void' %>>Void</option>
-			</div>
+                        <option value="cancelled_mmqr" <%= 'selected' if params[:void_filter] == 'cancelled_mmqr' %>>Cancelled Payment (MMQR)</option>
+                    </select>
+    			</div>
+			<% end %>
 			<div class=" col-lg-1 col-md-1 col-sm-1 margin-top-20 mbl-right-btn mbl-style">
 			<br>
 				<input type="submit" value="Generate Report" class='btn btn-primary'>