Subversion Repositories SmartDukaan

Rev

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

Rev 8896 Rev 8929
Line 841... Line 841...
841
					System.out.println("Into the COD Status Condition");
841
					System.out.println("Into the COD Status Condition");
842
					return 2;
842
					return 2;
843
				}
843
				}
844
			}
844
			}
845
			else{
845
			else{
846
				if(( setOfprepaidrefundableStates.contains(t_order.getStatus()) || setOfrefundableStates.contains(t_order.getStatus()) ) && SecurityUtils.getSubject().hasRole("TeamLead") && (t_order.isSetAccepted_timestamp())){
846
				if(( setOfprepaidrefundableStates.contains(t_order.getStatus()) || setOfrefundableStates.contains(t_order.getStatus()) ) && SecurityUtils.getSubject().hasRole("TeamLead") && (t_order.isSetAccepted_timestamp() || t_order.isSetOriginalOrderId())){
847
					System.out.println("Into the Prepaid Status Condition");
847
					System.out.println("Into the Prepaid Status Condition");
848
					return 2;
848
					return 2;
849
				}
849
				}
850
			}
850
			}
851
		}
851
		}