diff --git a/app/Controllers/Admin/Customer/PaymentController.php b/app/Controllers/Admin/Customer/PaymentController.php
index 70a5a0a..c3487c6 100644
--- a/app/Controllers/Admin/Customer/PaymentController.php
+++ b/app/Controllers/Admin/Customer/PaymentController.php
@@ -108,9 +108,9 @@ class PaymentController extends CustomerController
LogCollector::debug(__METHOD__ . "에서 {$uid}에 대한 결제정보를 찾을수 없습니다.");
}
//entities에 고객 설정
- $clientEntity = $this->getClientService()->getEntity($entity->getClientCode());
+ $clientEntity = $this->getClientService()->getEntity($entity->getCode());
if (!$clientEntity) {
- LogCollector::debug(__METHOD__ . "에서 {$entity->getClientCode()}에 대한 고객정보를 찾을수 없습니다.");
+ LogCollector::debug(__METHOD__ . "에서 {$entity->getCode()}에 대한 고객정보를 찾을수 없습니다.");
}
if (!array_key_exists($clientEntity->getPK(), $entities)) {
$entities[$clientEntity->getPK()] = $this->getOwnersForInvoice($clientEntity);
@@ -136,10 +136,10 @@ class PaymentController extends CustomerController
public function invoice(): RedirectResponse|string
{
try {
- //각 Field 초기화
$this->setAction(__FUNCTION__);
- //각 Field 초기화
- $this->initAction($this->getService()->getFormFields());
+ $this->setFormFields();
+ $this->setFormFilters();
+ $this->setFormRules();
$this->invoice_process();
return $this->getResultSuccess();
} catch (\Exception $e) {
diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php
index fb25394..f78f601 100644
--- a/app/Controllers/Admin/Home.php
+++ b/app/Controllers/Admin/Home.php
@@ -69,6 +69,9 @@ class Home extends AdminController
public function index(): RedirectResponse|string
{
$this->setAction(__FUNCTION__);
+ $this->setFormFields();
+ $this->setFormFilters();
+ $this->setFormRules();
//Total 서버 현황
$this->totalCounts = $this->getService()->getTotalCountsByType();
//interval을 기준으로 최근 신규 서비스정보 가져오기
diff --git a/app/Entities/Customer/PaymentEntity.php b/app/Entities/Customer/PaymentEntity.php
index 9684cec..92bc09f 100644
--- a/app/Entities/Customer/PaymentEntity.php
+++ b/app/Entities/Customer/PaymentEntity.php
@@ -10,20 +10,6 @@ class PaymentEntity extends CustomerEntity
const PK = PaymentModel::PK;
const TITLE = PaymentModel::TITLE;
const DEFAULT_STATUS = STATUS['UNPAID'];
- //관리자정보객체
- final public function getUserUID(): int
- {
- return $this->attributes['user_uid'];
- }
- final public function getClientCode(): int
- {
- return $this->attributes['clientinfo_uid'];
- }
- final public function getServiceCode(): int
- {
- return $this->attributes['serviceinfo_uid'];
- }
- //타 객체정의 부분
public function getItemType(): string
{
return $this->attributes['item_type'];
diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php
index 62152f8..c76083d 100644
--- a/app/Helpers/CommonHelper.php
+++ b/app/Helpers/CommonHelper.php
@@ -226,7 +226,7 @@ class CommonHelper
// echo "{$field}->{$value}";
foreach ($viewDatas['control']['field_optons'][$field] as $key => $entity) {
$isSelected = $key == $value ? ' selected' : '';
- $isDisabled = $viewDatas['control']['action'] === 'index' && $entity->getStatus() !== $entity::DEFAULT_STATUS ? ' disabled' : '';
+ $isDisabled = $viewDatas['control']['action'] === 'index' && $entity->getStatus() !== $entity::DEFAULT_STATUS ? ' readonly' : '';
$html .= sprintf("", $key, $isSelected, $isDisabled, array_key_exists('isForm', $extras) ? $entity->getFormTitle() : $entity->getTitle());
}
$html .= '';
diff --git a/app/Helpers/HomeHelper.php b/app/Helpers/HomeHelper.php
index 11ab65e..ed516ff 100644
--- a/app/Helpers/HomeHelper.php
+++ b/app/Helpers/HomeHelper.php
@@ -15,46 +15,14 @@ class HomeHelper extends CommonHelper
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
{
switch ($field) {
- case 'item_uid':
- $value = $viewDatas['control']['field_optons'][$viewDatas['entity']->getItemType()][$value]->getTitle();
- break;
case 'type':
- // echo $value;
- // dd($viewDatas['control']['field_optons'][$field]);
$value = $viewDatas['control']['field_optons'][$field][$value]->getTitle();
break;
case 'amount':
$value = number_format($value) . "원";
break;
- case 'status':
- $value = parent::getFieldView($field, $value, $viewDatas, $extras);
- break;
- case "LINE":
- case "IP":
- case "SERVER":
- case "CPU":
- case "RAM":
- case "STORAGE":
- case "SOFTWARE":
- case "DEFENCE":
- case "DOMAIN":
- // if ($field == 'DEFENCE') {
- // dd($viewDatas['entity']->getItemEntities($field));
- // }
- $temps = [];
- foreach ($viewDatas['entity']->getItemEntities($field) as $itemEntity) {
- $temps[] = $viewDatas['control']['field_optons'][$field][$itemEntity->getItemUid()]->getTitle();
- }
- $value = implode("
", $temps);
- break;
default:
- if (in_array($field, $viewDatas['control']['actionFilters'])) {
- if (array_key_exists($value, $viewDatas['control']['field_optons'][$field])) {
- $value = $viewDatas['control']['field_optons'][$field][$value]->getTitle();
- } else {
- $value = "";
- }
- }
+ $value = parent::getFieldView($field, $value, $viewDatas, $extras);
break;
}
if (is_array($value)) {
diff --git a/app/Views/admin/welcome/new.php b/app/Views/admin/welcome/new.php
index b36d0cc..ec107c1 100644
--- a/app/Views/admin/welcome/new.php
+++ b/app/Views/admin/welcome/new.php
@@ -24,7 +24,7 @@