Subversion Repositories SmartDukaan

Rev

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

Rev 8872 Rev 8893
Line 676... Line 676...
676
			in.shop2020.model.v1.order.Attribute attr1 = new in.shop2020.model.v1.order.Attribute();
676
			in.shop2020.model.v1.order.Attribute attr1 = new in.shop2020.model.v1.order.Attribute();
677
			attr1.setName("Refund_Option");
677
			attr1.setName("Refund_Option");
678
			in.shop2020.model.v1.order.Attribute attr2 = new in.shop2020.model.v1.order.Attribute();
678
			in.shop2020.model.v1.order.Attribute attr2 = new in.shop2020.model.v1.order.Attribute();
679
			attr2.setName("Refund_Amount");
679
			attr2.setName("Refund_Amount");
680
			in.shop2020.model.v1.order.Attribute attr3 = new in.shop2020.model.v1.order.Attribute();
680
			in.shop2020.model.v1.order.Attribute attr3 = new in.shop2020.model.v1.order.Attribute();
681
			attr2.setName("Refund_TimeStamp");
681
			attr3.setName("Refund_TimeStamp");
682
			SimpleDateFormat timestmapFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
682
			SimpleDateFormat timestmapFormat = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");
683
			PaymentClient paymentServiceClient = new PaymentClient();
683
			PaymentClient paymentServiceClient = new PaymentClient();
684
			List<Payment> orderPayments =null; 
684
			List<Payment> orderPayments =null; 
685
			if(!t_order.isCod()){
685
			if(!t_order.isCod()){
686
				orderPayments =paymentServiceClient.getClient()
686
				orderPayments =paymentServiceClient.getClient()
Line 815... Line 815...
815
					System.out.println("Into the COD Status Condition");
815
					System.out.println("Into the COD Status Condition");
816
					return 2;
816
					return 2;
817
				}
817
				}
818
			}
818
			}
819
			else{
819
			else{
820
				if(( setOfprepaidrefundableStates.contains(t_order.getStatus()) || setOfrefundableStates.contains(t_order.getStatus()) ) && SecurityUtils.getSubject().hasRole("TeamLead")){
820
				if(( setOfprepaidrefundableStates.contains(t_order.getStatus()) || setOfrefundableStates.contains(t_order.getStatus()) ) && SecurityUtils.getSubject().hasRole("TeamLead") && (t_order.isSetAccepted_timestamp())){
821
					System.out.println("Into the Prepaid Status Condition");
821
					System.out.println("Into the Prepaid Status Condition");
822
					return 2;
822
					return 2;
823
				}
823
				}
824
			}
824
			}
825
		}
825
		}