Subversion Repositories SmartDukaan

Rev

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

Rev 8824 Rev 8848
Line 109... Line 109...
109 
	private Long                 codTicketId;
 109 
	private Long                 codTicketId;
110 
	private List<Address>        addresses;
 110 
	private List<Address>        addresses;
111 
	private Set<OrderStatus>     setOfcancellableStates;
 111 
	private Set<OrderStatus>     setOfcancellableStates;
112 
	//Start:- Added by Manish Sharma for Physical Refunds
112 
	//Start:- Added by Manish Sharma for Physical Refunds
113 
	private Set<OrderStatus>	 setOfrefundableStates;
 113 
	private Set<OrderStatus>	 setOfrefundableStates;
- 
 
 114 
	private Set<OrderStatus>	 setOfprepaidrefundableStates;
114 
	//End:- Added by Manish Sharma for Physical Refunds
 115 
	//End:- Added by Manish Sharma for Physical Refunds
115 
	private String               cancellationInitiator;
 116 
	private String               cancellationInitiator;
116 
	private String               cancelReason;
 117 
	private String               cancelReason;
117 
	private String               body;
 118 
	private String               body;
118 
	private String               line1;
 119 
	private String               line1;
Line 156... Line 157...
156 
		setOfcancellableStates.add(OrderStatus.ACCEPTED);
 157 
		setOfcancellableStates.add(OrderStatus.ACCEPTED);
157 
		setOfcancellableStates.add(OrderStatus.BILLED);
 158 
		setOfcancellableStates.add(OrderStatus.BILLED);
158
159
159 
		//Start:- Added by Manish Sharma for Physical Refunds
160 
		//Start:- Added by Manish Sharma for Physical Refunds
160 
		setOfrefundableStates = new HashSet<OrderStatus>();
 161 
		setOfrefundableStates = new HashSet<OrderStatus>();
161 
		setOfrefundableStates.add(OrderStatus.RTO_REFUNDED);
 - 
 
162 
		setOfrefundableStates.add(OrderStatus.DOA_VALID_REFUNDED);
 162 
		setOfrefundableStates.add(OrderStatus.DOA_VALID_REFUNDED);
163 
		setOfrefundableStates.add(OrderStatus.DOA_INVALID_REFUNDED);
 163 
		setOfrefundableStates.add(OrderStatus.DOA_INVALID_REFUNDED);
164 
		setOfrefundableStates.add(OrderStatus.DOA_REFUNDED_RCVD_DAMAGED);
 164 
		setOfrefundableStates.add(OrderStatus.DOA_REFUNDED_RCVD_DAMAGED);
165 
		setOfrefundableStates.add(OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT);
 165 
		setOfrefundableStates.add(OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT);
166 
		setOfrefundableStates.add(OrderStatus.RTO_DAMAGED_REFUNDED);
 166 
		setOfrefundableStates.add(OrderStatus.RTO_DAMAGED_REFUNDED);
167 
		setOfrefundableStates.add(OrderStatus.RTO_LOST_IN_TRANSIT_REFUNDED);
 - 
 
168 
		setOfrefundableStates.add(OrderStatus.RET_PRODUCT_USABLE_REFUNDED);
 167 
		setOfrefundableStates.add(OrderStatus.RET_PRODUCT_USABLE_REFUNDED);
169 
		setOfrefundableStates.add(OrderStatus.RET_PRODUCT_UNUSABLE_REFUNDED);
 168 
		setOfrefundableStates.add(OrderStatus.RET_PRODUCT_UNUSABLE_REFUNDED);
170 
		setOfrefundableStates.add(OrderStatus.RET_REFUNDED_RCVD_DAMAGED);
 169 
		setOfrefundableStates.add(OrderStatus.RET_REFUNDED_RCVD_DAMAGED);
171 
		setOfrefundableStates.add(OrderStatus.RET_REFUNDED_LOST_IN_TRANSIT);
 170 
		setOfrefundableStates.add(OrderStatus.RET_REFUNDED_LOST_IN_TRANSIT);
172 
		setOfrefundableStates.add(OrderStatus.LOST_IN_TRANSIT_REFUNDED);
 - 
 
173 
		//End:- Added by Manish Sharma for Physical Refunds
171 
		//End:- Added by Manish Sharma for Physical Refunds
174
172
- 
 
 173 
		setOfprepaidrefundableStates = new HashSet<OrderStatus>();
- 
 
 174 
		setOfprepaidrefundableStates.add(OrderStatus.RTO_REFUNDED);
- 
 
 175 
		setOfprepaidrefundableStates.add(OrderStatus.RTO_LOST_IN_TRANSIT_REFUNDED);
- 
 
 176 
		setOfprepaidrefundableStates.add(OrderStatus.LOST_IN_TRANSIT_REFUNDED);
- 
 
 177 
		setOfprepaidrefundableStates.add(OrderStatus.CANCELLED_ON_CUSTOMER_REQUEST);
- 
 
 178 
		setOfprepaidrefundableStates.add(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
- 
 
 179
175
180
176 
	}
 181 
	}
177
182
178 
	public static final Map<Long, String> providerNameMap = new HashMap<Long, String>() {
 183 
	public static final Map<Long, String> providerNameMap = new HashMap<Long, String>() {
179 
        {
 184 
        {
Line 771... Line 776...
771 
			String refundAmount=transactionClient.getOrderAttributeValue(orderId, "Refund_Amount");
 776 
			String refundAmount=transactionClient.getOrderAttributeValue(orderId, "Refund_Amount");
772 
			if((refundOption!=null && refundAmount!=null) && (!("").equalsIgnoreCase(refundOption)) && !("").equalsIgnoreCase(refundAmount) && SecurityUtils.getSubject().hasRole("TeamLead")){
 777 
			if((refundOption!=null && refundAmount!=null) && (!("").equalsIgnoreCase(refundOption)) && !("").equalsIgnoreCase(refundAmount) && SecurityUtils.getSubject().hasRole("TeamLead")){
773 
				System.out.println("Into the Refund Condition");
 778 
				System.out.println("Into the Refund Condition");
774 
				return 0;
 779 
				return 0;
775 
			}
 780 
			}
- 
 
 781 
			else if(t_order.isCod()){
776 
			else if(setOfrefundableStates.contains(t_order.getStatus()) && SecurityUtils.getSubject().hasRole("TeamLead")){
 782 
				if(setOfrefundableStates.contains(t_order.getStatus()) && SecurityUtils.getSubject().hasRole("TeamLead")){
777 
				System.out.println("Into the Status Condition");
 783 
					System.out.println("Into the COD Status Condition");
- 
 
 784 
					return 2;
- 
 
 785 
				}
- 
 
 786 
			}
- 
 
 787 
			else{
- 
 
 788 
				if(( setOfprepaidrefundableStates.contains(t_order.getStatus()) || setOfrefundableStates.contains(t_order.getStatus()) ) && SecurityUtils.getSubject().hasRole("TeamLead")){
- 
 
 789 
					System.out.println("Into the Prepaid Status Condition");
778 
				return 2;
 790 
					return 2;
- 
 
 791 
				}
779 
			}
 792 
			}
780 
		}
 793 
		}
781 
		catch(Exception e){
 794 
		catch(Exception e){
782 
			log.error(e);
 795 
			log.error(e);
783 
		}
 796 
		}