diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 36c8c43..9a86fa0 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -302,6 +302,7 @@ define('LAYOUTS', [
'javascripts' => [
'',
],
+ 'footerScripts' => []
],
'front' => [
'title' => KEYWORD,
@@ -333,6 +334,7 @@ define('LAYOUTS', [
'',
'',
],
+ 'footerScripts' => []
],
'admin' => [
'title' => '관리자화면',
@@ -368,6 +370,7 @@ define('LAYOUTS', [
'',
''
],
+ 'footerScripts' => []
],
]);
diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php
index b42833d..7b891e7 100644
--- a/app/Controllers/Admin/Customer/ServiceController.php
+++ b/app/Controllers/Admin/Customer/ServiceController.php
@@ -2,7 +2,6 @@
namespace App\Controllers\Admin\Customer;
-use App\Entities\Customer\ServiceEntity;
use CodeIgniter\HTTP\RedirectResponse;
use CodeIgniter\HTTP\RequestInterface;
use CodeIgniter\HTTP\ResponseInterface;
@@ -16,8 +15,9 @@ class ServiceController extends CustomerController
if ($this->service === null) {
$this->service = service('customer_serviceservice');
}
- $this->addActionPaths('service');
- $this->layouts['javascripts'][] = '';
+ $this->addActionPaths(path: 'service');
+ $this->layouts['footerScripts'][] = '';
+ $this->layouts['footerScripts'][] = '';
}
//기본 함수 작업
//Custom 추가 함수
diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php
index d5a8e52..c424bb7 100644
--- a/app/Controllers/Admin/Equipment/ServerController.php
+++ b/app/Controllers/Admin/Equipment/ServerController.php
@@ -17,7 +17,7 @@ class ServerController extends EquipmentController
$this->service = service('equipment_serverservice');
}
$this->addActionPaths('server');
- $this->layouts['javascripts'][] = '';
+ $this->layouts['footerScripts'][] = '';
}
//기본 함수 작업
//Custom 추가 함수
diff --git a/app/Forms/Customer/ServiceForm.php b/app/Forms/Customer/ServiceForm.php
index c93a979..fb76489 100644
--- a/app/Forms/Customer/ServiceForm.php
+++ b/app/Forms/Customer/ServiceForm.php
@@ -52,8 +52,12 @@ class ServiceForm extends CustomerForm
switch ($field) {
case 'serverinfo_uid':
foreach ($this->getFormOption_process(service('equipment_serverservice'), $action, $field, $formDatas) as $tempEntity) {
- $tempOptions[$tempEntity->getPK()] = $tempEntity->getCustomTitle();
- // $options['attributes'][$tempEntity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $tempEntity->getRole())];
+ $tempOptions[$tempEntity->getPK()] = [
+ 'value' => $tempEntity->getPK(),
+ 'text' => $tempEntity->getTitle(),
+ 'data-title' => $tempEntity->getTitle(),
+ 'data-price' => $tempEntity->getPrice()
+ ];
}
$options['options'] = $tempOptions;
break;
diff --git a/app/Forms/Equipment/ServerPartForm.php b/app/Forms/Equipment/ServerPartForm.php
index 3ce71c5..be973db 100644
--- a/app/Forms/Equipment/ServerPartForm.php
+++ b/app/Forms/Equipment/ServerPartForm.php
@@ -51,8 +51,12 @@ class ServerPartForm extends EquipmentForm
$partService = $this->getPartService($type);
$tempOptions[$type] = [lang("{$this->getAttribute('class_path')}.TYPE.{$type}") . " 선택"];
foreach ($this->getFormOption_process($partService, $action, $field, $formDatas) as $tempEntity) {
- $tempOptions[$type][$tempEntity->getPK()] = $tempEntity->getTitle();
- // $options['attributes'][$type][$tempEntity->getPK()] = ['data-role' => implode(DEFAULTS['DELIMITER_ROLE'], $tempEntity->getRole())];
+ $tempOptions[$type][$tempEntity->getPK()] = [
+ 'value' => $tempEntity->getPK(),
+ 'text' => $tempEntity->getTitle(),
+ 'data-title' => $tempEntity->getTitle(),
+ 'data-price' => $tempEntity->getPrice()
+ ];
}
}
$options['options'] = $tempOptions;
diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php
index c4288a8..3f2133f 100644
--- a/app/Helpers/CommonHelper.php
+++ b/app/Helpers/CommonHelper.php
@@ -47,8 +47,12 @@ abstract class CommonHelper
* @param string $extra