Subversion Repositories SmartDukaan

Rev

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

Rev 4910 Rev 4920
Line 481... Line 481...
481 
                        elif element.findtext('ScanType', '') == 'RD':
 481 
                        elif element.findtext('ScanType', '') == 'RD':
482 
                            if child_number < len(children):
 482 
                            if child_number < len(children):
483 
                                orderstatus = 'RD'
 483 
                                orderstatus = 'RD'
484 
                                break
 484 
                                break
485 
                        elif node_number == 0:
 485 
                        elif node_number == 0:
- 
 
 486 
                            if child.findtext('StatusType', '') == 'RT':
- 
 
 487 
                                orderstatus = 'RT'
- 
 
 488 
                                datestring = child.findtext('ScanDate', '')
- 
 
 489 
                                timestring = child.findtext('ScanTime', '')
- 
 
 490 
                                delivery_date = get_py_datetime(datestring, timestring)
- 
 
 491 
                                reason_for_return = child.findtext('Status', '')
- 
 
 492 
                                returned_orders[order.airwaybill_no] = str(delivery_date) + "|" + reason_for_return
- 
 
 493 
                                break
- 
 
 494 
                            elif child.findtext('StatusType', '') == 'DL':
- 
 
 495 
                                orderstatus = 'DL'
- 
 
 496 
                                datestring = child.findtext('ScanDate', '')
- 
 
 497 
                                timestring = child.findtext('ScanTime', '')
- 
 
 498 
                                delivery_date = get_py_datetime(datestring, timestring)
- 
 
 499 
                                receiver = child.findtext('ReceivedBy', '')
- 
 
 500 
                                delivered_orders[order.airwaybill_no] = str(delivery_date) + "|" +  receiver
- 
 
 501 
                                break
- 
 
 502 
                            else:
486 
                            orderstatus = 'UD'
 503 
                                orderstatus = 'UD'
487 
                            reason = child.findtext('Status', '')
 504 
                                reason = child.findtext('Status', '')
488 
                            undelivered_orders[order.airwaybill_no] = reason
 505 
                                undelivered_orders[order.airwaybill_no] = reason
489 
                            break
 506 
                                break
490 
                        node_number = node_number - 1
 507 
                        node_number = node_number - 1
491 
                else:
 508 
                else:
492 
                    if child_number > 1:
 509 
                    if child_number > 1:
493 
                        reason = children[child_number-1].findtext('Status', '')
 510 
                        reason = children[child_number-1].findtext('Status', '')
494 
                        undelivered_orders[order.airwaybill_no] = reason
 511 
                        undelivered_orders[order.airwaybill_no] = reason
Line 660... Line 677...
660 
 
 677 
 
661 
def get_py_datetime(datestring, timestring):
 678 
def get_py_datetime(datestring, timestring):
662 
    # This should be a command line argument.
 679 
    # This should be a command line argument.
663 
    # Refer http://docs.python.org/library/time.html#time.strftime to
 680 
    # Refer http://docs.python.org/library/time.html#time.strftime to
664 
    # get a complete list of format specifiers available for date time.
 681 
    # get a complete list of format specifiers available for date time.
665 
    time_format = "%d-%b-%Y %H:%M:%S"
 - 
 
666 
    if datestring == '':
 682 
    if datestring == '':
667 
        return None
 683 
        return None
- 
 
 684 
    if datestring.find('-') == -1:
- 
 
 685 
        time_format = "%d %B %Y %H:%M:%S"
- 
 
 686 
    else:
- 
 
 687 
        time_format = "%d-%b-%Y %H:%M:%S"
668 
    if timestring == '':
 688 
    if timestring == '':
669 
        timestring = '00:00:00'
 689 
        timestring = '00:00:00'
670 
    time_array = timestring.split(':')
 690 
    time_array = timestring.split(':')
671 
    if len(time_array) < 3:
 691 
    if len(time_array) < 3:
672 
        timestring = timestring + ':00'
 692 
        timestring = timestring + ':00'