Subversion Repositories SmartDukaan

Rev

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

Rev 13702 Rev 13707
Line 8610... Line 8610...
8610
8610
8611 
def get_homeshop_order(order_id, hsOrderNo, hsSubOrderNo):
 8611 
def get_homeshop_order(order_id, hsOrderNo, hsSubOrderNo):
8612 
    query = HsOrder.query
 8612 
    query = HsOrder.query
8613 
    if order_id:
 8613 
    if order_id:
8614 
        query = query.filter(HsOrder.orderId == order_id)
 8614 
        query = query.filter(HsOrder.orderId == order_id)
8615 
    elif hsOrderNo==hsSubOrderNo:
 - 
 
8616 
        if hsOrderNo is None:
 - 
 
8617 
            hsOrderNo=''
 8615 
    if hsOrderNo:
8618 
        query = query.filter(or_(HsOrder.hsOrderNo == hsOrderNo, HsOrder.hsSubOrderNo== hsSubOrderNo))
 8616 
        query = query.filter(HsOrder.hsOrderNo == hsOrderNo)
8619 
    else:
 8617 
    if hsSubOrderNo:
8620 
        query = query.filter(and_(HsOrder.hsOrderNo == hsOrderNo, HsOrder.hsSubOrderNo== hsSubOrderNo))
 8618 
        query = query.filter(HsOrder.hsSubOrderNo == hsSubOrderNo)
8621 
        return query.one()
 - 
 
8622 
    return query.all()
 8619 
    return query.all()
8623 
 
 8620 
 
8624 
def homeshop_order_exists(hs_OrderNo, hs_SubOrderNo):
 8621 
def homeshop_order_exists(hs_OrderNo, hs_SubOrderNo):
8625 
    exists = HsOrder.query.filter_by(hsOrderNo=hs_OrderNo,hsSubOrderNo=hs_SubOrderNo).first()
 8622 
    exists = HsOrder.query.filter_by(hsOrderNo=hs_OrderNo,hsSubOrderNo=hs_SubOrderNo).first()
8626 
    if exists is not None:
 8623 
    if exists is not None: