Subversion Repositories SmartDukaan

Rev

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

Rev 22636 Rev 22749
Line 420... Line 420...
420
    try:
420
    try:
421
        awb = query.first()
421
        awb = query.first()
422
        if awb is None:
422
        if awb is None:
423
            additionalQuery = additionalQuery.filter_by(awbUsedFor=2)
423
            additionalQuery = additionalQuery.filter_by(awbUsedFor=2)
424
            awb = additionalQuery.first()
424
            awb = additionalQuery.first()
-
 
425
        print "-------", awb.awb_number, awb.is_available
425
        awb.is_available = False
426
        awb.is_available = False
426
        session.commit()
427
        session.commit()
427
        return awb.awb_number
428
        return awb.awb_number
428
    except:
429
    except:
-
 
430
        session.close()
-
 
431
        print "oops"
429
        #In case of missing awb for EComExpress fetch new awbs using their api
432
        #In case of missing awb for EComExpress fetch new awbs using their api
430
        if provider_id==48:
433
        if provider_id==49:
431
            awbs = EcomExpressService.generate_awb(type)
434
            awbs = EcomExpressService.generate_awb(type)
432
            #add_new_awbs(provider_id, isCod, awbs, awbUsedFor)
435
            #add_new_awbs(provider_id, isCod, awbs, awbUsedFor)
433
            add_empty_AWBs(awbs, provider_id, type)
436
            add_empty_AWBs(awbs, provider_id, DeliveryType._VALUES_TO_NAMES[type])
434
            return get_awb(provider_id, logisticsTransactionId, type)
437
            return get_awb(provider_id, logisticsTransactionId, type)
-
 
438
        return
435
            
439
            
436
            
440
            
437
        raise LogisticsServiceException(103, "Unable to get an AWB for the given Provider: " + str(provider_id))
441
        raise LogisticsServiceException(103, "Unable to get an AWB for the given Provider: " + str(provider_id))
438
 
442
 
439
def get_empty_AWB(provider_id, logisticsTransactionId):
443
def get_empty_AWB(provider_id, logisticsTransactionId):