WebSVN – SmartDukaan – Diff – //trunk/PyDTR/src/dtr/api/Service.py

 import MySQLdb
 from shop2020.clients.CatalogClient import CatalogClient
 from pyquery import PyQuery as pq
 import time
 from dtr.main import refundToWallet
+import random
 alphalist = list(string.uppercase)
 alphalist.remove('O')
 numList = ['1','2','3','4','5','6','7','8','9']
 codesys = [alphalist, alphalist, numList, numList, numList]
+newcodesys = alphalist + numList
 CONTACT_PRIORITY = ['sms', 'called', 'ringing']
 RETRY_MAP = {'fresh':'retry', 'followup':'fretry', 'onboarding':'oretry'}
 ASSIGN_MAP = {'retry':'assigned', 'fretry':'fassigned', 'oretry':'oassigned'}
 sticky_agents = [17]
+def getNextRandomCode(newcodesys,size=6):
+    return ''.join(random.choice(newcodesys) for _ in range(size))
 def getNextCode(codesys, code=None):
     if code is None:
         code = []
         for charcode in codesys:
             code.append(charcode[0])
                             retailer.contact1 = user.mobile_number
                             retailer.status = 'assigned'
                             retailer.retry_count = 0
                             retailer.invalid_retry_count = 0
                             retailer.is_elavated=1
+                            retailer.agent_id = 2
+                            retailer.isvalidated = 0
                 user.status = 2
                 session.commit()
                 print "retailer id", retailer.id
                 retailer.contact = user.mobile_number
                 return retailer
                 self.retailerId = int(retailerId)
                 retailerLink = session.query(RetailerLinks).filter_by(retailer_id=self.retailerId).first()
                 if retailerLink is not None:
                     code = retailerLink.code
                 else:
-                    code = self.getCode()
+                    code = self.getNewRandomCode()
                     retailerLink = RetailerLinks()
                     retailerLink.code = code
                     retailerLink.agent_id = self.agentId
                     retailerLink.retailer_id = self.retailerId
         if lastLink is not None:
             if len(lastLink.code)==len(codesys):
                 newCode=lastLink.code
         return getNextCode(codesys, newCode)
+    def getNewRandomCode(self,):
+        newCode = None
+        while True:
+            newCode = getNextRandomCode(newcodesys, 6)
+            print 'NewCode',newCode
+            isCodePresent = session.query(Activation_Codes).filter_by(code=newCode).first()
+            if isCodePresent is not None:
+                continue
+            else:
+                break
+        return newCode
     def callLater(self,):
         self.retailer.status = RETRY_MAP.get(self.callType)
         self.retailer.call_priority = None
         if self.callDisposition == 'call_later':
         storeName = str(jsonReq.get("storename"))
         pin = str(jsonReq.get("pin"))
         city = str(jsonReq.get("city"))
         state = str(jsonReq.get("state"))
         updateType = str(jsonReq.get("updatetype"))
+        tinnumber = str(jsonReq.get("tinnumber"))
-        addAddressToRetailer(agentId, retailerId, address, storeName, pin, city,state, updateType)
+        addAddressToRetailer(agentId, retailerId, address, storeName, pin, city,state, updateType,tinnumber)
 def addContactToRetailer(agentId, retailerId, mobile, callType, contactType):
     retailerContact = session.query(RetailerContacts).filter_by(retailer_id=retailerId).filter_by(mobile_number=mobile).first()
     if retailerContact is None:
         retailerContact = RetailerContacts()
         retailerContact.mobile_number = mobile
     else:
         if CONTACT_PRIORITY.index(retailerContact.contact_type) > CONTACT_PRIORITY.index(contactType):
             retailerContact.contact_type = contactType
-def addAddressToRetailer(agentId, retailerId, address, storeName, pin, city,state, updateType):
+def addAddressToRetailer(agentId, retailerId, address, storeName, pin, city,state, updateType,tinnumber):
     print "I am in addAddress"
     print agentId, retailerId, address, storeName, pin, city, state, updateType
     try:
         if updateType=='new':
             retailer = session.query(Retailers).filter_by(id=retailerId).first()
             retailer.address = address
             retailer.title = storeName
             retailer.city = city
             retailer.state = state
             retailer.pin = pin
+            retailer.tinnumber = tinnumber
         raddress = RetailerAddresses()
         raddress.address = address
         raddress.title = storeName
         raddress.agent_id = agentId
         raddress.city = city
         obj.title = retailer.title
         obj.city = retailer.city
         obj.state = retailer.state
         obj.pin = retailer.pin
     obj.status = retailer.status
+    obj.tinnumber = retailer.tinnumber
     if hasattr(retailer, 'contact'):
         obj.contact = retailer.contact
+        obj.isvalidated = retailer.isvalidated
+    if callType == 'followup':
+        obj.last_call_time = datetime.strftime(retailer.modified, "%B %Y")
     if callType == 'onboarding':
         try:
             userId, activatedTime = session.query(RetailerLinks.user_id, RetailerLinks.activated).filter(RetailerLinks.retailer_id==retailer.id).first()
             activated, = session.query(Users.activation_time).filter(Users.id==userId).first()
             if activated is not None:

Subversion Repositories SmartDukaan

(root)//trunk/PyDTR/src/dtr/api/Service.py – Rev 19718 → 19732