Subversion Repositories SmartDukaan

Rev

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

Rev 6536 Rev 6591
Line 138... Line 138...
138
    
138
    
139
    public String validateRecharge(){
139
    public String validateRecharge(){
140
    	TransactionClient tcl;
140
    	TransactionClient tcl;
141
    	try {
141
    	try {
142
    		tcl = new TransactionClient();
142
    		tcl = new TransactionClient();
143
    		return tcl.getClient().validateRecharge(RechargeType.findByValue(Integer.parseInt(this.rechargeType)), number, Long.parseLong(operator));
143
    		return tcl.getClient().validateRecharge(RechargeType.findByValue(Integer.parseInt(this.rechargeType)), number, Long.parseLong(operator), request.getRemoteAddr());
144
    	} catch (Exception e) {
144
    	} catch (Exception e) {
145
    		log.error("Unable to get service provider for Device number " + number + " and rechargeType : " +  rechargeType, e);
145
    		log.error("Unable to get service provider for Device number " + number + " and rechargeType : " +  rechargeType, e);
146
    	}
146
    	}
147
    	return "Oops! There seems to be a problem. Please try after some time";
147
    	return "Oops! There seems to be a problem. Please try after some time";
148
    	
148
    	
Line 330... Line 330...
330
            rechargeOrder.setStatus(RechargeOrderStatus.PAYMENT_PENDING);
330
            rechargeOrder.setStatus(RechargeOrderStatus.PAYMENT_PENDING);
331
            rechargeOrder.setOrderType(OrderType.B2C);
331
            rechargeOrder.setOrderType(OrderType.B2C);
332
            rechargeOrder.setWalletAmount(Long.parseLong(getWalletAmountUsed()));
332
            rechargeOrder.setWalletAmount(Long.parseLong(getWalletAmountUsed()));
333
            rechargeOrder.setCouponAmount(couponAmount);
333
            rechargeOrder.setCouponAmount(couponAmount);
334
            rechargeOrder.setCouponCode(couponCode);
334
            rechargeOrder.setCouponCode(couponCode);
-
 
335
            rechargeOrder.setIpAddress(request.getRemoteAddr());
335
            TransactionClient tc1 = new TransactionClient();
336
            TransactionClient tc1 = new TransactionClient();
336
            rechargeOrder = tc1.getClient().createRechargeOrder(rechargeOrder);
337
            rechargeOrder = tc1.getClient().createRechargeOrder(rechargeOrder);
337
            setRechargeOrderId(rechargeOrder.getId());
338
            setRechargeOrderId(rechargeOrder.getId());
338
            
339
            
339
        } catch (Exception e) {
340
        } catch (Exception e) {