Subversion Repositories SmartDukaan

Rev

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

Rev 13038 Rev 13050
Line 4589... Line 4589...
4589
        recharge_order.status = RechargeOrderStatus.PAYMENT_FAILED
4589
        recharge_order.status = RechargeOrderStatus.PAYMENT_FAILED
4590
        session.commit()
4590
        session.commit()
4591
        return True
4591
        return True
4592
    
4592
    
4593
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED:
4593
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED:
-
 
4594
        if recharge_order.status == RechargeOrderStatus.RECHARGE_FAILED:
-
 
4595
            print "Same updation for status RECHARGE_FAILED"
-
 
4596
            return True
4594
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED
4597
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED
4595
        recharge_order.responseTimestamp = datetime.datetime.now()
4598
        recharge_order.responseTimestamp = datetime.datetime.now()
4596
        session.commit()
4599
        session.commit()
4597
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id, 1)
4600
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id, 1)
4598
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, 0)
4601
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, 0)
4599
        enqueue_recharge_info_email(recharge_order)
4602
        enqueue_recharge_info_email(recharge_order)
4600
        return True
4603
        return True
4601
    
4604
    
4602
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
4605
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
-
 
4606
        if recharge_order.status == RechargeOrderStatus.RECHARGE_SUCCESSFUL:
-
 
4607
            print "Same updation for status RECHARGE_SUCCESSFUL"
-
 
4608
            return True
4603
        recharge_order.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
4609
        recharge_order.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
4604
        recharge_order.invoiceNumber = get_next_invoice_number(OrderType.RECHARGE)
4610
        recharge_order.invoiceNumber = get_next_invoice_number(OrderType.RECHARGE)
4605
        session.commit()
4611
        session.commit()
4606
        gvs = allocate_gift_voucher(recharge_order)
4612
        gvs = allocate_gift_voucher(recharge_order)
4607
        enqueue_recharge_info_email(recharge_order, gvs)
4613
        enqueue_recharge_info_email(recharge_order, gvs)
4608
        return True
4614
        return True
4609
    
4615
    
4610
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED:
4616
    if rechargeOrderStatus == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED:
-
 
4617
        if recharge_order.status == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED:
-
 
4618
            print "Same updation for status RECHARGE_FAILED_REFUNDED"
-
 
4619
            return True
4611
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED_REFUNDED
4620
        recharge_order.status = RechargeOrderStatus.RECHARGE_FAILED_REFUNDED
4612
        recharge_order.responseTimestamp = datetime.datetime.now()
4621
        recharge_order.responseTimestamp = datetime.datetime.now()
4613
        session.commit()
4622
        session.commit()
4614
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id, 1)
4623
        update_amount_in_wallet(recharge_order.userId, recharge_order.walletAmount, recharge_order.id, 1)
4615
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, 0)
4624
        update_amount_in_wallet(recharge_order.userId, recharge_order.totalAmount - recharge_order.walletAmount - recharge_order.couponAmount, recharge_order.id, 0)
Line 5646... Line 5655...
5646
 
5655
 
5647
    return query.all()    
5656
    return query.all()    
5648
 
5657
 
5649
def update_recharge_transaction_status(id, status):
5658
def update_recharge_transaction_status(id, status):
5650
    rechargeTransaction = RechargeTransaction.get_by(id=id)
5659
    rechargeTransaction = RechargeTransaction.get_by(id=id)
-
 
5660
    if rechargeTransaction.status == status:
-
 
5661
        print "Same updation of recharge transaction status"
-
 
5662
        return
5651
    if status in (RechargeOrderStatus.RECHARGE_FAILED_REFUNDED, RechargeOrderStatus.RECHARGE_FAILED):
5663
    if status in (RechargeOrderStatus.RECHARGE_FAILED_REFUNDED, RechargeOrderStatus.RECHARGE_FAILED):
5652
        rechargeTransaction.status = status
5664
        rechargeTransaction.status = status
5653
        rechargeTransaction.responseTime = datetime.datetime.now() 
5665
        rechargeTransaction.responseTime = datetime.datetime.now() 
5654
        
5666
        
5655
        store = HotspotStore.get_by(id=rechargeTransaction.storeId)
5667
        store = HotspotStore.get_by(id=rechargeTransaction.storeId)