Subversion Repositories SmartDukaan

Rev

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

Rev 9321 Rev 9342
Line 428... Line 428...
428 
            data = storeData[txn[0]]
 428 
            data = storeData[txn[0]]
429 
        if txn[1] == 1:
 429 
        if txn[1] == 1:
430 
            data[0] += int(txn[3]) - int(txn[4])
 430 
            data[0] += int(txn[3]) - int(txn[4])
431 
        if txn[1] == 2:
 431 
        if txn[1] == 2:
432 
            data[1] += int(txn[3]) - int(txn[4])
 432 
            data[1] += int(txn[3]) - int(txn[4])
433 
        if txn[2] in (RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_UNKNOWN):
 - 
 
- 
 
 433 
 
434 
            data[2] += int(txn[3])
 434 
        data[2] += int(txn[3])
435 
            data[3] += int(txn[4])
 435 
        data[3] += int(txn[4])
436 
            data[4] += int(txn[3]) - int(txn[4])
 436 
        data[4] += int(txn[3]) - int(txn[4])
437 
        storeData[txn[0]] = data
 437 
        storeData[txn[0]] = data
438 
 
 438 
 
439
439
440 
    reftxns = session.query(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status, func.sum(RechargeTransaction.amount), func.sum(RechargeTransaction.discount)).filter(RechargeTransaction.status.in_([RechargeOrderStatus.RECHARGE_FAILED, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED])).filter(RechargeTransaction.responseTime.between(todate, tomorrow)).filter(not_(RechargeTransaction.transactionTime.between(todate, tomorrow))).group_by(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status).order_by(RechargeTransaction.storeId).all()
 440 
    reftxns = session.query(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status, func.sum(RechargeTransaction.amount), func.sum(RechargeTransaction.discount)).filter(RechargeTransaction.status.in_([RechargeOrderStatus.RECHARGE_FAILED, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED])).filter(RechargeTransaction.responseTime.between(todate, tomorrow)).filter(not_(RechargeTransaction.transactionTime.between(todate, tomorrow))).group_by(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status).order_by(RechargeTransaction.storeId).all()
441 
    for txn in reftxns:
 441 
    for txn in reftxns: