Subversion Repositories SmartDukaan

Rev

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

Rev 6239 Rev 6433
Line 31... Line 31...
31
    
31
    
32
    public String index() {
32
    public String index() {
33
        try {
33
        try {
34
            TransactionClient tcl = new TransactionClient();
34
            TransactionClient tcl = new TransactionClient();
35
            rechargeOrder = tcl.getClient().getRechargeOrder(Long.parseLong(rechargeOrderId));
35
            rechargeOrder = tcl.getClient().getRechargeOrder(Long.parseLong(rechargeOrderId));
36
            setAmount(rechargeOrder.getTotalAmount() - rechargeOrder.getWalletAmount());
36
            setAmount(rechargeOrder.getTotalAmount() - rechargeOrder.getWalletAmount() - rechargeOrder.getCouponAmount());
37
        } catch (NumberFormatException e) {
37
        } catch (NumberFormatException e) {
38
            log.error("rechargeOrderId : " + rechargeOrderId + " could not be converted long");
38
            log.error("rechargeOrderId : " + rechargeOrderId + " could not be converted long");
39
            return "recharge-redirect";
39
            return "recharge-redirect";
40
        } catch (Exception e) {
40
        } catch (Exception e) {
41
            log.error("Unable to get recharge Order for id : " + rechargeOrderId);
41
            log.error("Unable to get recharge Order for id : " + rechargeOrderId);
Line 63... Line 63...
63
    
63
    
64
    public String fieldsToShow() {
64
    public String fieldsToShow() {
65
        Address address = null;
65
        Address address = null;
66
        UserClient ucl;
66
        UserClient ucl;
67
        long addressId = 0;
67
        long addressId = 0;
68
        long amount = rechargeOrder.getTotalAmount() - rechargeOrder.getWalletAmount();
68
        long amount = rechargeOrder.getTotalAmount() - rechargeOrder.getWalletAmount() - rechargeOrder.getCouponAmount();
69
        if (rechargeOrder.getRechargeType().equals(RechargeType.DTH)) {
69
        if (rechargeOrder.getRechargeType().equals(RechargeType.DTH)) {
70
            try {
70
            try {
71
                ucl = new UserClient();
71
                ucl = new UserClient();
72
                addressId = ucl.getClient().getDefaultAddressId(rechargeOrder.getUserId());
72
                addressId = ucl.getClient().getDefaultAddressId(rechargeOrder.getUserId());
73
                if (addressId != 0) {
73
                if (addressId != 0) {