Subversion Repositories SmartDukaan

Rev

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

Rev 15686 Rev 15699
Line 570... Line 570...
570
                            retailer = Retailers()
570
                            retailer = Retailers()
571
                            retailer.contact1 = user.mobile_number
571
                            retailer.contact1 = user.mobile_number
572
                            retailer.status = 'assigned'
572
                            retailer.status = 'assigned'
573
                            retailer.retry_count = 0
573
                            retailer.retry_count = 0
574
                            retailer.invalid_retry_count = 0
574
                            retailer.invalid_retry_count = 0
-
 
575
                            retailer.is_elavated=1
575
                user.status = 2
576
                user.status = 2
576
                session.commit()
577
                session.commit()
577
                print "retailer id", retailer.id
578
                print "retailer id", retailer.id
578
                retailer.contact = user.mobile_number
579
                retailer.contact = user.mobile_number
579
                return retailer
580
                return retailer
Line 591... Line 592...
591
            while(retry):
592
            while(retry):
592
                lgr.info( "Calltype " + self.callType)
593
                lgr.info( "Calltype " + self.callType)
593
                status=self.callType
594
                status=self.callType
594
                query = session.query(Retailers).filter(Retailers.status==status).filter(or_(Retailers.agent_id==self.agentId, Retailers.agent_id==None))
595
                query = session.query(Retailers).filter(Retailers.status==status).filter(or_(Retailers.agent_id==self.agentId, Retailers.agent_id==None))
595
                if status=='fresh':
596
                if status=='fresh':
596
                    query = query.filter_by(is_or=False, is_std=False).filter(Retailers.cod_limit != None).order_by(Retailers.is_elavated.desc(), Retailers.agent_id.desc())
597
                    query = query.filter_by(is_or=False, is_std=False).filter(Retailers.cod_limit > 19999).order_by(Retailers.is_elavated.desc(), Retailers.agent_id.desc())
597
                elif status=='followup':
598
                elif status=='followup':
598
                    query = query.filter(Retailers.next_call_time<=datetime.now()).order_by(Retailers.agent_id.desc(),Retailers.next_call_time)
599
                    query = query.filter(Retailers.next_call_time<=datetime.now()).order_by(Retailers.agent_id.desc(),Retailers.next_call_time)
599
                else:
600
                else:
600
                    query = query.filter(Retailers.modified<=datetime.now()).order_by(Retailers.agent_id.desc(), Retailers.modified)
601
                    query = query.filter(Retailers.modified<=datetime.now()).order_by(Retailers.agent_id.desc(), Retailers.modified)
601
                    
602
                    
Line 1136... Line 1137...
1136
        obj.address = address.address
1137
        obj.address = address.address
1137
        obj.title = address.title
1138
        obj.title = address.title
1138
        obj.city = address.city
1139
        obj.city = address.city
1139
        obj.state = address.state
1140
        obj.state = address.state
1140
        obj.pin = address.pin 
1141
        obj.pin = address.pin 
1141
        obj.status = address.status
-
 
1142
    else:
1142
    else:
1143
        obj.address = retailer.address_new if retailer.address_new is not None else retailer.address
1143
        obj.address = retailer.address_new if retailer.address_new is not None else retailer.address
1144
        obj.title = retailer.title
1144
        obj.title = retailer.title
1145
        obj.city = retailer.city
1145
        obj.city = retailer.city
1146
        obj.state = retailer.state
1146
        obj.state = retailer.state
1147
        obj.pin = retailer.pin 
1147
        obj.pin = retailer.pin 
1148
        obj.status = retailer.status
1148
    obj.status = retailer.status
1149
        
1149
        
1150
    if hasattr(retailer, 'contact'):
1150
    if hasattr(retailer, 'contact'):
1151
        obj.contact = retailer.contact
1151
        obj.contact = retailer.contact
1152
    if callType == 'onboarding':
1152
    if callType == 'onboarding':
1153
        try:
1153
        try: