Subversion Repositories SmartDukaan

Rev

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

Rev 7435 Rev 7611
Line 73... Line 73...
73 
    private Double advanceAmount;
 73 
    private Double advanceAmount;
74 
    private String deliveryDate = "";
 74 
    private String deliveryDate = "";
75 
    private String productName = "";
 75 
    private String productName = "";
76 
    private String bestDealText = "";
 76 
    private String bestDealText = "";
77 
    private String CatalogItemId = "";
 77 
    private String CatalogItemId = "";
- 
 
 78 
    private String cardType = "";
78 
    private long paymentId;
 79 
    private long paymentId;
79 
    private long userId;
 80 
    private long userId;
80
81
81
82
82 
    private StorePricing sp;
 83 
    private StorePricing sp;
Line 176... Line 177...
176 
                storeOrderDetail.setPayStatus(StorePaymentStatus.FULL_PAY_RECEIVED);
 177 
                storeOrderDetail.setPayStatus(StorePaymentStatus.FULL_PAY_RECEIVED);
177 
            } else {
 178 
            } else {
178 
                storeOrderDetail.setPayStatus(StorePaymentStatus.ADV_RECEIVED);
 179 
                storeOrderDetail.setPayStatus(StorePaymentStatus.ADV_RECEIVED);
179 
            }
 180 
            }
180 
            if(cardAmount > 0) {
 181 
            if(cardAmount > 0) {
- 
 
 182 
                if(edc == null || edc.equals("")) {
- 
 
 183 
                    setErrorMsg("Unable to create order. Please try again.");
- 
 
 184 
                    log.error("Error : EDC is null");
- 
 
 185 
                    return "error-result";
- 
 
 186 
                }
- 
 
 187
- 
 
 188 
                if(cardType == null || cardType.equals("")) {
- 
 
 189 
                    setErrorMsg("Unable to create order. Please try again.");
- 
 
 190 
                    log.error("Error : CardType is null");
- 
 
 191 
                    return "error-result";
- 
 
 192 
                }
- 
 
 193
- 
 
 194 
                if(cardType == null || cardType.equals("")) {
- 
 
 195 
                    setErrorMsg("Unable to create order. Please try again.");
- 
 
 196 
                    log.error("Error : CardType is null");
- 
 
 197 
                    return "error-result";
- 
 
 198 
                }
- 
 
 199
181 
                storeOrderDetail.setEdcBank(edc);
 200 
                storeOrderDetail.setEdcBank(edc);
- 
 
 201 
                storeOrderDetail.setCardType(cardType);
- 
 
 202 
                storeOrderDetail.setApprovalCode(approvalCode);
182 
            }
 203 
            }
183 
            storeOrderDetail.setCardRefundAmount(0);
 204 
            storeOrderDetail.setCardRefundAmount(0);
184 
            storeOrderDetail.setCashRefundAmount(0);
 205 
            storeOrderDetail.setCashRefundAmount(0);
185 
            storeOrderDetail.setApprovalCode(approvalCode);
 - 
 
186
206
187 
            boolean saveSuccess = tcl.getClient().saveStoreOrderDetail(storeOrderDetail);
 207 
            boolean saveSuccess = tcl.getClient().saveStoreOrderDetail(storeOrderDetail);
188 
            if(!saveSuccess) {
 208 
            if(!saveSuccess) {
189 
                setErrorMsg("Unable to create order. Please try again.");
 209 
                setErrorMsg("Unable to create order. Please try again.");
190 
                return "error-result";
 210 
                return "error-result";
Line 592... Line 612...
592 
    }
 612 
    }
593 
 
 613 
 
594 
    public void setApprovalCode(String approvalCode) {
 614 
    public void setApprovalCode(String approvalCode) {
595 
        this.approvalCode = approvalCode;
 615 
        this.approvalCode = approvalCode;
596 
    }
 616 
    }
- 
 
 617 
 
- 
 
 618 
    public void setCardType(String cardType) {
- 
 
 619 
        this.cardType = cardType;
- 
 
 620 
    }
- 
 
 621 
 
- 
 
 622 
    public String getCardType() {
- 
 
 623 
        return cardType;
- 
 
 624 
    }
597 
}
 625 
}