Subversion Repositories SmartDukaan

Rev

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

Rev 30138 Rev 30146
Line 860... Line 860...
860
									"collection target should be more than " + totalCollectionPlan);
860
									"collection target should be more than " + totalCollectionPlan);
861
						}
861
						}
862
					}
862
					}
863
				}
863
				}
864
 
864
 
865
				if (partnerCollectionPlan.getCommitedTimestamp()
865
				if ((LocalDate.now().atStartOfDay().equals(ptam.getCollectionCommitmentDate().atStartOfDay())
866
						.isBefore(ptam.getCollectionCommitmentDate().atStartOfDay())
866
						|| ptam.getCollectionCommitmentDate().atStartOfDay().isAfter(LocalDate.now().atStartOfDay()))
867
						&& partnerCollectionPlan.getCollectionPlan() == ptam.getCollectionTarget()) {
867
						&& partnerCollectionPlan.getCollectionPlan() == ptam.getCollectionTarget()) {
868
					partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
868
					partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
869
					partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
869
					partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
870
				}
870
				}
871
			}
871
			}
Line 933... Line 933...
933
										"secondary target should be more than " + totalSecondaryPlan);
933
										"secondary target should be more than " + totalSecondaryPlan);
934
							}
934
							}
935
						}
935
						}
936
					}
936
					}
937
 
937
 
938
					if (psp.getCommitedTimestamp().isBefore(ptam.getSecondaryCommitmentDate().atStartOfDay())
938
					if ((LocalDate.now().atStartOfDay().equals(ptam.getSecondaryCommitmentDate().atStartOfDay())
-
 
939
							|| ptam.getSecondaryCommitmentDate().atStartOfDay().isAfter(LocalDate.now().atStartOfDay()))
939
							&& plan.getTargetPlan() == psp.getSecondaryPlan()) {
940
							&& plan.getTargetPlan() == psp.getSecondaryPlan()) {
940
						psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
941
						psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
941
						psp.setUpdatedTimestamp(LocalDateTime.now());
942
						psp.setUpdatedTimestamp(LocalDateTime.now());
942
					}
943
					}
943
 
944