Subversion Repositories SmartDukaan

Rev

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

Rev 5199 Rev 5208
Line 2310... Line 2310...
2310
    query = Order.query.filter_by(vendorId = vendor_id)
2310
    query = Order.query.filter_by(vendorId = vendor_id)
2311
    query = query.filter(Order.billing_timestamp != None)
2311
    query = query.filter(Order.billing_timestamp != None)
2312
    query = query.filter(Order.vendor_paid != True)
2312
    query = query.filter(Order.vendor_paid != True)
2313
    orderStatusGroup = OrderStatusGroups()
2313
    orderStatusGroup = OrderStatusGroups()
2314
    query = query.filter(not_(Order.status.in_(orderStatusGroup.refundedOrders)))
2314
    query = query.filter(not_(Order.status.in_(orderStatusGroup.refundedOrders)))
2315
#    query = query.filter(not_(Order.status.in_([15,31,32,33,34,48,50,54,56,70,72,76,74,79])))
2315
    #query = query.filter(not_(Order.status.in_([15,31,32,33,34,48,50,54,56,70,72,76,74,79])))
2316
    
2316
    #(15,31,32,33,34,48,54,70,72,74)
2317
    return query.all()
2317
    return query.all()
2318
 
2318
 
2319
def save_bluedart_settlements(map_awb_and_amount):
2319
def save_bluedart_settlements(map_awb_and_amount):
2320
    payment_client = PaymentClient().get_client()
2320
    payment_client = PaymentClient().get_client()
2321
    
2321
    
Line 2478... Line 2478...
2478
        
2478
        
2479
        for order in Order.query.filter(Order.originalOrderId == order_id).all():
2479
        for order in Order.query.filter(Order.originalOrderId == order_id).all():
2480
            order.vendor_paid = True
2480
            order.vendor_paid = True
2481
            session.commit()
2481
            session.commit()
2482
    else:
2482
    else:
2483
        original_order_id = None
2483
        original_order_id = paid_order.originalOrderId
2484
        
2484
        
2485
        for order in Order.query.filter(Order.originalOrderId == order_id).all():
2485
        for order in Order.query.filter(Order.originalOrderId == original_order_id).all():
2486
            order.vendor_paid = True
2486
            order.vendor_paid = True
2487
            session.commit()
2487
            session.commit()
2488
            original_order_id = order.originalOrderId
2488
            original_order_id = order.originalOrderId
2489
        
2489
        
2490
        original_order = Order.get_by(id = original_order_id)
2490
        original_order = Order.get_by(id = original_order_id)
2491
        if original_order:  original_order.vendor_paid = True
2491
        if original_order:  original_order.vendor_paid = True
2492
        session.commit()
2492
        session.commit()
2493
 
2493
 
-
 
2494
def get_refunded_orders_marked_paid():
-
 
2495
    orderStatusGroup = OrderStatusGroups()
-
 
2496
    return Order.query.filter(Order.vendor_paid == 1).filter(Order.status.in_(orderStatusGroup.refundedOrders)).all()
-
 
2497
 
2494
def close_session():
2498
def close_session():
2495
    if session.is_active:
2499
    if session.is_active:
2496
        print "session is active. closing it."
2500
        print "session is active. closing it."
2497
        session.close()
2501
        session.close()
2498
 
2502