From 8d7bc2996e2a97a40ec9b5012cf5a7441cdb61a5 Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Tue, 21 Jul 2020 12:00:42 +0630 Subject: [PATCH] default value receipt no detail customer filter --- app/models/sale.rb | 2 +- .../_shift_sale_report_filter.html.erb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index 2a747067..1b9ae814 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1203,7 +1203,7 @@ end def self.get_shift_sales_by_receipt_no_detail(shift_sale_range, shift, from, to, payment_type, customer_filter) ## => left join -> show all sales although no orders - + puts customer_filter query = Sale.includes([:survey, :sale_payments]) .select("sales.*, SUM(sale_payments.payment_amount) AS payments_for_credits_amount") .select("dining_facilities.type AS table_type, dining_facilities.name AS table_name") diff --git a/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb index f2370451..56daeb30 100755 --- a/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb +++ b/app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb @@ -18,7 +18,12 @@ - + +
+ + +
+ <% if defined? @payment_methods %>
@@ -31,11 +36,6 @@
<% end %> -
- - -
-