diff --git a/app/Controllers/Admin/Customer/AccountController.php b/app/Controllers/Admin/Customer/AccountController.php index d3c8483..ab83002 100644 --- a/app/Controllers/Admin/Customer/AccountController.php +++ b/app/Controllers/Admin/Customer/AccountController.php @@ -7,6 +7,7 @@ use App\Entities\Customer\ClientEntity; use App\Helpers\Customer\AccountHelper; use App\Services\Customer\AccountService; +use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; @@ -37,7 +38,6 @@ class AccountController extends CustomerController return $this->_helper; } //Index,FieldForm관련. - private function setAccountBalance(array $formDatas): ClientEntity { //account_balance 체크 diff --git a/app/Controllers/Admin/Customer/CouponController.php b/app/Controllers/Admin/Customer/CouponController.php index 1e09e6f..4df6c78 100644 --- a/app/Controllers/Admin/Customer/CouponController.php +++ b/app/Controllers/Admin/Customer/CouponController.php @@ -7,6 +7,7 @@ use App\Entities\Customer\CouponEntity; use App\Helpers\Customer\CouponHelper; use App\Services\Customer\CouponService; +use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; diff --git a/app/Controllers/Admin/Customer/PointController.php b/app/Controllers/Admin/Customer/PointController.php index 5249871..6ef6ab2 100644 --- a/app/Controllers/Admin/Customer/PointController.php +++ b/app/Controllers/Admin/Customer/PointController.php @@ -7,6 +7,7 @@ use App\Entities\Customer\PointEntity; use App\Helpers\Customer\PointHelper; use App\Services\Customer\PointService; +use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\RequestInterface; use CodeIgniter\HTTP\ResponseInterface; use Psr\Log\LoggerInterface; diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index 4456230..535edc9 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -96,7 +96,7 @@ class ServiceController extends CustomerController { switch ($this->getAction()) { case 'index': - $result = parent::getResultSuccess($message, $this->request->getVar('ActionTemplate') ?? 'service'); + $result = parent::getResultSuccess($message, $this->request->getVar('ActionTemplate') ?? $actionTemplate ?? 'service'); break; default: $result = parent::getResultSuccess($message, $actionTemplate); diff --git a/app/Controllers/Admin/Customer/ServiceHistoryController.php b/app/Controllers/Admin/Customer/ServiceHistoryController.php index 12fede2..3baa999 100644 --- a/app/Controllers/Admin/Customer/ServiceHistoryController.php +++ b/app/Controllers/Admin/Customer/ServiceHistoryController.php @@ -65,7 +65,7 @@ class ServiceHistoryController extends CustomerController { switch ($this->getAction()) { case 'index': - $result = parent::getResultSuccess($message, $this->request->getVar('ActionTemplate') ?? 'popup'); + $result = parent::getResultSuccess($message, $this->request->getVar('ActionTemplate') ?? $actionTemplate ?? 'popup'); break; default: $result = parent::getResultSuccess($message, $actionTemplate); diff --git a/app/Controllers/Admin/Customer/ServiceItemController.php b/app/Controllers/Admin/Customer/ServiceItemController.php index 74fce87..10204e2 100644 --- a/app/Controllers/Admin/Customer/ServiceItemController.php +++ b/app/Controllers/Admin/Customer/ServiceItemController.php @@ -46,7 +46,6 @@ class ServiceItemController extends CustomerController } return $this->_serviceService; } - protected function getFormFieldOption(string $field, array $options = []): array { switch ($field) { @@ -71,6 +70,19 @@ class ServiceItemController extends CustomerController } return $options; } + 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 ?? 'popup'); + break; + default: + $result = parent::getResultSuccess($message, $actionTemplate); + break; + } + return $result; + } + //Index,FieldForm관련 protected function create_process(array $formDatas): mixed { diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index ba73f57..608392c 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -31,7 +31,7 @@ class ServiceHelper extends CustomerHelper ICONS['SETUP'], $field, [ - "data-src" => "/admin/customer/serviceitem?serviceinfo_uid={$viewDatas['entity']->getPK()}&item_type={$field}&ActionTemplate=popup", + "data-src" => "/admin/customer/serviceitem?serviceinfo_uid={$viewDatas['entity']->getPK()}&item_type={$field}", "data-bs-toggle" => "modal", "data-bs-target" => "#index_action_form", ...$extras