Subversion Repositories SmartDukaan

Rev

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

Rev 4561 Rev 4579
Line 31... Line 31...
31
    mark_orders_as_not_available, update_shipment_address,\
31
    mark_orders_as_not_available, update_shipment_address,\
32
    mark_orders_as_timeout, get_order_for_awb,\
32
    mark_orders_as_timeout, get_order_for_awb,\
33
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
33
    mark_orders_as_shipped_from_warehouse, mark_alerts_as_seen, \
34
    mark_order_doa_request_received, mark_order_doa_request_authorized,\
34
    mark_order_doa_request_received, mark_order_doa_request_authorized,\
35
    mark_order_return_request_received, mark_order_return_request_authorized,\
35
    mark_order_return_request_received, mark_order_return_request_authorized,\
36
    validate_return_product, get_orders_for_provider_for_status
36
    validate_return_product, get_orders_for_provider_for_status,\
-
 
37
    add_invoice_number
37
 
38
 
38
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
39
from shop2020.model.v1.order.impl.Convertors import to_t_transaction,\
39
    to_t_alert, to_t_order, to_t_lineitem
40
    to_t_alert, to_t_order, to_t_lineitem
40
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
41
from shop2020.thriftpy.model.v1.order.ttypes import Transaction, OrderStatus,\
41
    LineItem, Order, TransactionServiceException
42
    LineItem, Order, TransactionServiceException
Line 360... Line 361...
360
        try:
361
        try:
361
            return add_billing_details(orderId, invoice_number, imeiNumber, itemNumber, billedBy, jacketNumber, billingType, vendorId)
362
            return add_billing_details(orderId, invoice_number, imeiNumber, itemNumber, billedBy, jacketNumber, billingType, vendorId)
362
        finally:
363
        finally:
363
            close_session()
364
            close_session()
364
 
365
 
-
 
366
    def addInvoiceNumber(self, orderId, invoiceNumber):
-
 
367
        """
-
 
368
        Add the invoice number to the order.
-
 
369
        
-
 
370
        Parameters:
-
 
371
         - orderId
-
 
372
         - invoice_number
-
 
373
        """
-
 
374
        try:
-
 
375
            add_invoice_number(orderId, invoiceNumber)
-
 
376
        finally:
-
 
377
            close_session()
-
 
378
 
365
    def batchOrders(self, warehouseId):
379
    def batchOrders(self, warehouseId):
366
        """
380
        """
367
        Create a batch of all the pending orders for the given warehouse.
381
        Create a batch of all the pending orders for the given warehouse.
368
        The returned list is orderd by created_timestamp.
382
        The returned list is orderd by created_timestamp.
369
        If there are no pending orders, an empty list is returned.
383
        If there are no pending orders, an empty list is returned.
Line 655... Line 669...
655
        try:
669
        try:
656
            return mark_order_return_request_authorized(orderId, isAuthorized)
670
            return mark_order_return_request_authorized(orderId, isAuthorized)
657
        finally:
671
        finally:
658
            close_session()
672
            close_session()
659
 
673
 
660
    def requestPickupNumber(self, orderId):
674
    def requestPickupNumber(self, orderId, providerId):
661
        """
675
        """
662
        Sends out an email to the account manager of the original courier provider used to ship the order.
676
        Sends out an email to the account manager of the original courier provider used to ship the order.
663
        If the order status was DELIVERY_SUCCESS, it is changed to be DOA_PICKUP_REQUEST_RAISED.
677
        If the order status was DELIVERY_SUCCESS, it is changed to be DOA_PICKUP_REQUEST_RAISED.
664
        If the order status was DOA_PICKUP_REQUEST_RAISED, it is left unchanged.
678
        If the order status was DOA_PICKUP_REQUEST_RAISED, it is left unchanged.
665
        For any other status, it returns false.
679
        For any other status, it returns false.
Line 667... Line 681...
667
        
681
        
668
        Parameters:
682
        Parameters:
669
         - orderId
683
         - orderId
670
        """
684
        """
671
        try:
685
        try:
672
            return request_pickup_number(orderId)
686
            return request_pickup_number(orderId, providerId)
673
        finally:
687
        finally:
674
            close_session()
688
            close_session()
675
 
689
 
676
    def authorizePickup(self, orderId, pickupNumber):
690
    def authorizePickup(self, orderId, pickupNumber):
677
        """
691
        """