diff --git a/app/models/sale.rb b/app/models/sale.rb
index f440eb2f..d4880929 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1219,11 +1219,12 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,
 
   sub_query2 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0
                         THEN CONCAT(DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'),' - ',DATE_FORMAT(CONVERT_TZ(shift_closed_at,'+00:00','+06:30'),'%d %b %y %h:%i%p'))
+                        WHEN shift_started_at IS NOT NULL AND shift_closed_at IS NULL AND credit_payment > 0 THEN DATE_FORMAT(CONVERT_TZ(shift_started_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') 
                         ELSE '-' END)
                 FROM shift_sales
                       WHERE shift_sales.id = s.shift_sale_id"
 
-  sub_query3 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL AND credit_payment > 0
+  sub_query3 = "SELECT (CASE WHEN shift_closed_at IS NOT NULL OR shift_closed_at IS NULL AND credit_payment > 0
                 THEN employees.name ELSE '-' END)
                FROM shift_sales
                  INNER JOIN employees ON employees.id=shift_sales.employee_id