Subversion Repositories SmartDukaan

Rev

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

Rev 21335 Rev 21336
Line 139... Line 139...
139
            for lis in re.findall('fkUA:"(.*?)"', rawHtml):
139
            for lis in re.findall('fkUA:"(.*?)"', rawHtml):
140
                headers['User-Agent'] = lis.split(" FKUA")[0]
140
                headers['User-Agent'] = lis.split(" FKUA")[0]
141
                headers['x-user-agent'] = lis
141
                headers['x-user-agent'] = lis
142
                break
142
                break
143
 
143
 
144
            if self._getActiveOrders({"createdOnInt":{"$gt":int(time.mktime(datetime.now().timetuple()))- 30*86400}}):
144
            if self._getActiveOrders({"userId": userId,"createdOnInt":{"$gt":int(time.mktime(datetime.now().timetuple()))- 30*86400}}):
145
                return {"headers":headers, "urls":TRACK_URLS}
145
                return {"headers":headers, "urls":TRACK_URLS}
146
            else:
146
            else:
147
                return {"headers":headers, "urls":[]}
147
                return {"headers":headers, "urls":[]}
148
        else:
148
        else:
149
            jsonObject = json.loads(rawHtml)
149
            jsonObject = json.loads(rawHtml)
150
            #Get only orders less than one month old
150
            #Get only orders less than one month old
151
            activeOrders = self._getActiveOrders({"createdOnInt":{"$gt":int(time.mktime(datetime.now().timetuple())) - 30*86400}})
151
            activeOrders = self._getActiveOrders({"userId": userId, "createdOnInt":{"$gt":int(time.mktime(datetime.now().timetuple())) - 30*86400}})
152
            for order in activeOrders:
152
            for order in activeOrders:
153
                for transaction in jsonObject['RESPONSE']['orderGranularDetails']:
153
                for transaction in jsonObject['RESPONSE']['orderGranularDetails']:
154
                    if transaction['orderId'][:-2] == order["merchantOrderId"]:
154
                    if transaction['orderId'][:-2] == order["merchantOrderId"]:
155
                        self._parseJSON(order, transaction)
155
                        self._parseJSON(order, transaction)
156
                        break
156
                        break