Subversion Repositories SmartDukaan

Rev

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

Rev 4840 Rev 4842
Line 1771... Line 1771...
1771
        order.delay_reason = DelayReason._VALUES_TO_NAMES[reason]
1771
        order.delay_reason = DelayReason._VALUES_TO_NAMES[reason]
1772
        order.delayReasonText = delayReasonText
1772
        order.delayReasonText = delayReasonText
1773
        actual_delivery_delay = adjust_delivery_time(order.expected_delivery_time, further_delay)
1773
        actual_delivery_delay = adjust_delivery_time(order.expected_delivery_time, further_delay)
1774
        order.expected_delivery_time = order.expected_delivery_time + datetime.timedelta(days=actual_delivery_delay)
1774
        order.expected_delivery_time = order.expected_delivery_time + datetime.timedelta(days=actual_delivery_delay)
1775
        
1775
        
1776
        if order.status < OrderStatus.SHIPPED_FROM_WH:
-
 
1777
            actual_shipping_delay = adjust_delivery_time(order.expected_shipping_time, further_delay)
1776
        actual_shipping_delay = adjust_delivery_time(order.expected_shipping_time, further_delay)
1778
            order.expected_shipping_time = order.expected_shipping_time + datetime.timedelta(days=actual_shipping_delay)
1777
        order.expected_shipping_time = order.expected_shipping_time + datetime.timedelta(days=actual_shipping_delay)
1779
            
1778
            
1780
        session.commit()
1779
        session.commit()
1781
 
1780
 
1782
        try:
1781
        try:
1783
            transaction_requiring_extra_processing = TransactionRequiringExtraProcessing()
1782
            transaction_requiring_extra_processing = TransactionRequiringExtraProcessing()