Subversion Repositories SmartDukaan

Rev

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

Rev 7207 Rev 7236
Line 49... Line 49...
49 
    private String discount = "";
 49 
    private String discount = "";
50 
    private String circlecode = "";
 50 
    private String circlecode = "";
51
51
52 
    private String message = "";
 52 
    private String message = "";
53 
    private String errorMessage = "";
 53 
    private String errorMessage = "";
54 
    private String totalAmount = "";
 - 
 
55 
    private String couponCode = "";
 54 
    private String couponCode = "";
56 
    private String couponMessage = "";
 55 
    private String couponMessage = "";
57 
    private String hiddenUserId = "";
 56 
    private String hiddenUserId = "";
58 
    private long couponAmount = 0;
 57 
    private long couponAmount = 0;
59 
 
 58 
 
Line 270... Line 269...
270 
            log.warn("rechargeType received is empty or null");
 269 
            log.warn("rechargeType received is empty or null");
271 
            return "Oops! There seems to be a problem. Please try after some time";
 270 
            return "Oops! There seems to be a problem. Please try after some time";
272 
        }
 271 
        }
273
272
274 
        if (RechargeType.findByValue(Integer.parseInt(this.deviceType)) == RechargeType.DTH) {
 273 
        if (RechargeType.findByValue(Integer.parseInt(this.deviceType)) == RechargeType.DTH) {
275 
            if (Long.parseLong(totalAmount) < 250 || Long.parseLong(totalAmount) > 2000) {
 274 
            if (Long.parseLong(amount) < 250 || Long.parseLong(amount) > 2000) {
276 
                if(rechargeType.equals("2") && getOperatorName().equals(DISHTV)) {
 275 
                if(rechargeType.equals("2") && getOperatorName().equals(DISHTV)) {
277 
                    return "DishTv recharge amount should be between Rs.250 and Rs.2000";
 276 
                    return "DishTv recharge amount should be between Rs.250 and Rs.2000";
278 
                }
 277 
                }
279
278
280 
                if (!(Long.parseLong(totalAmount) >= 200 && Long.parseLong(totalAmount) < 250)) {
 279 
                if (!(Long.parseLong(amount) >= 200 && Long.parseLong(amount) < 250)) {
281 
                    return "DTH recharge amount should be between Rs.200 and Rs.2000";
 280 
                    return "DTH recharge amount should be between Rs.200 and Rs.2000";
282 
                }
 281 
                }
283 
            }
 282 
            }
284
283
285 
        } else if (RechargeType.findByValue(Integer.parseInt(this.deviceType)) == RechargeType.MOBILE) {
 284 
        } else if (RechargeType.findByValue(Integer.parseInt(this.deviceType)) == RechargeType.MOBILE) {
Line 372... Line 371...
372 
 
 371 
 
373 
    public void setRechargeOrderId(long l) {
 372 
    public void setRechargeOrderId(long l) {
374 
        this.rechargeOrderId = l;
 373 
        this.rechargeOrderId = l;
375 
    }
 374 
    }
376 
 
 375 
 
377 
    public String getTotalAmount() {
 - 
 
378 
        return totalAmount;
 - 
 
379 
    }
 - 
 
380
- 
 
381 
    public void setTotalAmount(String amount) {
 - 
 
382 
        this.totalAmount  = amount;
 - 
 
383
- 
 
384 
    }
 - 
 
385 
 
 - 
 
386 
    public String getPlan() {
 376 
    public String getPlan() {
387 
        return plan;
 377 
        return plan;
388 
    }
 378 
    }
389 
 
 379 
 
390 
    public void setPlan(String plan) {
 380 
    public void setPlan(String plan) {