Subversion Repositories SmartDukaan

Rev

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

Rev 1113 Rev 1132
Line 8... Line 8...
8
create_order, get_new_transaction, get_transactions_for_customer, get_transaction_status,\
8
create_order, get_new_transaction, get_transactions_for_customer, get_transaction_status,\
9
 get_line_items_for_order, get_transaction, get_transactions_for_shopping_cart_id,\
9
 get_line_items_for_order, get_transaction, get_transactions_for_shopping_cart_id,\
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_all_orders, change_order_status, get_alerts, set_alert, add_billing_details,\
11
 get_all_orders, change_order_status, get_alerts, set_alert, add_billing_details,\
12
    mark_orders_as_manifested, close_session, accept_order, bill_order,\
12
    mark_orders_as_manifested, close_session, accept_order, bill_order,\
13
    get_orders_by_billing_date, mark_orders_as_picked_up
13
    get_orders_by_billing_date, mark_orders_as_picked_up,\
-
 
14
    mark_orders_as_delivered
14
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
15
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
15
    to_t_lineitem, to_t_alert, to_t_order, to_t_lineitem
16
    to_t_lineitem, to_t_alert, to_t_order, to_t_lineitem
16
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
17
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
17
    LineItem, Order
18
    LineItem, Order
18
from shop2020.utils.Utils import to_py_date, get_fdate_tdate
19
from shop2020.utils.Utils import to_py_date, get_fdate_tdate
Line 255... Line 256...
255
        try:
256
        try:
256
            orders_not_picked_up = mark_orders_as_picked_up(providerId, pickupDetails)
257
            orders_not_picked_up = mark_orders_as_picked_up(providerId, pickupDetails)
257
            return [to_t_order(order) for order in orders_not_picked_up]
258
            return [to_t_order(order) for order in orders_not_picked_up]
258
        finally:
259
        finally:
259
            close_session()
260
            close_session()
-
 
261
 
-
 
262
    def markOrdersAsDelivered(self, providerId, deliveredOrders):
-
 
263
        """
-
 
264
        Marks all orders with AWBs in the given map as delivered. Also sets the delivery timestamp and
-
 
265
        the name of the receiver.
-
 
266
        Raises an exception if we encounter report for an AWB number that we did not ship.
-
 
267
        
-
 
268
        Parameters:
-
 
269
         - providerId
-
 
270
         - deliveredOrders
-
 
271
        """
-
 
272
        try:
-
 
273
            mark_orders_as_delivered(providerId, deliveredOrders)
-
 
274
        finally:
-
 
275
            close_session()
260
            
276
            
261
    def getAlerts(self, orderId, valid):
277
    def getAlerts(self, orderId, valid):
262
        """
278
        """
263
        Parameters:
279
        Parameters:
264
         - orderId
280
         - orderId