Merge branch 'r-1902001-01' into foodcourt

2020-07-21 12:04:17 +06:30
parent d40cc6f0bd 8d7bc2996e
commit eeefa6182e
6 changed files with 25 additions and 8 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1243,7 +1243,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")