Subversion Repositories SmartDukaan

Rev

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

Rev 19732 Rev 19734
Line 663... Line 663...
663
            if retailerId is not None:
663
            if retailerId is not None:
664
                self.retailerId = int(retailerId)
664
                self.retailerId = int(retailerId)
665
                retailerLink = session.query(RetailerLinks).filter_by(retailer_id=self.retailerId).first()
665
                retailerLink = session.query(RetailerLinks).filter_by(retailer_id=self.retailerId).first()
666
                if retailerLink is not None:
666
                if retailerLink is not None:
667
                    code = retailerLink.code
667
                    code = retailerLink.code
-
 
668
                    retailerLink.agent_id = self.agentId
-
 
669
                    session.commit()
668
                else: 
670
                else: 
669
                    code = self.getNewRandomCode()
671
                    code = self.getNewRandomCode()
670
                    retailerLink = RetailerLinks()
672
                    retailerLink = RetailerLinks()
671
                    retailerLink.code = code
673
                    retailerLink.code = code
672
                    retailerLink.agent_id = self.agentId
674
                    retailerLink.agent_id = self.agentId
673
                    retailerLink.retailer_id = self.retailerId
675
                    retailerLink.retailer_id = self.retailerId
674
                    
-
 
675
                    activationCode=Activation_Codes()
676
                    activationCode=Activation_Codes()
676
                    activationCode.code = code
677
                    activationCode.code = code
677
                    session.commit()
678
                    session.commit()
678
                session.close()
679
                session.close()
679
                resp.body =  json.dumps({"result":{"code":code,"link":make_tiny(code)}}, encoding='utf-8')
680
                resp.body =  json.dumps({"result":{"code":code,"link":make_tiny(code)}}, encoding='utf-8')
Line 882... Line 883...
882
            self.callHistory.disposition_description = 'Retailer already user' 
883
            self.callHistory.disposition_description = 'Retailer already user' 
883
        session.commit()
884
        session.commit()
884
        return True
885
        return True
885
    def verifiedLinkSent(self,):
886
    def verifiedLinkSent(self,):
886
        if self.callType == 'fresh':
887
        if self.callType == 'fresh':
-
 
888
            if self.retailer.isvalidated:
887
            self.retailer.status = 'followup'
889
                self.retailer.status = 'followup'
888
            if self.retailer.agent_id not in sticky_agents:
890
                if self.retailer.agent_id not in sticky_agents:
889
                self.retailer.agent_id = None
891
                    self.retailer.agent_id = None
890
            self.retailer.next_call_time = self.callHistory.call_time + timedelta(days=1)
892
                self.retailer.next_call_time = self.callHistory.call_time + timedelta(days=1)
891
            self.callHistory.disposition_description = 'App link sent via ' + self.callHistory.disposition_description+ '. followup on' + datetime.strftime(self.retailer.next_call_time, '%d/%m/%Y %H:%M:%S') 
893
                self.callHistory.disposition_description = 'App link sent via ' + self.callHistory.disposition_description+ '. followup on' + datetime.strftime(self.retailer.next_call_time, '%d/%m/%Y %H:%M:%S') 
-
 
894
            else:
-
 
895
                self.retailer.status = 'pending_verification'
-
 
896
                if self.retailer.agent_id not in sticky_agents:
-
 
897
                    self.retailer.agent_id = None
-
 
898
                self.callHistory.disposition_description = "Retailer is pending for verification" 
892
        else:
899
        else:
893
            self.retailer.status = 'followup'
900
            self.retailer.status = 'followup'
894
            if self.retailer.agent_id not in sticky_agents:
901
            if self.retailer.agent_id not in sticky_agents:
895
                self.retailer.agent_id = None
902
                self.retailer.agent_id = None
896
            self.retailer.next_call_time = self.callHistory.call_time + timedelta(days=7)
903
            self.retailer.next_call_time = self.callHistory.call_time + timedelta(days=7)
Line 996... Line 1003...
996
 
1003
 
997
def addAddressToRetailer(agentId, retailerId, address, storeName, pin, city,state, updateType,tinnumber):
1004
def addAddressToRetailer(agentId, retailerId, address, storeName, pin, city,state, updateType,tinnumber):
998
    print "I am in addAddress"
1005
    print "I am in addAddress"
999
    print agentId, retailerId, address, storeName, pin, city, state, updateType
1006
    print agentId, retailerId, address, storeName, pin, city, state, updateType
1000
    try:
1007
    try:
-
 
1008
        retailer = session.query(Retailers).filter_by(id=retailerId).first()
-
 
1009
        retailer.tinnumber = tinnumber
1001
        if updateType=='new':
1010
        if updateType=='new':
1002
            retailer = session.query(Retailers).filter_by(id=retailerId).first()
-
 
1003
            retailer.address = address
1011
            retailer.address = address
1004
            retailer.title = storeName
1012
            retailer.title = storeName
1005
            retailer.city = city
1013
            retailer.city = city
1006
            retailer.state = state
1014
            retailer.state = state
1007
            retailer.pin = pin
1015
            retailer.pin = pin
1008
            retailer.tinnumber = tinnumber
-
 
1009
        raddress = RetailerAddresses()
1016
        raddress = RetailerAddresses()
1010
        raddress.address = address
1017
        raddress.address = address
1011
        raddress.title = storeName
1018
        raddress.title = storeName
1012
        raddress.agent_id = agentId
1019
        raddress.agent_id = agentId
1013
        raddress.city = city
1020
        raddress.city = city