Subversion Repositories SmartDukaan

Rev

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

Rev 7945 Rev 7951
Line 3516... Line 3516...
3516
    # COD services are not available everywhere
3516
    # COD services are not available everywhere
3517
    if order.cod:
3517
    if order.cod:
3518
        if not logistics_info.codAllowed:
3518
        if not logistics_info.codAllowed:
3519
            raise TransactionServiceException(2, 'COD service not available')
3519
            raise TransactionServiceException(2, 'COD service not available')
3520
 
3520
 
3521
    if logistics_info.providerId != order.logistics_provider_id:
-
 
3522
        logistics_info.airway_billno = logistics_client.getEmptyAWB(logistics_info.providerId, deliveryType)
3521
    logistics_info.airway_billno = logistics_client.getEmptyAWB(logistics_info.providerId, deliveryType)
3523
        order.tracking_id = logistics_info.airway_billno
3522
    order.tracking_id = logistics_info.airway_billno
3524
        order.airwaybill_no = logistics_info.airway_billno
3523
    order.airwaybill_no = logistics_info.airway_billno
3525
        order.logistics_provider_id = logistics_info.providerId
3524
    order.logistics_provider_id = logistics_info.providerId
3526
        current_time = datetime.datetime.now()
-
 
3527
        logistics_info.deliveryTime = adjust_delivery_time(current_time, logistics_info.deliveryTime)
-
 
3528
        logistics_info.shippingTime = adjust_delivery_time(current_time, logistics_info.shippingTime)
-
 
3529
        logistics_info.deliveryDelay = adjust_delivery_time(current_time, (logistics_info.shippingTime+logistics_info.deliveryDelay))
-
 
3530
        
-
 
3531
    order.pickupStoreId = 0
3525
    order.pickupStoreId = 0
3532
    session.commit()
3526
    session.commit()
3533
    return True
3527
    return True
3534
 
3528
 
3535
def mark_order_cancellation_request_received(orderId):
3529
def mark_order_cancellation_request_received(orderId):