Subversion Repositories SmartDukaan

Rev

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

Rev 15391 Rev 15420
Line 843... Line 843...
843
        return True
843
        return True
844
        
844
        
845
        
845
        
846
def isActivated(retailerId):
846
def isActivated(retailerId):
847
    retailerLink = session.query(RetailerLinks).filter_by(retailer_id=retailerId).first()
847
    retailerLink = session.query(RetailerLinks).filter_by(retailer_id=retailerId).first()
848
    user = session.query(Users).filter_by(referrer=retailerLink.code).filter_by(activated=1).first()
848
    user = session.query(Users).filter(or_(Users.referrer==retailerLink.code, Users.utm_campaign==retailerLink.code)).first()
849
    if user is None:
849
    if user is None:
850
        mobileNumbers = list(session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailerId).all())
850
        mobileNumbers = list(session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailerId).all())
851
        user = session.query(Users).filter(Users.mobile_number.in_(mobileNumbers)).first()
851
        user = session.query(Users).filter(Users.mobile_number.in_(mobileNumbers)).first()
852
        if user is None:
852
        if user is None:
853
            if retailerLink.created < datetime(2015,5,26):
853
            if retailerLink.created < datetime(2015,5,26):