Subversion Repositories SmartDukaan

Rev

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

Rev 4630 Rev 4647
Line 1721... Line 1721...
1721
1721
1722 
    order.warehouse_id = warehouse_id
 1722 
    order.warehouse_id = warehouse_id
1723 
    session.commit()
 1723 
    session.commit()
1724 
    return order
 1724 
    return order
1725 
 
 1725 
 
1726 
def add_delay_reason(order_id, reason, further_delay=0):
 1726 
def add_delay_reason(order_id, reason, further_delay, delayReasonText):
1727 
    '''
 1727 
    '''
1728 
    Adds a delay reason to the order and updates the expected delivery time.
 1728 
    Adds a delay reason to the order and updates the expected delivery time.
1729 
    '''
 1729 
    '''
1730 
    order = get_order(order_id)
 1730 
    order = get_order(order_id)
1731 
    try:
 1731 
    try:
1732 
        order.delay_reason = DelayReason._VALUES_TO_NAMES[reason]
 1732 
        order.delay_reason = DelayReason._VALUES_TO_NAMES[reason]
- 
 
 1733 
        order.delayReasonText = delayReasonText
1733 
        actual_delivery_delay = adjust_delivery_time(order.expected_delivery_time, further_delay)
 1734 
        actual_delivery_delay = adjust_delivery_time(order.expected_delivery_time, further_delay)
1734 
        order.expected_delivery_time = order.expected_delivery_time + datetime.timedelta(days=actual_delivery_delay)
 1735 
        order.expected_delivery_time = order.expected_delivery_time + datetime.timedelta(days=actual_delivery_delay)
1735
1736
1736 
        if order.status < OrderStatus.SHIPPED_FROM_WH:
 1737 
        if order.status < OrderStatus.SHIPPED_FROM_WH:
1737 
            actual_shipping_delay = adjust_delivery_time(order.expected_shipping_time, further_delay)
 1738 
            actual_shipping_delay = adjust_delivery_time(order.expected_shipping_time, further_delay)