Subversion Repositories SmartDukaan

Rev

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

Rev 4454 Rev 4479
Line 678... Line 678...
678 
            orders_not_picked_up = mark_doas_as_picked_up(providerId, pickupDetails)
 678 
            orders_not_picked_up = mark_doas_as_picked_up(providerId, pickupDetails)
679 
            return [to_t_order(order) for order in orders_not_picked_up]
 679 
            return [to_t_order(order) for order in orders_not_picked_up]
680 
        finally:
 680 
        finally:
681 
            close_session()
 681 
            close_session()
682
682
683 
    def receiveReturn(self, orderId):
 683 
    def receiveReturn(self, orderId, receiveCondition):
684 
        """
 684 
        """
685 
        If the order status is DOA_PICKUP_CONFIRMED or DOA_RETURN_IN_TRANSIT, marks the order status as DOA_RECEIVED_PRESTINE and returns true.
 685 
        If the order status is DOA_PICKUP_CONFIRMED or DOA_RETURN_IN_TRANSIT, marks the order status as DOA_RECEIVED_PRESTINE and returns true.
686 
        If the order is in any other state, it returns false.
 686 
        If the order is in any other state, it returns false.
687 
        Throws an exception if the order with the given id couldn't be found.
 687 
        Throws an exception if the order with the given id couldn't be found.
688
688
689 
        Parameters:
 689 
        Parameters:
690 
         - orderId
 690 
         - orderId
691 
        """
 691 
        """
692 
        try:
 692 
        try:
693 
            return receive_return(orderId)
 693 
            return receive_return(orderId, receiveCondition)
694 
        finally:
 694 
        finally:
695 
            close_session()
 695 
            close_session()
696 
 
 696 
 
697 
    def validateDoa(self, orderId, isValid):
 697 
    def validateDoa(self, orderId, isValid):
698 
        """
 698 
        """