Subversion Repositories SmartDukaan

Rev

Rev 19897 | Rev 20079 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 19897 Rev 19928
Line 1253... Line 1253...
1253
                    contact = m.group(1) if m.group(1) != '' else m.group(3)
1253
                    contact = m.group(1) if m.group(1) != '' else m.group(3)
1254
                    anotherCondition = and_(Retailers.title.ilike('%%%s%%'%(contact)), Retailers.pin==pin)
1254
                    anotherCondition = and_(Retailers.title.ilike('%%%s%%'%(contact)), Retailers.pin==pin)
1255
                else:
1255
                else:
1256
                    anotherCondition = Retailers.title.ilike('%%%s%%'%(contact))
1256
                    anotherCondition = Retailers.title.ilike('%%%s%%'%(contact))
1257
            
1257
            
1258
            retailers = session.query(Retailers).filter(anotherCondition).limit(20).all()
1258
            retailers = session.query(Retailers).filter(anotherCondition).filter(Retailers.isvalidated==1).limit(20).all()
1259
            if retailers is None:
1259
            if retailers is None:
1260
                resp.body = json.dumps("{}")
1260
                resp.body = json.dumps("{}")
1261
            else:
1261
            else:
1262
                for retailer in retailers:
1262
                for retailer in retailers:
1263
                    otherContacts = [r for r, in session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailer.id).order_by(RetailerContacts.contact_type).all()]
1263
                    otherContacts = [r for r, in session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailer.id).order_by(RetailerContacts.contact_type).all()]
1264
                    retailersJsonArray.append(todict(getRetailerObj(retailer, otherContacts)))    
1264
                    retailersJsonArray.append(todict(getRetailerObj(retailer, otherContacts)))    
1265
            resp.body = json.dumps({"Retailers":retailersJsonArray}, encoding='utf-8')
1265
            resp.body = json.dumps({"Retailers":retailersJsonArray}, encoding='utf-8')
1266
            return
-
 
1267
        finally:
1266
        finally:
1268
            session.close()
1267
            session.close()
1269
 
1268
 
1270
    
1269
    
1271
class Mock(object):
1270
class Mock(object):