Merge branch 'develop'

tastyigniter · Feb 10, 2022 · eecb89f · eecb89f
2 parents 3cb5c05 + 1da4091
commit eecb89f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/admin/controllers/Payments.php b/app/admin/controllers/Payments.php
@@ -166,7 +166,7 @@ public function formValidate($model, $form)
             if ($mergeRules = $form->model->getConfigRules())
                 array_push($rules, ...$mergeRules);
 
-            if ($mergeAttributes = $form->model->getConfigAttributes())
+            if ($mergeAttributes = $form->model->getConfigValidationAttributes())
                 array_push($attributes, ...$mergeAttributes);
         }
 

diff --git a/app/system/console/commands/IgniterInstall.php b/app/system/console/commands/IgniterInstall.php
@@ -187,7 +187,7 @@ protected function createSuperUser()
             'super_user' => TRUE,
             'groups' => [Staff_groups_model::first()->staff_group_id],
             'locations' => [Locations_model::first()->location_id],
-        ]);
+        ], TRUE);
 
         $this->line('Admin user '.$user->username.' created!');
     }