Subversion Repositories SmartDukaan

Rev

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

Rev 5447 Rev 5481
Line 1742... Line 1742...
1742 
        query = query.filter(ReturnOrder.createdAt >from_date)
 1742 
        query = query.filter(ReturnOrder.createdAt >from_date)
1743 
    if to_date:
 1743 
    if to_date:
1744 
        query = query.filter(ReturnOrder.createdAt < to_date)
 1744 
        query = query.filter(ReturnOrder.createdAt < to_date)
1745 
    return [return_order.to_thrift_object() for return_order in query.all()]
 1745 
    return [return_order.to_thrift_object() for return_order in query.all()]
1746 
 
 1746 
 
- 
 
 1747 
def get_all_return_orders(onlyNotProcessed, from_date, to_date):
- 
 
 1748 
    query = ReturnOrder.query
- 
 
 1749 
    if onlyNotProcessed:
- 
 
 1750 
        query = query.filter_by(processedStatus = False)
- 
 
 1751 
    if from_date:
- 
 
 1752 
        query = query.filter(ReturnOrder.createdAt >= from_date)
- 
 
 1753 
    if to_date:
- 
 
 1754 
        query = query.filter(ReturnOrder.createdAt <= to_date)
- 
 
 1755 
    return [return_order.to_thrift_object() for return_order in query.all()]
- 
 
 1756 
 
1747 
def get_return_order(id):
 1757 
def get_return_order(id):
1748 
    ret_order = ReturnOrder.get_by(orderId = id)
 1758 
    ret_order = ReturnOrder.get_by(orderId = id)
1749 
    if ret_order is None:
 1759 
    if ret_order is None:
1750 
        raise TransactionServiceException(116, "No return order found for the given order id")
 1760 
        raise TransactionServiceException(116, "No return order found for the given order id")
1751 
    return ret_order.to_thrift_object()
 1761 
    return ret_order.to_thrift_object()
Line 2342... Line 2352...
2342 
    if billing_date_to:
 2352 
    if billing_date_to:
2343 
        query = query.filter(Order.billing_timestamp <= billing_date_to)
 2353 
        query = query.filter(Order.billing_timestamp <= billing_date_to)
2344 
 
 2354 
 
2345 
    return query.all()
 2355 
    return query.all()
2346 
 
 2356 
 
2347 
def get_orders_where_vendor_not_paid(vendor_id):
 2357 
def get_billed_orders(vendor_id, onlyVendorNotPaid, billing_date_from, billing_date_to):
2348 
    query = Order.query.filter(Order.billing_timestamp != None)
 2358 
    query = Order.query.filter(Order.billing_timestamp != None)
- 
 
 2359
- 
 
 2360 
    if onlyVendorNotPaid:
2349 
    query = query.filter(Order.vendor_paid != True)
 2361 
        query = query.filter(Order.vendor_paid = False)
- 
 
 2362
2350 
    if vendor_id != -1:
 2363 
    if vendor_id != -1:
2351 
        query = query.filter_by(vendorId = vendor_id)
 2364 
        query = query.filter_by(vendorId = vendor_id)
2352
2365
- 
 
 2366 
    if billing_date_from:
- 
 
 2367 
        query = query.filter(Order.billing_timestamp >= billing_date_from)
- 
 
 2368
- 
 
 2369 
    if billing_date_to:
- 
 
 2370 
        query = query.filter(Order.billing_timestamp <= billing_date_to)
- 
 
 2371
2353 
    return query.all()
 2372 
    return query.all()
2354 
 
 2373 
 
2355 
def save_bluedart_settlements(map_awb_and_amount):
 2374 
def save_bluedart_settlements(map_awb_and_amount):
2356 
    payment_client = PaymentClient().get_client()
 2375 
    payment_client = PaymentClient().get_client()
2357
2376
Line 2403... Line 2422...
2403 
        query = query.filter(PaymentSettlement.netCollection > 0)
 2422 
        query = query.filter(PaymentSettlement.netCollection > 0)
2404
2423
2405 
    return query.first()
 2424 
    return query.first()
2406 
 
 2425 
 
2407 
def save_ebs_settlement_summary(settlement_id, settlement_date, transaction_date_from, transaction_date_to, amount):
 2426 
def save_ebs_settlement_summary(settlement_id, settlement_date, transaction_date_from, transaction_date_to, amount):
- 
 
 2427 
    summary = EBSSettlementSummary.query.filter_by(settlementId = settlement_id)
- 
 
 2428 
    if summary is None:
2408 
    summary = EBSSettlementSummary()
 2429 
        summary = EBSSettlementSummary()
2409 
    summary.settlementId = settlement_id
 2430 
        summary.settlementId = settlement_id
2410 
    summary.settlementDate = settlement_date
 2431 
        summary.settlementDate = settlement_date
2411 
    summary.transactionDateFrom = transaction_date_from
 2432 
        summary.transactionDateFrom = transaction_date_from
2412 
    summary.transactionDateTo = transaction_date_to
 2433 
        summary.transactionDateTo = transaction_date_to
2413 
    summary.amount = amount
 2434 
        summary.amount = amount
2414 
    summary.detailsUploaded = False
 2435 
        summary.detailsUploaded = False
2415 
    session.commit()
 2436 
        session.commit()
2416 
 
 2437 
 
2417 
def get_ebs_settlement_summaries():
 2438 
def get_ebs_settlement_summaries():
2418 
    summaries = EBSSettlementSummary.query.filter_by(detailsUploaded = False).order_by(EBSSettlementSummary.transactionDateFrom).all()
 2439 
    summaries = EBSSettlementSummary.query.filter_by(detailsUploaded = False).order_by(EBSSettlementSummary.transactionDateFrom).all()
2419 
    summary_map = {}
 2440 
    summary_map = {}
2420
2441