Subversion Repositories SmartDukaan

Rev

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

Rev 15334 Rev 15343
Line 628... Line 628...
628
        try:
628
        try:
629
            if retryFlag:
629
            if retryFlag:
630
                retailer = self.getRetryRetailer()
630
                retailer = self.getRetryRetailer()
631
            else:
631
            else:
632
                retailer = self.getNewRetailer()
632
                retailer = self.getNewRetailer()
-
 
633
            if retailer is None:
-
 
634
                resp.body = "{}"
-
 
635
                return
633
            fetchInfo = FetchDataHistory()
636
            fetchInfo = FetchDataHistory()
634
            fetchInfo.agent_id = self.agentId
637
            fetchInfo.agent_id = self.agentId
635
            fetchInfo.call_type = self.callType
638
            fetchInfo.call_type = self.callType
636
            agent = session.query(Agents).filter_by(id=self.agentId).first()
639
            agent = session.query(Agents).filter_by(id=self.agentId).first()
637
            last_disposition = session.query(CallHistory).filter_by(agent_id=self.agentId).order_by(CallHistory.id.desc()).first()
640
            last_disposition = session.query(CallHistory).filter_by(agent_id=self.agentId).order_by(CallHistory.id.desc()).first()
Line 643... Line 646...
643
                fetchInfo.last_action_time = last_disposition.created
646
                fetchInfo.last_action_time = last_disposition.created
644
            fetchInfo.retailer_id = retailer.id
647
            fetchInfo.retailer_id = retailer.id
645
            session.commit()
648
            session.commit()
646
            
649
            
647
            otherContacts = [r for r, in session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailer.id).order_by(RetailerContacts.contact_type).all()] 
650
            otherContacts = [r for r, in session.query(RetailerContacts.mobile_number).filter_by(retailer_id=retailer.id).order_by(RetailerContacts.contact_type).all()] 
648
            if retailer is None:
-
 
649
                resp.body = "{}"
-
 
650
            else:
-
 
651
                resp.body = json.dumps(todict(getRetailerObj(retailer, otherContacts)), encoding='utf-8')
651
            resp.body = json.dumps(todict(getRetailerObj(retailer, otherContacts)), encoding='utf-8')
652
            
652
            
653
            return
653
            return
654
            
654
            
655
        finally:
655
        finally:
656
            session.close()
656
            session.close()
Line 947... Line 947...
947
    def on_get(self, req, resp, userId):
947
    def on_get(self, req, resp, userId):
948
        return markDealerActivation(int(userId))
948
        return markDealerActivation(int(userId))
949
 
949
 
950
def markDealerActivation(userId):
950
def markDealerActivation(userId):
951
    try:
951
    try:
952
        user = session.query(Users).filter_by(id=userId)
952
        user = session.query(Users).filter_by(id=userId).first()
953
        result = False                
953
        result = False                
954
        mappedWith = 'contact'
954
        mappedWith = 'contact'
955
        if user is not None:
955
        if user is not None:
956
            retailerLink = session.query(RetailerLinks).filter_by(code=user.referrer).first()
956
            retailerLink = session.query(RetailerLinks).filter_by(code=user.referrer).first()
957
            if retailerLink is None:
957
            if retailerLink is None: