Subversion Repositories SmartDukaan

Rev

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

Rev 6215 Rev 6228
Line 43... Line 43...
43
43
44 
    /**
 44 
    /**
45 
     *
45 
     *
46 
     */
 46 
     */
47 
    private String rechargeOrderId = "";
 47 
    private String rechargeOrderId = "";
- 
 
 48 
    private String name = "";
- 
 
 49 
    private String line1 = "";
- 
 
 50 
    private String line2 = "";
- 
 
 51 
    private String city = "";
- 
 
 52 
    private String state = "";
- 
 
 53 
    private String pincode = "";
48 
    private String phone = "";
 54 
    private String phone = "";
49
55
50
56
51 
    private static final long serialVersionUID = 2079308723099307749L;
 57 
    private static final long serialVersionUID = 2079308723099307749L;
52 
 
 58 
 
Line 83... Line 89...
83 
        return "show";
 89 
        return "show";
84 
    }
 90 
    }
85 
 
 91 
 
86 
    // POST /order/
 92 
    // POST /order/
87 
    public String create(){
 93 
    public String create(){
88
94 
 
89 
        if(rechargeOrderId == null){
 95 
        if(rechargeOrderId == null){
90 
            return "recharge-redirect";
 96 
            return "recharge-redirect";
91 
        }
 97 
        }
92
- 
 
93 
        /* Dont delete this code fragment. It will be reused.
 - 
 
94 
        UserClient uc;
 - 
 
95 
        try {
 98 
        try {
96 
            uc = new UserClient();
 - 
 
97 
            TransactionClient tc = new TransactionClient();
 99 
            TransactionClient tc = new TransactionClient();
98 
            rechargeOrder = tc.getClient().getRechargeOrder(Long.parseLong(rechargeOrderId));
 100 
            rechargeOrder = tc.getClient().getRechargeOrder(Long.parseLong(rechargeOrderId));
- 
 
 101 
        } catch (Exception ee) {
- 
 
 102 
            log.error("problem fetching rechargeOrder : " + rechargeOrderId);
- 
 
 103 
            return "recharge-redirect";
- 
 
 104 
        }
- 
 
 105 
        try {
- 
 
 106 
            UserClient uc = new UserClient();
99 
            if(!name.isEmpty()) {
 107 
            if(!name.isEmpty() && !phone.isEmpty()) {
100 
                Address address = new Address();
 108 
                Address address = new Address();
101 
                address.setName(name);
 109 
                address.setName(name);
102 
                address.setLine1(line1);
 110 
                address.setLine1(line1);
103 
                address.setLine2(line2);
 111 
                address.setLine2(line2);
104 
                address.setCity(city);
 112 
                address.setCity(city);
105 
                address.setState(state);
 113 
                address.setState(state);
106 
                address.setCountry("India");
 114 
                address.setCountry("India");
107 
                address.setPin(pincode);
 115 
                address.setPin(pincode);
108 
                address.setPhone(phone);
 116 
                address.setPhone(phone);
109
- 
 
- 
 
 117 
 
110 
                uc.getClient().addAddressForUser(rechargeOrder.getUserId(), address, true);
 118 
                uc.getClient().addAddressForUser(rechargeOrder.getUserId(), address, true);
111 
            }
 119 
            }
112
120 
 
113 
        } catch (TTransportException e) {
 - 
 
114 
            // TODO Auto-generated catch block
 - 
 
115 
            e.printStackTrace();
 - 
 
116 
        } catch (NumberFormatException e) {
 - 
 
117 
            // TODO Auto-generated catch block
 - 
 
118 
            e.printStackTrace();
 - 
 
119 
        } catch (TransactionServiceException e) {
 - 
 
120 
            // TODO Auto-generated catch block
 - 
 
121 
            e.printStackTrace();
 - 
 
122 
        } catch (TException e) {
 121 
        } catch (Exception e) {
123 
            // TODO Auto-generated catch block
 122 
            log.error("Problem saving the address", e);
124 
            e.printStackTrace();
 - 
 
125 
        } catch (UserContextException e) {
 123 
            return "recharge-pay-options-redirect";
126 
            // TODO Auto-generated catch block
 - 
 
127 
            e.printStackTrace();
 - 
 
128 
        }
 124 
        }
129 
        */
 - 
 
130 
 
 125 
 
131 
        String paymentOption = request.getParameter("payment_option");
 126 
        String paymentOption = request.getParameter("payment_option");
132 
        log.info("Payment Option Selected: " + paymentOption);
 127 
        log.info("Payment Option Selected: " + paymentOption);
133 
        if(paymentOption == null || paymentOption.equals("")){
 128 
        if(paymentOption == null || paymentOption.equals("")){
134 
            addActionError("Please select a payment method to continue.");
 129 
            addActionError("Please select a payment method to continue.");
135 
            return "recharge-pay-options-redirect";
 130 
            return "recharge-pay-options-redirect";
136 
        }
 131 
        }
137
132
- 
 
 133 
        if (name.isEmpty() && !phone.isEmpty()) {
- 
 
 134 
            //This means we only got the phone from UI.
- 
 
 135 
            //Lets keep it.
- 
 
 136 
        } else {
- 
 
 137 
            //For all other cases make it empty.
- 
 
 138 
            phone = "";
- 
 
 139 
        }
- 
 
 140
138
141
139 
        if(paymentOption.equals(IPaymentService.HDFC_MASTERCARD_CREDIT) || paymentOption.equals(IPaymentService.HDFC_MASTERCARD_DEBIT) ||
142 
        if(paymentOption.equals(IPaymentService.HDFC_MASTERCARD_CREDIT) || paymentOption.equals(IPaymentService.HDFC_MASTERCARD_DEBIT) ||
140 
                paymentOption.equals(IPaymentService.HDFC_VISA) || paymentOption.equals(IPaymentService.HDFC_VISA_ELECTRON)) {
 143 
                paymentOption.equals(IPaymentService.HDFC_VISA) || paymentOption.equals(IPaymentService.HDFC_VISA_ELECTRON)) {
141 
            // User has selected Visa or MasterCard
 144 
            // User has selected Visa or MasterCard
142 
            HdfcPaymentService hdfcPaymentService = new HdfcPaymentService();
 145 
            HdfcPaymentService hdfcPaymentService = new HdfcPaymentService();
143 
            paymentId = hdfcPaymentService.createPayment(rechargeOrder, paymentOption);
 146 
            paymentId = hdfcPaymentService.createPayment(rechargeOrder, paymentOption, phone);
144 
            if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
 147 
            if (paymentId == IPaymentService.PAYMENT_NOT_CREATED) {
145 
                log.error("Unable to process payment through HDFC. Falling through to EBS.");
 148 
                log.error("Unable to process payment through HDFC. Falling through to EBS.");
146 
            } else {
 149 
            } else {
147 
                this.redirectURL = hdfcPaymentService.getRedirectUrl();
 150 
                this.redirectURL = hdfcPaymentService.getRedirectUrl();
148 
                log.info(this.redirectURL);
 151 
                log.info(this.redirectURL);
Line 198... Line 201...
198 
    }
 201 
    }
199 
 
 202 
 
200 
    public void setPhone(String phone) {
 203 
    public void setPhone(String phone) {
201 
        this.phone = phone;
 204 
        this.phone = phone;
202 
    }
 205 
    }
- 
 
 206 
 
- 
 
 207 
    public String getName() {
- 
 
 208 
        return name;
- 
 
 209 
    }
- 
 
 210 
 
- 
 
 211 
    public void setName(String name) {
- 
 
 212 
        this.name = name;
- 
 
 213 
    }
- 
 
 214 
 
- 
 
 215 
    public String getLine1() {
- 
 
 216 
        return line1;
- 
 
 217 
    }
- 
 
 218 
 
- 
 
 219 
    public void setLine1(String line1) {
- 
 
 220 
        this.line1 = line1;
- 
 
 221 
    }
- 
 
 222 
 
- 
 
 223 
    public String getLine2() {
- 
 
 224 
        return line2;
- 
 
 225 
    }
- 
 
 226 
 
- 
 
 227 
    public void setLine2(String line2) {
- 
 
 228 
        this.line2 = line2;
- 
 
 229 
    }
- 
 
 230 
 
- 
 
 231 
    public String getCity() {
- 
 
 232 
        return city;
- 
 
 233 
    }
- 
 
 234 
 
- 
 
 235 
    public void setCity(String city) {
- 
 
 236 
        this.city = city;
- 
 
 237 
    }
- 
 
 238 
 
- 
 
 239 
    public String getState() {
- 
 
 240 
        return state;
- 
 
 241 
    }
- 
 
 242 
 
- 
 
 243 
    public void setState(String state) {
- 
 
 244 
        this.state = state;
- 
 
 245 
    }
- 
 
 246 
 
- 
 
 247 
    public String getPincode() {
- 
 
 248 
        return pincode;
- 
 
 249 
    }
- 
 
 250 
 
- 
 
 251 
    public void setPincode(String pincode) {
- 
 
 252 
        this.pincode = pincode;
- 
 
 253 
    }
203 
}
 254 
}
204 

            255