Subversion Repositories SmartDukaan

Rev

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

Rev 15420 Rev 15448
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(or_(Users.referrer==retailerLink.code, Users.utm_campaign==retailerLink.code)).first()
848
    user = session.query(Users).filter(or_(func.lower(Users.referrer)==retailerLink.code.lower(), 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):
Line 863... Line 863...
863
            mapped_with = 'contact'
863
            mapped_with = 'contact'
864
    else:
864
    else:
865
        mapped_with = 'code'
865
        mapped_with = 'code'
866
    retailerLink.mapped_with = mapped_with
866
    retailerLink.mapped_with = mapped_with
867
    if user.activation_time is not None:
867
    if user.activation_time is not None:
-
 
868
        retailerLink.activated = user.activation_time
868
        retailerLink.activated = user.created
869
    retailerLink.activated = user.created
869
    retailerLink.user_id = user.id
870
    retailerLink.user_id = user.id
870
    retailer = session.query(Retailers).filter_by(id=retailerId).first()
871
    retailer = session.query(Retailers).filter_by(id=retailerId).first()
871
    if retailer.status != 'onboarded':
872
    if retailer.status != 'onboarded':
872
        retailer.status = 'onboarding'
873
        retailer.status = 'onboarding'
873
        retailer.call_priority = None
874
        retailer.call_priority = None
Line 988... Line 989...
988
    try:
989
    try:
989
        user = session.query(Users).filter_by(id=userId).first()
990
        user = session.query(Users).filter_by(id=userId).first()
990
        result = False                
991
        result = False                
991
        mappedWith = 'contact'
992
        mappedWith = 'contact'
992
        if user is not None:
993
        if user is not None:
993
            retailerLink = session.query(RetailerLinks).filter_by(code=user.referrer).first()
994
            retailerLink = session.query(RetailerLinks).filter(or_(RetailerLinks.code==user.referrer.upper(), RetailerLinks.code==user.utm_campaign)).first()
994
            if retailerLink is None:
995
            if retailerLink is None:
995
                retailerContact = session.query(RetailerContacts).filter_by(mobile_number=user.mobile_number).first()
996
                retailerContact = session.query(RetailerContacts).filter_by(mobile_number=user.mobile_number).first()
996
                if retailerContact is None:
997
                if retailerContact is None:
997
                    retailer = session.query(Retailers).filter(Retailers.status.in_(['followup', 'fretry'])).filter(or_(Retailers.contact1==user.mobile_number,Retailers.contact2==user.mobile_number)).first()
998
                    retailer = session.query(Retailers).filter(Retailers.status.in_(['followup', 'fretry'])).filter(or_(Retailers.contact1==user.mobile_number,Retailers.contact2==user.mobile_number)).first()
998
                else:
999
                else: