Subversion Repositories SmartDukaan

Rev

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

Rev 7201 Rev 7243
Line 4645... Line 4645...
4645 
            enddate = to_py_date(enddate).date()
 4645 
            enddate = to_py_date(enddate).date()
4646 
            query = query.filter(cast(RechargeTransaction.transactionTime, DATE) <= enddate)
 4646 
            query = query.filter(cast(RechargeTransaction.transactionTime, DATE) <= enddate)
4647 
 
 4647 
 
4648 
    return query.all()
4648 
    return query.all()
4649 
 
 4649 
 
4650 
def update_recharge_transaction_status(id, status, refundTime):
 4650 
def update_recharge_transaction_status(id, status):
4651 
    rechargeTransaction = RechargeTransaction.get_by(id=id)
 4651 
    rechargeTransaction = RechargeTransaction.get_by(id=id)
4652 
    if status in (RechargeOrderStatus.RECHARGE_FAILED_REFUNDED, RechargeOrderStatus.RECHARGE_FAILED):
 4652 
    if status in (RechargeOrderStatus.RECHARGE_FAILED_REFUNDED, RechargeOrderStatus.RECHARGE_FAILED):
4653 
        rechargeTransaction.status = status
 4653 
        rechargeTransaction.status = status
4654 
        if status == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED:
 - 
 
4655 
            rechargeTransaction.responseTime = refundTime
4654 
        rechargeTransaction.responseTime = datetime.datetime.now()
4656
4655
4657 
        store = HotspotStore.get_by(id=rechargeTransaction.storeId)
 4656 
        store = HotspotStore.get_by(id=rechargeTransaction.storeId)
4658 
        wallet = WalletForCompany.get_by(companyId=store.companyId)
 4657 
        wallet = WalletForCompany.get_by(companyId=store.companyId)
4659 
        wh = WalletHistoryForCompany()
 4658 
        wh = WalletHistoryForCompany()
4660 
        wh.walletId = wallet.id
 4659 
        wh.walletId = wallet.id