Subversion Repositories SmartDukaan

Rev

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

Rev 6271 Rev 6278
Line 3578... Line 3578...
3578
    currentOrders[RechargeOrderStatus._VALUES_TO_NAMES.get(RechargeOrderStatus.RECHARGE_FAILED_REFUNDED)] = [order.to_thrift_object() for order in rorders]
3578
    currentOrders[RechargeOrderStatus._VALUES_TO_NAMES.get(RechargeOrderStatus.RECHARGE_FAILED_REFUNDED)] = [order.to_thrift_object() for order in rorders]
3579
    
3579
    
3580
    twa = session.query(func.sum(UserWallet.amount)).one()
3580
    twa = session.query(func.sum(UserWallet.amount)).one()
3581
    tra = session.query(func.sum(RechargeOrder.totalAmount)).filter(RechargeOrder.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL).one()
3581
    tra = session.query(func.sum(RechargeOrder.totalAmount)).filter(RechargeOrder.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL).one()
3582
    gwa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId > 100000).one()
3582
    gwa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId > 100000).one()
3583
    tpa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId < 100000).one()
3583
    #tpa = session.query(func.sum(UserWalletHistory.amount)).filter(UserWalletHistory.orderId < 100000).one()
-
 
3584
    tpa = session.query(func.sum(RechargeOrder.totalAmount-RechargeOrder.walletAmount)).filter(RechargeOrder.status.in_((RechargeOrderStatus.RECHARGE_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED, RechargeOrderStatus.PAYMENT_SUCCESSFUL, RechargeOrderStatus.RECHARGE_FAILED_REFUNDED))).one()
3584
    amounts['Total Wallet Amount'] = twa[0]
3585
    amounts['Total Wallet Amount'] = twa[0]
3585
    amounts['Total Recharge Amount'] = tra[0]
3586
    amounts['Total Recharge Amount'] = tra[0]
3586
    amounts['Gift Wallet Amount'] = gwa[0]
3587
    amounts['Gift Wallet Amount'] = gwa[0]
3587
    amounts['Total Payment Amount'] = tra[0] + twa[0] - gwa[0]
3588
    #amounts['Total Payment Amount'] = tra[0] + twa[0] - gwa[0]
-
 
3589
    amounts['Total Payment Amount'] = tpa
3588
 
3590
    
3589
    rs.statusCounts = statusCounts
3591
    rs.statusCounts = statusCounts
3590
    rs.operatorCounts = operatorCounts    
3592
    rs.operatorCounts = operatorCounts    
3591
    rs.currentOrders = currentOrders
3593
    rs.currentOrders = currentOrders
3592
    rs.amounts = amounts
3594
    rs.amounts = amounts
3593
    
3595