Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

This commit is contained in:
phyusin
2018-07-24 14:04:05 +06:30

View File

@@ -880,7 +880,7 @@ end
def self.get_item_query(type) def self.get_item_query(type)
if type == "revenue" || type.nil? if type == "revenue" || type.nil?
sale_type = "i.status IS NULL and i.qty >0 " sale_type = "i.qty != 0 "
elsif type == "all" elsif type == "all"
sale_type = "" sale_type = ""
elsif type == "discount" elsif type == "discount"