Subversion Repositories SmartDukaan

Rev

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

Rev 11259 Rev 11424
Line 6354... Line 6354...
6354
    
6354
    
6355
def get_snapdeal_order(order_id, reference_code, subOrder_id):
6355
def get_snapdeal_order(order_id, reference_code, subOrder_id):
6356
    query = SnapdealOrder.query
6356
    query = SnapdealOrder.query
6357
    if order_id:
6357
    if order_id:
6358
        query = query.filter(SnapdealOrder.orderId == order_id)
6358
        query = query.filter(SnapdealOrder.orderId == order_id)
6359
    else:
6359
    elif reference_code==subOrder_id:
6360
        if reference_code is None:
6360
        if reference_code is None:
6361
            reference_code=''
6361
            reference_code=''
6362
        query = query.filter(or_(SnapdealOrder.referenceCode == reference_code, SnapdealOrder.subOrderId== subOrder_id))
6362
        query = query.filter(or_(SnapdealOrder.referenceCode == reference_code, SnapdealOrder.subOrderId== subOrder_id))
-
 
6363
    else:
-
 
6364
        query = query.filter(and_(SnapdealOrder.referenceCode == reference_code, SnapdealOrder.subOrderId== subOrder_id))
-
 
6365
        return query.one()
6363
    return query.one()
6366
    return query.all()
6364
 
6367
 
6365
def snapdeal_order_exists(suborder_id, reference_code):
6368
def snapdeal_order_exists(suborder_id, reference_code):
6366
    exists = SnapdealOrder.query.filter_by(subOrderId=suborder_id,referenceCode=reference_code).first()
6369
    exists = SnapdealOrder.query.filter_by(subOrderId=suborder_id,referenceCode=reference_code).first()
6367
    if exists is not None:
6370
    if exists is not None:
6368
        return True
6371
        return True
Line 6487... Line 6490...
6487
                for cancel_order in orderList:
6490
                for cancel_order in orderList:
6488
                    ref_code = cancel_order[0]
6491
                    ref_code = cancel_order[0]
6489
                    sub_order_code = cancel_order[1]
6492
                    sub_order_code = cancel_order[1]
6490
                    snapdeal_order = None 
6493
                    snapdeal_order = None 
6491
                    try:
6494
                    try:
6492
                        snapdeal_order = get_snapdeal_order(None, None, sub_order_code)
6495
                        snapdeal_order = get_snapdeal_order(None, ref_code, sub_order_code)
6493
                    except Exception as e:
6496
                    except Exception as e:
6494
                        print 'Caught in Updation of Cancelled Orders Getting Snapdeal Order'
6497
                        print 'Caught in Updation of Cancelled Orders Getting Snapdeal Order'
6495
                        pass
6498
                        pass
6496
                    if snapdeal_order:
6499
                    if snapdeal_order:
6497
                        order = get_order(snapdeal_order.orderId)
6500
                        order = get_order(snapdeal_order.orderId)
Line 6510... Line 6513...
6510
                    ref_code = del_order[0]
6513
                    ref_code = del_order[0]
6511
                    sub_order_code = del_order[1]
6514
                    sub_order_code = del_order[1]
6512
                    dlvry_timestamp = del_order[2]
6515
                    dlvry_timestamp = del_order[2]
6513
                    snapdeal_order = None                    
6516
                    snapdeal_order = None                    
6514
                    try:
6517
                    try:
6515
                        snapdeal_order = get_snapdeal_order(None, None, sub_order_code)
6518
                        snapdeal_order = get_snapdeal_order(None, ref_code, sub_order_code)
6516
                    except Exception as e:
6519
                    except Exception as e:
6517
                        print 'Caught in Updation of Delivered Orders Getting Snapdeal Order'
6520
                        print 'Caught in Updation of Delivered Orders Getting Snapdeal Order'
6518
                        pass
6521
                        pass
6519
                    if snapdeal_order:
6522
                    if snapdeal_order:
6520
                        order = get_order(snapdeal_order.orderId)
6523
                        order = get_order(snapdeal_order.orderId)