Subversion Repositories SmartDukaan

Rev

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

Rev 8837 Rev 8868
Line 278... Line 278...
278
                
278
                
279
 
279
 
280
def compute_recharge_collection(cdate):
280
def compute_recharge_collection(cdate):
281
    todate = datetime.datetime(cdate.year, cdate.month, cdate.day)
281
    todate = datetime.datetime(cdate.year, cdate.month, cdate.day)
282
    tomorrow = todate + timedelta(days=1)
282
    tomorrow = todate + timedelta(days=1)
-
 
283
    
283
    txns = session.query(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status, func.sum(RechargeTransaction.amount), func.sum(RechargeTransaction.discount)).filter(RechargeTransaction.status.in_([RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED, RechargeOrderStatus.RECHARGE_UNKNOWN])).filter(RechargeTransaction.transactionTime >= todate).filter(RechargeTransaction.transactionTime < tomorrow).group_by(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status).order_by(RechargeTransaction.storeId).all()
284
    txns = session.query(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status, func.sum(RechargeTransaction.amount), func.sum(RechargeTransaction.discount)).filter(RechargeTransaction.status.in_([RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_UNKNOWN])).filter(RechargeTransaction.transactionTime.between(todate, tomorrow)).group_by(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status).order_by(RechargeTransaction.storeId).all()
-
 
285
    txns += 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.transactionTime.between(todate, tomorrow)).filter(not_(RechargeTransaction.responseTime.between(todate, tomorrow)).group_by(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status).order_by(RechargeTransaction.storeId).all()
284
    storeData = {}
286
    storeData = {}
285
    for txn in txns:
287
    for txn in txns:
286
        print txn
288
        print txn
287
        if not storeData.has_key(txn[0]):
289
        if not storeData.has_key(txn[0]):
288
            data = [0,0,0,0,0]
290
            data = [0,0,0,0,0]
Line 291... Line 293...
291
            data = storeData[txn[0]]
293
            data = storeData[txn[0]]
292
        if txn[1] == 1:
294
        if txn[1] == 1:
293
            data[0] += int(txn[3]) - int(txn[4])
295
            data[0] += int(txn[3]) - int(txn[4])
294
        if txn[1] == 2:
296
        if txn[1] == 2:
295
            data[1] += int(txn[3]) - int(txn[4])
297
            data[1] += int(txn[3]) - int(txn[4])
296
        if txn[2] in (RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED, RechargeOrderStatus.RECHARGE_UNKNOWN):
298
        if txn[2] in (RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_UNKNOWN):
297
            data[2] += int(txn[3])
299
            data[2] += int(txn[3])
298
            data[3] += int(txn[4])
300
            data[3] += int(txn[4])
299
            data[4] += int(txn[3]) - int(txn[4])
301
            data[4] += int(txn[3]) - int(txn[4])
300
        storeData[txn[0]] = data
302
        storeData[txn[0]] = data
-
 
303
 
301
  
304
    
302
    reftxns = session.query(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status, func.sum(RechargeTransaction.amount), func.sum(RechargeTransaction.discount)).filter(RechargeTransaction.status == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED).filter(RechargeTransaction.responseTime >= todate).filter(RechargeTransaction.responseTime < tomorrow).group_by(RechargeTransaction.storeId, RechargeTransaction.payMethod, RechargeTransaction.status).order_by(RechargeTransaction.storeId).all()  
305
    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()
303
    for txn in reftxns:
306
    for txn in reftxns:
304
        print txn
307
        print txn
305
        if not storeData.has_key(txn[0]):
308
        if not storeData.has_key(txn[0]):
306
            data = [0,0,0,0,0]
309
            data = [0,0,0,0,0]
307
            storeData[txn[0]] = data
310
            storeData[txn[0]] = data