Merge branch 'i601-create-cashier-teller-end-date' into develop

2018-02-06 21:45:03 +05:30
parent 8e7bd01ed4 e13616b0e9
commit 8ac5485544
1 changed files with 3 additions and 2 deletions
@@ -95,8 +95,9 @@ public class CashierTransactionDataValidator {
 		 */
 		if (fromDate.isBefore(tellerFromDate)
 				|| endDate.isBefore(tellerFromDate)
-				|| (tellerEndDate != null && fromDate.isAfter(tellerEndDate) || endDate
-						.isAfter(tellerEndDate))) {
+				|| (tellerEndDate != null &&
+            (fromDate.isAfter(tellerEndDate)
+              || endDate.isAfter(tellerEndDate)))) {
 			throw new CashierDateRangeOutOfTellerDateRangeException();
 		}
 		/**