Subversion Repositories SmartDukaan

Rev

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

Rev 30821 Rev 30822
Line 762... Line 762...
762 
								totalPartnerTargetCollection += targetCollection;
 762 
								totalPartnerTargetCollection += targetCollection;
763 
							}
 763 
							}
764 
						}
 764 
						}
765 
 
 765 
 
766 
						ptam.setCollectionTarget(targetCollection);
 766 
						ptam.setCollectionTarget(targetCollection);
- 
 
 767 
 
- 
 
 768 
						if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null
- 
 
 769 
								&& collectionPlan.getWalletTimestamp() != null
- 
 
 770 
								&& collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())) {
- 
 
 771 
							if (authId != null && authId == authUser.getId()) {
- 
 
 772 
 
- 
 
 773 
								totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
- 
 
 774 
							}
- 
 
 775 
							ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
- 
 
 776 
						} else if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
- 
 
 777 
								&& collectionPlan.getAchievementPlan() != null) {
- 
 
 778 
							if (authId != null && authId == authUser.getId()) {
- 
 
 779 
 
- 
 
 780 
								totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
- 
 
 781 
							}
- 
 
 782 
							ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
- 
 
 783 
 
- 
 
 784 
						}
767 
					}
 785 
					}
768 
 
 786 
 
769 
					if (authId != null && authId != authUser.getId()) {
 787 
					if (authId != null && authId != authUser.getId()) {
770 
						ptam.setAuthUser(authRepository.selectById(authId));
 788 
						ptam.setAuthUser(authRepository.selectById(authId));
771 
 
 789 
 
Line 774... Line 792...
774 
					if (collectionPlan.getCommittedDate() != null) {
 792 
					if (collectionPlan.getCommittedDate() != null) {
775 
 
 793 
 
776 
						ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
 794 
						ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
777 
					}
 795 
					}
778 
 
 796 
 
779 
					if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null
 - 
 
780 
							&& collectionPlan.getWalletTimestamp() != null
 - 
 
781 
							&& collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())) {
 - 
 
782 
						if (authId != null && authId == authUser.getId()) {
 - 
 
783 
 
 - 
 
784 
							totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
 - 
 
785 
						}
 - 
 
786 
						ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
 - 
 
787 
					} else if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
 - 
 
788 
							&& collectionPlan.getAchievementPlan() != null) {
 - 
 
789 
						if (authId != null && authId == authUser.getId()) {
 - 
 
790 
 
 - 
 
791 
							totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
 - 
 
792 
						}
 - 
 
793 
						ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
 - 
 
794 
 
 - 
 
795 
					}
 - 
 
796 
				}
 797 
				}
797 
 
 798 
 
798 
				// Secondary
 799 
				// Secondary
799 
 
 800 
 
800 
				PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;
 801 
				PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;