diff --git a/discount/init.py b/discount/init.py index 084192a..3f392d3 100644 --- a/discount/init.py +++ b/discount/init.py @@ -1139,22 +1139,13 @@ async def get_reseller_sales(request): if not userorgid: return [] async with DBPools().sqlorContext('sage') as sor: - if userorgid == '0': - rows = await sor.sqlExe( - """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name - FROM users u - JOIN userrole ur ON ur.userid = u.id - JOIN role r ON r.id = ur.roleid - WHERE r.name = 'sale' - ORDER BY sale_name""", {}) - else: - rows = await sor.sqlExe( - """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name - FROM users u - JOIN userrole ur ON ur.userid = u.id - JOIN role r ON r.id = ur.roleid - WHERE r.name = 'sale' AND u.orgid = ${oid}$ - ORDER BY sale_name""", - {'oid': userorgid}) + rows = await sor.sqlExe( + """SELECT DISTINCT u.id as sale_id, COALESCE(u.username, u.nick_name, u.id) as sale_name + FROM users u + JOIN userrole ur ON ur.userid = u.id + JOIN role r ON r.id = ur.roleid + WHERE r.name = 'sale' AND u.orgid = ${oid}$ + ORDER BY sale_name""", + {'oid': userorgid}) return [{'value': r.sale_id, 'text': r.sale_name} for r in rows]