Fix #9601 - Fix bug where report conditions parenthesis pairs would n…

…ot save correctly.
salesagility · Jun 22, 2023 · 558c1a1 · 558c1a1
1 parent de449e6
commit 558c1a1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/modules/AOR_Conditions/AOR_Condition.php b/modules/AOR_Conditions/AOR_Condition.php
@@ -122,11 +122,11 @@ public function save_lines($post_data, $parent, $key = '')
                                 }
                             }
                         }
-                        if ($field_name == 'parenthesis' && $post_data[$key . $field_name][$i] == 'END') {
-                            if (!isset($lastParenthesisStartConditionId)) {
+                        if ($field_name === 'parenthesis' && $post_data[$key . $field_name][$i] !== 'START') {
+                            if (!isset($lastParenthesisStartConditionIds)) {
                                 throw new Exception('a closure parenthesis has no starter pair');
                             }
-                            $condition->parenthesis = $lastParenthesisStartConditionId;
+                            $condition->parenthesis = array_pop($lastParenthesisStartConditionIds);
                         } else {
                             $condition->$field_name = $post_data[$key . $field_name][$i];
                         }
@@ -149,8 +149,8 @@ public function save_lines($post_data, $parent, $key = '')
                     }
                     $condition->aor_report_id = $parent->id;
                     $conditionId = $condition->save();
-                    if ($condition->parenthesis == 'START') {
-                        $lastParenthesisStartConditionId = $conditionId;
+                    if ($condition->parenthesis === 'START') {
+                        $lastParenthesisStartConditionIds[] = $conditionId;
                     }
                 }
             }