From f246403a6acc614f2f3d91508bb2aa6a063c5629 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Mon, 7 Jul 2025 16:10:31 +0900 Subject: [PATCH] dbms_init...1 --- .../Admin/Customer/ClientController.php | 12 ---- .../Customer/ServicePaymentController.php | 3 - app/Helpers/CommonHelper.php | 3 + app/Helpers/Customer/ClientHelper.php | 1 + app/Helpers/Customer/ServicePaymentHelper.php | 16 ++--- app/Helpers/MyLogHelper.php | 8 +-- app/Views/admin/client/index.php | 62 ------------------- app/Views/admin/index.php | 5 +- app/Views/admin/payment/index.php | 61 ------------------ app/Views/admin/popup/index.php | 25 ++------ app/Views/admin/service/index.php | 14 +---- app/Views/admin/service/view.php | 49 +++++++-------- app/Views/templates/admin/index_footer.php | 4 +- app/Views/templates/admin/index_header.php | 22 +++---- 14 files changed, 59 insertions(+), 226 deletions(-) delete mode 100644 app/Views/admin/client/index.php delete mode 100644 app/Views/admin/payment/index.php diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index 6452bec..ac89200 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -36,18 +36,6 @@ class ClientController extends CustomerController } return $this->_helper; } - protected function getResultSuccess(string $message = MESSAGES["SUCCESS"], ?string $actionTemplate = null): RedirectResponse|string - { - switch ($this->getAction()) { - case 'index': - $result = parent::getResultSuccess($message, $this->request->getVar('ActionTemplate') ?? $actionTemplate ?? 'client'); - break; - default: - $result = parent::getResultSuccess($message, $actionTemplate); - break; - } - return $result; - } //Index,FieldForm관련 protected function setValidation(Validation $validation, string $field, string $rule): Validation { diff --git a/app/Controllers/Admin/Customer/ServicePaymentController.php b/app/Controllers/Admin/Customer/ServicePaymentController.php index 1eac86f..375b07f 100644 --- a/app/Controllers/Admin/Customer/ServicePaymentController.php +++ b/app/Controllers/Admin/Customer/ServicePaymentController.php @@ -71,9 +71,6 @@ class ServicePaymentController extends CustomerController } $result = view($view_file, ['viewDatas' => $this->getViewDatas()]); break; - case 'index': - $result = parent::getResultSuccess($message, $this->request->getVar('ActionTemplate') ?? $actionTemplate ?? 'payment'); - break; default: $result = parent::getResultSuccess($message, $actionTemplate); break; diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index bc52bee..6e21687 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -423,6 +423,9 @@ class CommonHelper // "onclick" => "return submitBatchJobDelete()" ]); break; + default: + $action = ""; + break; } return $action; } diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index 864b97e..38b8c00 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -73,6 +73,7 @@ class ClientHelper extends CustomerHelper case 'modify': $action = !$this->getMyAuth()->isAccessRole(['security']) ? $viewDatas['cnt'] : parent::getListButton($action, $label, $viewDatas, $extras); break; + case 'create': case 'delete': case 'batchjob': case 'batchjob_delete': diff --git a/app/Helpers/Customer/ServicePaymentHelper.php b/app/Helpers/Customer/ServicePaymentHelper.php index 4c9dc92..2cc38d6 100644 --- a/app/Helpers/Customer/ServicePaymentHelper.php +++ b/app/Helpers/Customer/ServicePaymentHelper.php @@ -38,20 +38,20 @@ class ServicePaymentHelper extends CustomerHelper public function getListButton(string $action, string $label, array $viewDatas, array $extras = []): string { switch ($action) { + case 'create': + case 'batchjob': + case 'batchjob_delete': + $action = ""; + break; + case 'delete': + $action = $viewDatas['entity']->getStatus() !== DEFAULTS['STATUS'] ? "" : parent::getListButton($action, $label, $viewDatas, $extras); + break; case 'invoice': $action = form_submit($action . "_submit", '청구서 발행', [ "formaction" => current_url() . '/' . $action, "class" => "btn btn-outline btn-primary", - // "onclick" => "return submitBatchJob()" ]); break; - case 'delete': - if ($viewDatas['entity']->getStatus() !== DEFAULTS['STATUS']) { - $action = ""; - } else { - $action = parent::getListButton($action, $label, $viewDatas, $extras); - } - break; default: $action = parent::getListButton($action, $label, $viewDatas, $extras); break; diff --git a/app/Helpers/MyLogHelper.php b/app/Helpers/MyLogHelper.php index 0194b2f..2a421af 100644 --- a/app/Helpers/MyLogHelper.php +++ b/app/Helpers/MyLogHelper.php @@ -36,18 +36,12 @@ class MyLogHelper extends CommonHelper public function getListButton(string $action, string $label, array $viewDatas, array $extras = []): string { switch ($action) { - case 'create': - $action = ""; - break; case 'modify': $action = $viewDatas['cnt']; break; + case 'create': case 'delete': - $action = ""; - break; case 'batchjob': - $action = ""; - break; case 'batchjob_delete': $action = ""; break; diff --git a/app/Views/admin/client/index.php b/app/Views/admin/client/index.php deleted file mode 100644 index 1a22636..0000000 --- a/app/Views/admin/client/index.php +++ /dev/null @@ -1,62 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -section('content') ?> -alert($error) ?> -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
- - - - - - -
- - include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?> - - - -
include("templates/{$viewDatas['layout']}/index_header"); ?>
-
- -
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - - - - - - - - - - - getListRowColor($entity) ?>> - - - - - - - - - - -
번호getListLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>작업
getListButton('modify', '', $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> - getListButton('view', '', $viewDatas) ?>  - getListButton('history', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> - -
-
-
include("templates/{$viewDatas['layout']}/index_footer"); ?>
- -
- -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index 54b9e2c..2f692a3 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -12,7 +12,7 @@ -
include("templates/{$viewDatas['layout']}/index_header"); ?>
+
include("templates/{$viewDatas['layout']}/index_header"); ?>
@@ -40,6 +40,7 @@ getListButton('view', '', $viewDatas) ?>  + getListButton('history', '', $viewDatas) ?>  getListButton('delete', '', $viewDatas) ?> @@ -51,7 +52,7 @@
-
include("templates/{$viewDatas['layout']}/index_footer"); ?>
+
include("templates/{$viewDatas['layout']}/index_footer"); ?>
diff --git a/app/Views/admin/payment/index.php b/app/Views/admin/payment/index.php deleted file mode 100644 index 54b9e2c..0000000 --- a/app/Views/admin/payment/index.php +++ /dev/null @@ -1,61 +0,0 @@ -extend(LAYOUTS[$viewDatas['layout']]['path']) ?> -section('content') ?> -alert($error) ?> -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
- - - - - - -
- - include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?> - - - -
include("templates/{$viewDatas['layout']}/index_header"); ?>
-
- -
- include("templates/{$viewDatas['layout']}/index_content_top"); ?> - 'batchjob_form', 'method' => "post"]) ?> - - - - - - - - - - - - - - - getListRowColor($entity) ?>> - - - - - - - - - - -
번호getListLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>작업
getListButton('modify', '', $viewDatas) ?>getFieldView($field, $entity->$field, $viewDatas) ?> - getListButton('view', '', $viewDatas) ?>  - getListButton('delete', '', $viewDatas) ?> -
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> - -
-
-
include("templates/{$viewDatas['layout']}/index_footer"); ?>
- -
- -
include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/popup/index.php b/app/Views/admin/popup/index.php index 6c5d80f..65233e8 100644 --- a/app/Views/admin/popup/index.php +++ b/app/Views/admin/popup/index.php @@ -5,24 +5,7 @@
- "get"]) ?> - - + include("templates/{$viewDatas['layout']}/index_content_top"); ?> 'batchjob_form', 'method' => "post"]) ?> @@ -53,9 +36,11 @@
- include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> +
- +
include("templates/common/" . (isset($viewDatas['modal_type']) ? $viewDatas['modal_type'] : 'modal_iframe')); ?>
+ + endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/service/index.php b/app/Views/admin/service/index.php index 30c6182..7b92d1b 100644 --- a/app/Views/admin/service/index.php +++ b/app/Views/admin/service/index.php @@ -47,16 +47,8 @@ - - $label): ?> - - - - - $label): ?> - - - + $label): ?> + $label): ?>
getFieldLabel($item_type, $label, $viewDatas) ?>
getFieldView($item_type, $entity->$item_type, $viewDatas) ?>
getFieldLabel($item_type, $label, $viewDatas) ?>
getFieldView($item_type, $entity->$item_type, $viewDatas) ?>
@@ -67,8 +59,6 @@ include("templates/{$viewDatas['layout']}/index_content_bottom"); ?> -
include("templates/common/" . (isset($viewDatas['modal_type']) ? $viewDatas['modal_type'] : 'modal_iframe')); ?>
-
include("templates/{$viewDatas['layout']}/index_footer"); ?>
diff --git a/app/Views/admin/service/view.php b/app/Views/admin/service/view.php index 3a9981d..15e165d 100644 --- a/app/Views/admin/service/view.php +++ b/app/Views/admin/service/view.php @@ -1,32 +1,29 @@ extend(LAYOUTS[$viewDatas['layout']]['path']) ?> section('content') ?> alert($error) ?> -
- -
- - - - - - - - - - - - - -
getFieldLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>getFieldView($field, $viewDatas['entity']->$field, $viewDatas) ?> - - $label): ?> - - - - - -
getFieldLabel($item_type, $label, $viewDatas) ?>getFieldView($item_type, $viewDatas['entity']->$item_type, $viewDatas) ?>
-
+
+ +
+
+ + + + + + + +
getFieldLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>getFieldView($field, $viewDatas['entity']->$field, $viewDatas) ?>
+
+
+ + $label): ?> + + + + + +
getFieldLabel($item_type, $label, $viewDatas) ?>getFieldView($item_type, $viewDatas['entity']->$item_type, $viewDatas) ?>
+
endSection() ?> \ No newline at end of file diff --git a/app/Views/templates/admin/index_footer.php b/app/Views/templates/admin/index_footer.php index 09ceb94..9bdf1f1 100644 --- a/app/Views/templates/admin/index_footer.php +++ b/app/Views/templates/admin/index_footer.php @@ -1,2 +1,2 @@ -
include("templates/common/" . (isset($viewDatas['modal_type']) ? $viewDatas['modal_type'] : 'modal_iframe')); ?>
- \ No newline at end of file +
include("templates/common/" . (isset($viewDatas['modal_type']) ? $viewDatas['modal_type'] : 'modal_iframe')); ?>
+ \ No newline at end of file diff --git a/app/Views/templates/admin/index_header.php b/app/Views/templates/admin/index_header.php index 2738732..9a5153d 100644 --- a/app/Views/templates/admin/index_header.php +++ b/app/Views/templates/admin/index_header.php @@ -1,11 +1,11 @@ -
    -
  • - -

         

    -     -
    • -
  • - Cloudflare DNS -
    • -
- include("templates/{$viewDatas['layout']}/index_header/dns"); ?> \ No newline at end of file +
    +
  • + +

         

    +     +
    • +
  • + Cloudflare DNS +
    • +
+include("templates/{$viewDatas['layout']}/index_header/dns"); ?> \ No newline at end of file