Subversion Repositories SmartDukaan

Rev

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

Rev 14404 Rev 14406
Line 269... Line 269...
269 
                    breakFlag = False
 269 
                    breakFlag = False
270 
                    for div in divs:
 270 
                    for div in divs:
271 
                        divStr = str(div)
 271 
                        divStr = str(div)
272 
                        divStr = divStr.replace("\n","").replace("\t", "")
 272 
                        divStr = divStr.replace("\n","").replace("\t", "")
273 
                        updateMap = {}
 273 
                        updateMap = {}
274 
                        print divStr
 - 
 
275 
                        for line in divStr.split("<br />"):
 274 
                        for line in divStr.split("<br />"):
276 
                            if "Suborder ID" in line:
 275 
                            if "Suborder ID" in line:
277 
                                merchantSubOrderId = re.findall(r'\d+', line)[0]
 276 
                                merchantSubOrderId = re.findall(r'\d+', line)[0]
278 
                                #break if suborder is inactive
277 
                                #break if suborder is inactive
279 
                                subOrder =  self._isSubOrderActive(order, merchantSubOrderId)
 278 
                                subOrder =  self._isSubOrderActive(order, merchantSubOrderId)
Line 287... Line 286...
287 
                                elif subOrder['closed']:
 286 
                                elif subOrder['closed']:
288 
                                    breakFlag = True
 287 
                                    breakFlag = True
289 
                                    break
 288 
                                    break
290 
                                else:
289 
                                else:
291 
                                    findMap = {"orderId": order['orderId'], "subOrders.merchantSubOrderId": merchantSubOrderId}
 290 
                                    findMap = {"orderId": order['orderId'], "subOrders.merchantSubOrderId": merchantSubOrderId}
292 
                            elif "Status" in line:
 291 
                            elif "Status :" in line:
293 
                                print line
 - 
 
294 
                                detailedStatus = re.findall('>(.*?)</span>', line, re.IGNORECASE)[0]
 292 
                                detailedStatus = re.findall('>(.*?)</span>', line, re.IGNORECASE)[0]
295 
                                updateMap["subOrders.$.detailedStatus"] = detailedStatus
 293 
                                updateMap["subOrders.$.detailedStatus"] = detailedStatus
296 
                                status = self._getStatusFromDetailedStatus(detailedStatus)
294 
                                status = self._getStatusFromDetailedStatus(detailedStatus)
297 
                                closedStatus = status in [Store.ORDER_DELIVERED, Store.ORDER_CANCELLED]
 295 
                                closedStatus = status in [Store.ORDER_DELIVERED, Store.ORDER_CANCELLED]
298 
                                updateMap["subOrders.$.status"] = status
 296 
                                updateMap["subOrders.$.status"] = status