Subversion Repositories SmartDukaan

Rev

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

Rev 1398 Rev 1405
Line 10... Line 10...
10
    change_transaction_status, get_orders_for_customer,get_orders_for_transaction, get_order,\
10
    change_transaction_status, get_orders_for_customer,get_orders_for_transaction, get_order,\
11
    get_returnable_orders_for_customer, get_cancellable_orders_for_customer, get_orders_by_billing_date,\
11
    get_returnable_orders_for_customer, get_cancellable_orders_for_customer, get_orders_by_billing_date,\
12
    get_all_orders, change_order_status, get_alerts, set_alert, add_billing_details,\
12
    get_all_orders, change_order_status, get_alerts, set_alert, add_billing_details,\
13
    mark_orders_as_manifested, close_session, accept_order, bill_order, mark_orders_as_picked_up,\
13
    mark_orders_as_manifested, close_session, accept_order, bill_order, mark_orders_as_picked_up,\
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
-
 
17
 
16
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
18
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
17
    to_t_alert, to_t_order, to_t_lineitem
19
    to_t_alert, to_t_order, to_t_lineitem
18
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
20
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
19
    LineItem, Order
21
    LineItem, Order
20
from shop2020.utils.Utils import to_py_date, get_fdate_tdate
22
from shop2020.utils.Utils import to_py_date, get_fdate_tdate
Line 364... Line 366...
364
        """
366
        """
365
        try:
367
        try:
366
            update_non_delivery_reason(providerId, undeliveredOrders)
368
            update_non_delivery_reason(providerId, undeliveredOrders)
367
        finally:
369
        finally:
368
            close_session()
370
            close_session()
-
 
371
 
-
 
372
    def getUndeliveredOrders(self, providerId, warehouseId):
-
 
373
        """
-
 
374
        Returns the list of orders whose delivery time has passed but have not been
-
 
375
        delivered yet for the given provider and warehouse. To get a complete list of
-
 
376
        undelivered orders, pass them as -1.
-
 
377
        Returns an empty list if no such orders exist.
-
 
378
        
-
 
379
        Parameters:
-
 
380
         - providerId
-
 
381
         - warehouseId
-
 
382
        """
-
 
383
        try:
-
 
384
            undelivered_orders = get_undelivered_orders(providerId, warehouseId)
-
 
385
            return [to_t_order(order) for order in undelivered_orders]
-
 
386
        finally:
-
 
387
            close_session()
369
    
388
    
370
    def enqueueTransactionInfoEmail(self, transactionId):
389
    def enqueueTransactionInfoEmail(self, transactionId):
371
        """
390
        """
372
        Save the email containing order details to be sent to customer later by batch job
391
        Save the email containing order details to be sent to customer later by batch job
373
        
392