Subversion Repositories SmartDukaan

Rev

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

Rev 18952 Rev 19002
Line 1513... Line 1513...
1513
        query = query.filter(Order.status.in_(statuses))
1513
        query = query.filter(Order.status.in_(statuses))
1514
    query = query.offset(offset)
1514
    query = query.offset(offset)
1515
    if limit:
1515
    if limit:
1516
        query = query.limit(limit)
1516
        query = query.limit(limit)
1517
    return query.all()
1517
    return query.all()
-
 
1518
'''
-
 
1519
def get_orders_in_batch_as_promised_shipping(statuses=[], offset=0, limit=0, warehouse_id=None, source=0):
-
 
1520
    query = Order.query
-
 
1521
    if warehouse_id:
-
 
1522
        query = query.filter(Order.warehouse_id == warehouse_id)
-
 
1523
    if source:
-
 
1524
        query = query.filter(Order.source == source)
-
 
1525
    if statuses:
-
 
1526
        query = query.filter(Order.status.in_(statuses))
-
 
1527
    query = query.order_by(Order.promised_shipping_time,Order.transaction_id)
-
 
1528
    if limit>0:
-
 
1529
        query = query.limit(limit)
-
 
1530
    if offset>0 and limit>0: 
-
 
1531
        query = query.offset(offset)
-
 
1532
    return query.all()
-
 
1533
'''
1518
 
1534
 
1519
def get_order_count(statuses=[], warehouse_id=None, source=0):
1535
def get_order_count(statuses=[], warehouse_id=None, source=0):
1520
    #if not warehouse_id:
1536
    #if not warehouse_id:
1521
    #    raise TransactionServiceException(101, "bad warehouse id")
1537
    #    raise TransactionServiceException(101, "bad warehouse id")
1522
    query = session.query(func.count(Order.id))
1538
    query = session.query(func.count(Order.id))
Line 8031... Line 8047...
8031
        if order.logistics_provider_id!=4:
8047
        if order.logistics_provider_id!=4:
8032
        
8048
        
8033
            websiteCodLimit = float(providerLimits.get("websiteCodLimit"))
8049
            websiteCodLimit = float(providerLimits.get("websiteCodLimit"))
8034
            providerPrepaidLimit = float(providerLimits.get("providerPrepaidLimit"))
8050
            providerPrepaidLimit = float(providerLimits.get("providerPrepaidLimit"))
8035
            
8051
            
8036
            if order.cod and not isPrivateDealUser:
8052
            if order.cod:
8037
                if totalOrdersAmount > websiteCodLimit:
8053
                if totalOrdersAmount > websiteCodLimit:
8038
                    raise TransactionServiceException(212, "Website Maximum COD Limit Violated i.e. "+str(websiteCodLimit))
8054
                    raise TransactionServiceException(212, "Website Maximum COD Limit Violated i.e. "+str(websiteCodLimit))
8039
            
8055
            
8040
            if not order.cod:
8056
            if not order.cod:
8041
                if totalOrdersAmount > providerPrepaidLimit:
8057
                if totalOrdersAmount > providerPrepaidLimit: