Subversion Repositories SmartDukaan

Rev

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

Rev 2628 Rev 2697
Line 14... Line 14...
14
    mark_orders_as_delivered, mark_orders_as_failed, add_jacket_number,\
14
    mark_orders_as_delivered, mark_orders_as_failed, add_jacket_number,\
15
    order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
15
    order_outofstock, batch_orders, update_non_delivery_reason, enqueue_transaction_info_email,\
16
    get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
16
    get_undelivered_orders, get_order_for_customer, get_valid_order_count,\
17
    get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
17
    get_cust_count_with_successful_txn, get_valid_orders_amount_range,\
18
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
18
    get_valid_orders, toggle_doa_flag, request_pickup_number, authorize_pickup,\
19
    receive_return, validate_doa, reship_order, refund_order
19
    receive_return, validate_doa, reship_order, refund_order, get_return_orders,\
-
 
20
    process_return
20
 
21
 
21
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
22
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
22
    to_t_alert, to_t_order, to_t_lineitem
23
    to_t_alert, to_t_order, to_t_lineitem
23
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
24
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
24
    LineItem, Order
25
    LineItem, Order
Line 615... Line 616...
615
        try:
616
        try:
616
            return refund_order(orderId)
617
            return refund_order(orderId)
617
        finally:
618
        finally:
618
            close_session()
619
            close_session()
619
 
620
 
-
 
621
    def getReturnOrders(self, warehouseId, fromDate, toDate):
-
 
622
        """
-
 
623
        Get all return orders created between the from and to dates for the given warehouse.
-
 
624
        Ignores the warehouse if it is passed as -1.
-
 
625
        
-
 
626
        Parameters:
-
 
627
         - warehouseId
-
 
628
         - fromDate
-
 
629
         - toDate
-
 
630
        """
-
 
631
        try:
-
 
632
            from_date, to_date = get_fdate_tdate(fromDate, toDate)
-
 
633
            return get_return_orders(warehouseId, from_date, to_date)
-
 
634
        finally:
-
 
635
            close_session()
-
 
636
    
-
 
637
    def processReturn(self, returnOrderId):
-
 
638
        """
-
 
639
        Marks the return order with the given id as processed. Raises an exception if no such return order exists.
-
 
640
        
-
 
641
        Parameters:
-
 
642
         - returnOrderId
-
 
643
        """
-
 
644
        try:
-
 
645
            process_return(returnOrderId)
-
 
646
        finally:
-
 
647
            close_session()
620
  
648
  
621
    def closeSession(self, ):
649
    def closeSession(self, ):
622
        close_session()
650
        close_session()