diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index 4817b94..00f32f7 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -49,6 +49,7 @@ class ServiceController extends CustomerController { switch ($this->getAction()) { case 'index': + $this->control = $this->_control; $this->getHelper()->setViewDatas($this->getViewDatas()); $result = view($this->view_path . 'service' . DIRECTORY_SEPARATOR . $this->getAction(), ['viewDatas' => $this->getViewDatas()]); break; diff --git a/app/Controllers/Admin/Customer/ServiceItemController.php b/app/Controllers/Admin/Customer/ServiceItemController.php index b6ad5fa..b207452 100644 --- a/app/Controllers/Admin/Customer/ServiceItemController.php +++ b/app/Controllers/Admin/Customer/ServiceItemController.php @@ -78,6 +78,7 @@ class ServiceItemController extends CustomerController { switch ($this->getAction()) { case 'index': + $this->control = $this->_control; $this->getHelper()->setViewDatas($this->getViewDatas()); $result = view($this->view_path . 'popup' . DIRECTORY_SEPARATOR . $this->getAction(), ['viewDatas' => $this->getViewDatas()]); break; diff --git a/app/Controllers/Auth/AuthController.php b/app/Controllers/Auth/AuthController.php index d4ab178..7267489 100644 --- a/app/Controllers/Auth/AuthController.php +++ b/app/Controllers/Auth/AuthController.php @@ -45,6 +45,18 @@ abstract class AuthController extends CommonController } return $result; } + protected function getResultSuccess(string $message = MESSAGES["SUCCESS"]): RedirectResponse|string + { + switch ($this->getAction()) { + case 'create': + $result = redirect()->to($this->getMyAuth()->popPreviousUrl())->with('error', $message); + break; + default: + $result = parent::getResultSuccess($message); + break; + } + return $result; + } //로그인화면 public function create_form_process(): void diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 6a0bff7..9f3f1a5 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -239,8 +239,11 @@ abstract class CommonController extends BaseController case 'login_form': case 'index': case 'view': - // $this->getHelper()->setViewDatas($this->getViewDatas()); - $result = view($this->view_path . $this->getAction(), ['viewDatas' => $this->getViewDatas()]); + $this->control = $this->_control; + $this->getHelper()->setViewDatas($this->getViewDatas()); + $result = view($this->view_path . $this->getAction(), [ + 'viewDatas' => $this->getViewDatas() + ]); break; default: $result = redirect()->to($this->getMyAuth()->popPreviousUrl())->with('error', $message); diff --git a/app/Helpers/AuthHelper.php b/app/Helpers/AuthHelper.php index 23ec2cb..f1c7647 100644 --- a/app/Helpers/AuthHelper.php +++ b/app/Helpers/AuthHelper.php @@ -15,8 +15,8 @@ class AuthHelper extends CommonHelper } public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { - $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } switch ($field) { case 'id': diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 3f324af..49cac52 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -199,7 +199,7 @@ class CommonHelper { switch ($field) { default: - $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "text-danger", "required" => "", ...$extras] : $extras; + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "text-danger", "required" => "", ...$extras] : $extras; $label = form_label(lang("{$viewDatas['class_path']}.label.{$field}"), $field, $extras); break; } @@ -209,8 +209,8 @@ class CommonHelper // header.php에서 getFieldForm_Helper사용 public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { - $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } switch ($field) { case 'email': @@ -221,19 +221,19 @@ class CommonHelper $form = form_input($field, $value ?? "", ["placeholder" => "예)010-0010-0010", ...$extras]); break; case 'role': - if (!is_array($viewDatas['field_options'][$field])) { + if (!is_array($viewDatas['control']['field_options'][$field])) { throw new \Exception(__METHOD__ . "에서 {$field}의 field_options가 array형태가 아닙니다."); } - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { $forms = []; - foreach ($viewDatas['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { $values = is_array($value) ? $value : explode(DEFAULTS["DELIMITER_ROLE"], $value); $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values)) . $label; } $form = implode(" ", $forms); } else { $formOptions = ["" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택']; - foreach ($viewDatas['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { $formOptions[$key] = $label; } $form = form_dropdown($field, $formOptions, $value, $extras); @@ -254,27 +254,27 @@ class CommonHelper $form = form_textarea($field, $value ?? "", ['id' => $field, 'class' => $extra_class, ...array_diff_key($extras, ['class' => ''])]); break; case 'status': - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { $forms = []; - foreach ($viewDatas['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { $forms[] = form_radio($label, $key, $key == $value) . $label; } $form = implode(" ", $forms); } else { $formOptions = ["" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택']; - foreach ($viewDatas['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { $formOptions[$key] = $label; } $form = form_dropdown($field, $formOptions, $value, $extras); } break; default: - if (in_array($field, $viewDatas['filter_fields'])) { - if (!is_array($viewDatas['field_options'][$field])) { + if (in_array($field, $viewDatas['control']['filter_fields'])) { + if (!is_array($viewDatas['control']['field_options'][$field])) { throw new \Exception(__METHOD__ . "에서 {$field}의 field_options가 array형태가 아닙니다."); } $formOptions = ["" => lang($viewDatas['class_path'] . '.label.' . $field) . ' 선택']; - foreach ($viewDatas['field_options'][$field] as $key => $label) { + foreach ($viewDatas['control']['field_options'][$field] as $key => $label) { $formOptions[$key] = $label; } $form = form_dropdown($field, $formOptions, $value, $extras); @@ -293,7 +293,7 @@ class CommonHelper case 'role': $roles = []; foreach (explode(DEFAULTS["DELIMITER_ROLE"], $value) as $key) { - $roles[] = $viewDatas['field_options'][$field][$key] ?? ""; + $roles[] = $viewDatas['control']['field_options'][$field][$key] ?? ""; } $value = implode(" , ", $roles); break; @@ -309,7 +309,7 @@ class CommonHelper $value = $value ? number_format($value) : ""; break; default: - if (in_array($field, $viewDatas['filter_fields'])) { + if (in_array($field, $viewDatas['control']['filter_fields'])) { $extras["onChange"] = sprintf( 'location.href="%s/toggle/%s/%s?%s="+this.options[this.selectedIndex].value', current_url(), diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index 9657d70..574d1dc 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -59,7 +59,7 @@ class ServiceHelper extends CustomerHelper case "DOMAIN": $temps = ["
    "]; foreach ($viewDatas['entity']->getItemEntities($field) as $itemEntity) { - $temps[] = "
  1. getView_Price() . "\">" . $viewDatas['field_options'][$field][$itemEntity->getItemUid()] . ' ' . $itemEntity->getView_BillingCycle() . ' ' . $itemEntity->getView_Sale() . "
  2. "; + $temps[] = "
  3. getView_Price() . "\">" . $viewDatas['control']['field_options'][$field][$itemEntity->getItemUid()] . ' ' . $itemEntity->getView_BillingCycle() . ' ' . $itemEntity->getView_Sale() . "
  4. "; } $temps[] = "
"; $value = implode("", $temps); diff --git a/app/Helpers/Customer/ServiceItemHelper.php b/app/Helpers/Customer/ServiceItemHelper.php index a314916..0fd514c 100644 --- a/app/Helpers/Customer/ServiceItemHelper.php +++ b/app/Helpers/Customer/ServiceItemHelper.php @@ -18,12 +18,12 @@ class ServiceItemHelper extends CustomerHelper public function getFieldFormByItemType(string $field, mixed $value, array $viewDatas, array $extras = []): string { $form = ""; - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { - $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } switch ($viewDatas['item_type']) { case 'DOMAIN': - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { $form = form_input($field, $value ?? "", ["placeholder" => "예)example.com", ...$extras]); } else { $form = parent::getFieldForm($field, $value, $viewDatas, $extras); @@ -37,8 +37,8 @@ class ServiceItemHelper extends CustomerHelper } public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { - $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } switch ($field) { case 'item_uid': diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php index b117ca1..1435598 100644 --- a/app/Helpers/UserHelper.php +++ b/app/Helpers/UserHelper.php @@ -15,8 +15,8 @@ class UserHelper extends CommonHelper } public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { - if (in_array($viewDatas['action'], ['create', 'modify', 'create_form', 'modify_form'])) { - $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; + if (in_array($viewDatas['control']['action'], ['create', 'modify', 'create_form', 'modify_form'])) { + $extras = (strpos($viewDatas['control']['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } switch ($field) { case 'passwd': diff --git a/app/Views/admin/create_form.php b/app/Views/admin/create_form.php index 6540f86..a2c9e3a 100644 --- a/app/Views/admin/create_form.php +++ b/app/Views/admin/create_form.php @@ -14,7 +14,7 @@
- + - + @@ -35,7 +35,7 @@ getListRowColor($entity) ?>> - +
getFieldLabel($field, $viewDatas) ?> diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index 6b57e30..aade0e1 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -22,7 +22,7 @@
번호 getListLabel($field, $viewDatas) ?> 작업
getListButton('modify', $viewDatas) ?> getFieldView($field, $viewDatas) ?> diff --git a/app/Views/admin/modify_form.php b/app/Views/admin/modify_form.php index c642811..1cda426 100644 --- a/app/Views/admin/modify_form.php +++ b/app/Views/admin/modify_form.php @@ -14,7 +14,7 @@ 'action_form', ...$viewDatas['forms']['attributes']], $viewDatas['forms']['hiddens']) ?>
- + - + @@ -24,7 +24,7 @@ getListRowColor($entity) ?>> - + diff --git a/app/Views/admin/service/index.php b/app/Views/admin/service/index.php index fcbffa9..1551d52 100644 --- a/app/Views/admin/service/index.php +++ b/app/Views/admin/service/index.php @@ -22,7 +22,7 @@ - + @@ -35,7 +35,7 @@ getListRowColor($entity) ?>> - +
getFieldLabel($field, $viewDatas) ?> diff --git a/app/Views/admin/popup/index.php b/app/Views/admin/popup/index.php index aa86816..492d65f 100644 --- a/app/Views/admin/popup/index.php +++ b/app/Views/admin/popup/index.php @@ -11,7 +11,7 @@
번호 getListLabel($field, $viewDatas) ?> 작업
getListButton('modify', $viewDatas) ?> getFieldView($field, $viewDatas) ?> getListButton('delete', $viewDatas) ?>
번호 getListLabel($field, $viewDatas) ?> 작업
getListButton('modify', $viewDatas) ?> getFieldView($field, $viewDatas) ?> diff --git a/app/Views/admin/view.php b/app/Views/admin/view.php index 2d923d1..948e427 100644 --- a/app/Views/admin/view.php +++ b/app/Views/admin/view.php @@ -5,7 +5,7 @@
- + diff --git a/app/Views/templates/admin/index_content_bottom.php b/app/Views/templates/admin/index_content_bottom.php index 8056b29..e96c00d 100644 --- a/app/Views/templates/admin/index_content_bottom.php +++ b/app/Views/templates/admin/index_content_bottom.php @@ -1,7 +1,7 @@
getFieldLabel($field, $viewDatas) ?> getFieldView($field, $viewDatas) ?>