Fix a logic check bug if value not in form param (JhumanJ#70)

* Fix a logic check bug if value not in form param * Fix isEmpty condition checker
ocestari · Jan 13, 2023 · 1d3541f · 1d3541f
1 parent ee6956a
commit 1d3541f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Service/Forms/FormLogicConditionChecker.php b/app/Service/Forms/FormLogicConditionChecker.php
@@ -23,7 +23,7 @@ private function conditionsAreMet(?array $conditions, array $formData): bool {
 
         // If it's not a group, just a single condition
         if (!isset($conditions['operatorIdentifier'])) {
-            return $this->propertyConditionMet($conditions['value'], $formData[$conditions['value']['property_meta']['id']]);
+            return $this->propertyConditionMet($conditions['value'], $formData[$conditions['value']['property_meta']['id']] ?? null);
         }
 
         if ($conditions['operatorIdentifier'] === 'and') {
@@ -102,7 +102,7 @@ private function checkIsEmpty ($condition, $fieldValue): bool {
         if(is_array($fieldValue)){
             return count($fieldValue) === 0;
         }
-        return (!$fieldValue || $fieldValue !== '' || $fieldValue !== null);
+        return $fieldValue == '' || $fieldValue == null || !$fieldValue;
     }
 
     private function checkGreaterThan ($condition, $fieldValue): bool {