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 @@
-= $this->extend(LAYOUTS[$viewDatas['layout']]['path']) ?>
-= $this->section('content') ?>
-alert($error) ?>
-
= $this->include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
-
-
-
-
-
- = $this->include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?>
-
-
-
-
-
-
-
-
- = $this->include("templates/{$viewDatas['layout']}/index_content_top"); ?>
- = form_open(current_url(), ['id' => 'batchjob_form', 'method' => "post"]) ?>
-
-
-
- 번호
-
- = $viewDatas['helper']->getListLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>
-
- 작업
-
-
-
-
-
-
- getListRowColor($entity) ?>>
-
- = $viewDatas['helper']->getListButton('modify', '', $viewDatas) ?>
-
- = $viewDatas['helper']->getFieldView($field, $entity->$field, $viewDatas) ?>
-
-
- = $viewDatas['helper']->getListButton('view', '', $viewDatas) ?>
- = $viewDatas['helper']->getListButton('history', '', $viewDatas) ?>
- = $viewDatas['helper']->getListButton('delete', '', $viewDatas) ?>
-
-
-
-
-
-
- = $this->include("templates/{$viewDatas['layout']}/index_content_bottom"); ?>
- = form_close() ?>
-
-
-
-
-
-
-
-
-= $this->include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-= $this->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 @@
-
+
@@ -40,6 +40,7 @@
= $viewDatas['helper']->getListButton('view', '', $viewDatas) ?>
+ = $viewDatas['helper']->getListButton('history', '', $viewDatas) ?>
= $viewDatas['helper']->getListButton('delete', '', $viewDatas) ?>
@@ -51,7 +52,7 @@
= form_close() ?>
-
+
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 @@
-= $this->extend(LAYOUTS[$viewDatas['layout']]['path']) ?>
-= $this->section('content') ?>
-alert($error) ?>
-= $this->include(LAYOUTS[$viewDatas['layout']]['path'] . '/top'); ?>
-
-
-
-
-
- = $this->include(LAYOUTS[$viewDatas['layout']]['path'] . '/left_menu'); ?>
-
-
-
-
-
-
-
-
- = $this->include("templates/{$viewDatas['layout']}/index_content_top"); ?>
- = form_open(current_url(), ['id' => 'batchjob_form', 'method' => "post"]) ?>
-
-
-
- 번호
-
- = $viewDatas['helper']->getListLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>
-
- 작업
-
-
-
-
-
-
- getListRowColor($entity) ?>>
-
- = $viewDatas['helper']->getListButton('modify', '', $viewDatas) ?>
-
- = $viewDatas['helper']->getFieldView($field, $entity->$field, $viewDatas) ?>
-
-
- = $viewDatas['helper']->getListButton('view', '', $viewDatas) ?>
- = $viewDatas['helper']->getListButton('delete', '', $viewDatas) ?>
-
-
-
-
-
-
- = $this->include("templates/{$viewDatas['layout']}/index_content_bottom"); ?>
- = form_close() ?>
-
-
-
-
-
-
-
-
-= $this->include(LAYOUTS[$viewDatas['layout']]['path'] . '/bottom'); ?>
-= $this->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 @@
- = form_open(current_url(), ["method" => "get"]) ?>
-
-
-
- 조건:
-
- = $viewDatas['helper']->getFieldForm($field, $viewDatas[$field] ? $viewDatas[$field] : old($field), $viewDatas, ['index_content_top_filter' => 'true']) ?>
-
- 검색
-
-
- Page:= $viewDatas['page'] ?>/= $viewDatas['total_page'] ?>
- = form_dropdown('per_page', $viewDatas['page_options'], $viewDatas['per_page'], ['onChange' => 'this.form.submit()']) ?>
- / 총:= $viewDatas['total_count'] ?>
-
-
-
- = form_close() ?>
+ = $this->include("templates/{$viewDatas['layout']}/index_content_top"); ?>
= form_open(current_url(), ['id' => 'batchjob_form', 'method' => "post"]) ?>
- = form_close() ?>
= $this->include("templates/{$viewDatas['layout']}/index_content_bottom"); ?>
+ = form_close() ?>
-
+= $this->include("templates/common/" . (isset($viewDatas['modal_type']) ? $viewDatas['modal_type'] : 'modal_iframe')); ?>
+
+
= $this->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): ?>
- = $viewDatas['helper']->getFieldLabel($item_type, $label, $viewDatas) ?>
-
-
-
- $label): ?>
- = $viewDatas['helper']->getFieldView($item_type, $entity->$item_type, $viewDatas) ?>
-
-
+ $label): ?>= $viewDatas['helper']->getFieldLabel($item_type, $label, $viewDatas) ?>
+ $label): ?>= $viewDatas['helper']->getFieldView($item_type, $entity->$item_type, $viewDatas) ?>
@@ -67,8 +59,6 @@
= $this->include("templates/{$viewDatas['layout']}/index_content_bottom"); ?>
= form_close() ?>
- = $this->include("templates/common/" . (isset($viewDatas['modal_type']) ? $viewDatas['modal_type'] : 'modal_iframe')); ?>
-
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 @@
= $this->extend(LAYOUTS[$viewDatas['layout']]['path']) ?>
= $this->section('content') ?>
alert($error) ?>
-