From b0e53f5809f3634f6dbd827077447f0ac8efcc2e Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Thu, 2 Oct 2025 15:50:22 +0900 Subject: [PATCH] dbmsv3 init...1 --- app/Controllers/Admin/Customer/ClientController.php | 2 +- app/Controllers/Admin/Customer/ServiceController.php | 4 ++-- app/Services/Customer/ClientService.php | 11 ++++++++--- app/Services/Customer/ServiceService.php | 6 +++++- app/Views/admin/client/detail.php | 8 +++++++- app/Views/cells/service/detail.php | 8 +++----- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index a5abd0a..f31fa49 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -123,7 +123,7 @@ class ClientController extends CustomerController if (!$entity instanceof ClientEntity) { throw new \Exception("{$uid}에 대한 정보를 찾을수 없습니다."); } - $this->entity = $this->getService()->modify($entity, $this->getService()->getFormDatas()); + $this->entity = $this->getService()->history($entity, $this->getService()->getFormDatas()); $db->transCommit(); return $this->getResultSuccess('고객 비고가 수정되었습니다.'); } catch (\Exception $e) { diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index 5c8577d..36a398a 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -242,9 +242,9 @@ class ServiceController extends CustomerController if (!$entity instanceof ServiceEntity) { throw new \Exception("{$uid}에 대한 정보를 찾을수 없습니다."); } - $this->entity = $this->getService()->modify($entity, $this->getService()->getFormDatas()); + $this->entity = $this->getService()->history($entity, $this->getService()->getFormDatas()); $db->transCommit(); - return $this->getResultSuccess('서비스객 비고가 수정되었습니다.'); + return $this->getResultSuccess('서비스 비고가 수정되었습니다.'); } catch (\Exception $e) { $db->transRollback(); return $this->getResultFail($e->getMessage()); diff --git a/app/Services/Customer/ClientService.php b/app/Services/Customer/ClientService.php index 2131fb9..fb629f7 100644 --- a/app/Services/Customer/ClientService.php +++ b/app/Services/Customer/ClientService.php @@ -86,7 +86,7 @@ class ClientService extends CustomerService } return $this->_paymentService; } - //압금(쿠폰:추가)처리 + //입금(쿠폰:추가)처리 final public function deposit(ClientEntity $entity, string $field, int $amount): ClientEntity { switch ($field) { @@ -113,7 +113,7 @@ class ClientService extends CustomerService } $formDatas = [$field => $amount]; // dd($formDatas); - return $this->getClientService()->modify($entity, $formDatas); + return parent::modify($entity, $formDatas); } //출금(쿠폰:사용)처리 final public function withdrawal(ClientEntity $entity, string $field, int $amount): ClientEntity @@ -142,7 +142,7 @@ class ClientService extends CustomerService // break; } $formDatas = [$field => $amount]; - return $this->getClientService()->modify($entity, $formDatas); + return parent::modify($entity, $formDatas); } //기본 기능부분 //생성 @@ -159,6 +159,11 @@ class ClientService extends CustomerService } return parent::modify($entity, $formDatas); } + //비고(History)설정 + public function history(mixed $entity, array $formDatas): ClientEntity + { + return parent::modify($entity, $formDatas); + } //List 검색용 //FormFilter 조건절 처리 diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index 9706549..9e492d9 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -251,7 +251,11 @@ class ServiceService extends CustomerService $entity = $entity->setServerEntity($this->getServerService()->setService('delete', $entity, [])); return parent::delete($entity); } - + //비고(History)설정 + public function history(mixed $entity, array $formDatas): ServiceEntity + { + return parent::modify($entity, $formDatas); + } //대체서버추가(가격변동은 없음) public function addServer(ServiceEntity $entity, array $formDatas): ServiceEntity { diff --git a/app/Views/admin/client/detail.php b/app/Views/admin/client/detail.php index 5f52c18..4134651 100644 --- a/app/Views/admin/client/detail.php +++ b/app/Views/admin/client/detail.php @@ -63,7 +63,13 @@ getSaleRate() ?>% getAccountBalance()) ?>원 getPK(), $viewDatas['totalAmounts']) ? number_format($viewDatas['totalAmounts'][$viewDatas['entity']->getPK()]) : 0 ?>원 - getPK(), $viewDatas['unPaids']) ? "총:" . $viewDatas['unPaids'][$viewDatas['entity']->getPK()]['cnt'] . "건/" . number_format($viewDatas['unPaids'][$viewDatas['entity']->getPK()]['amount']) : 0 ?>원 + + getPK(), $viewDatas['unPaids'])): ?> + 총 getPK()]['cnt'] ?>건/getPK()]['amount']) ?>원 + + 0원 + + diff --git a/app/Views/cells/service/detail.php b/app/Views/cells/service/detail.php index c25651a..6dd689d 100644 --- a/app/Views/cells/service/detail.php +++ b/app/Views/cells/service/detail.php @@ -11,7 +11,7 @@
서비스 목록
- + @@ -24,6 +24,7 @@ - - -
[상세정보]서비스 상세정보 사이트/위치/형식 CPU / 메모리 / 저장장치 OS / SOFTWARE
getCode() ?>
getServerEntity()->getCode() ?>
+
[getServerEntity()->getTitle() ?>]
getHelper()->getFieldView('site', $entity->getSite(), $serviceCellDatas) ?>
@@ -60,13 +61,10 @@ 		미납금 getPK(), $serviceCellDatas['unPaids'])): ?> - 총: getPK()]['cnt'] ?>건/getPK()]['amount']) ?>원 + 총 getPK()]['cnt'] ?>건/getPK()]['amount']) ?>원