Subversion Repositories SmartDukaan

Rev

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

Rev 30451 Rev 30452
Line 724... Line 724...
724 
					LOGGER.info("authId" + authId);
 724 
					LOGGER.info("authId" + authId);
725 
 
 725 
 
726 
					if (collectionPlan.getTargetPlan() != null && collectionPlan.getCommittedDate() != null) {
 726 
					if (collectionPlan.getTargetPlan() != null && collectionPlan.getCommittedDate() != null) {
727 
						float targetCollection = 0;
 727 
						float targetCollection = 0;
728 
 
 728 
 
- 
 
 729 
						if (collectionPlan.getRank() == 2) {
- 
 
 730 
							targetCollection = collectionPlan.getTargetPlan() - collectionPlan.getAchievementPlan();
- 
 
 731 
						} else {
729 
						if (authId != null && authId == authUser.getId())
 732 
							targetCollection = collectionPlan.getTargetPlan();
- 
 
 733 
						}
730 
 
 734 
 
731 
							if (collectionPlan.getRank() == 2) {
 735 
						if (authId != null && authId == authUser.getId()) {
732 
								targetCollection = collectionPlan.getTargetPlan() - collectionPlan.getAchievementPlan();
 - 
 
733 
							} else {
 - 
 
734 
								targetCollection = collectionPlan.getTargetPlan();
 - 
 
735 
							}
 - 
 
736 
 
 736 
 
737 
						if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
 737 
							if (!collectionPlan.getCommittedDate().isAfter(startDate)) {
738 
							totalPartnerTargetCollection += targetCollection;
 738 
								totalPartnerTargetCollection += targetCollection;
- 
 
 739 
							}
739 
						}
 740 
						}
- 
 
 741 
 
740 
						ptam.setCollectionTarget(targetCollection);
 742 
						ptam.setCollectionTarget(targetCollection);
741 
					}
 743 
					}
742 
					if (collectionAchievement.getAmount() != null) {
 744 
					if (collectionAchievement.getAmount() != null) {
743 
						totalPartnerAchievementCollection += collectionAchievement.getAmount();
 745 
						totalPartnerAchievementCollection += collectionAchievement.getAmount();
744 
 
 746