From 06776fdc51130aa39f45b2ceb664cca2aec0197a Mon Sep 17 00:00:00 2001
From: Preyea Regmi <preyearegmi@outlook.com>
Date: Tue, 3 Sep 2019 18:26:36 +0900
Subject: [PATCH] Validation rule added for optional

---
 .../dynamicvalidation/ValidationRuleModel.java               | 5 ++++-
 .../recipientaddeditV3/RecipientDetailValidatorV3.java       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java
index 9d5718ce..b69a4a55 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/model/recipientaddeditV3/dynamicvalidation/ValidationRuleModel.java
@@ -58,7 +58,10 @@ public class ValidationRuleModel {
     }
 
     public Boolean isFieldRequired() {
-        return "M".equalsIgnoreCase(fieldRequired);
+        return "M".equalsIgnoreCase(fieldRequired)||isOptional();
+    }
+    public Boolean isOptional() {
+        return "O".equalsIgnoreCase(fieldRequired);
     }
 
     public void setFieldRequired(String fieldRequired) {
diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
index 6a2b1749..fb545bd9 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV3/presenter/recipientaddeditV3/RecipientDetailValidatorV3.java
@@ -649,7 +649,7 @@ public class RecipientDetailValidatorV3 {
                         EditTextConfigurationFactory.getKeyboardTypeFromKeyword(rule.getKeyboardType(), rule.isLocalKeyboardAllowed(),
                                 rule.getMaxFieldLengthInt()));
                 if (isFieldRequired) {
-                    if (checkStringNotEmpty(recipientInfo.getMiddleName()))
+                    if (checkStringNotEmpty(recipientInfo.getMiddleName())||rule.isOptional())
                         rule.updateValidity(true);
                     validationRuleModelMap.put(FIELD_MIDDLE_NAME, rule);
                 } else {