From 6df8db1fa1255486877e74875a4217f05cacc365 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Fri, 19 Sep 2025 12:16:17 +0900 Subject: [PATCH] dbmsv2 init...1 --- app/Cells/Customer/ServiceCell.php | 14 +--- app/Controllers/Admin/Home.php | 6 +- app/Helpers/CommonHelper.php | 4 +- app/Helpers/Customer/ClientHelper.php | 2 +- app/Helpers/Customer/ServiceHelper.php | 16 ++-- app/Helpers/Equipment/ServerHelper.php | 10 ++- app/Helpers/Equipment/ServerPartHelper.php | 12 +++ app/Helpers/Equipment/SwitchHelper.php | 2 +- app/Helpers/PaymentHelper.php | 19 ++++- app/Interfaces/Customer/ServiceInterface.php | 10 +++ app/Language/en/Payment.php | 4 +- app/Models/CommonModel.php | 3 +- app/Models/Equipment/ServerModel.php | 18 +++++ app/Services/Payment/PaymentService.php | 77 ++++++++++++-------- app/Views/admin/client/detail.php | 2 +- app/Views/admin/server/index.php | 6 +- app/Views/admin/server/view.php | 55 ++++++-------- app/Views/admin/service/index.php | 6 +- app/Views/admin/welcome/banner.php | 2 +- app/Views/cells/service/detail.php | 6 +- 20 files changed, 174 insertions(+), 100 deletions(-) create mode 100644 app/Interfaces/Customer/ServiceInterface.php diff --git a/app/Cells/Customer/ServiceCell.php b/app/Cells/Customer/ServiceCell.php index d8220e2..eb89f45 100644 --- a/app/Cells/Customer/ServiceCell.php +++ b/app/Cells/Customer/ServiceCell.php @@ -28,18 +28,8 @@ class ServiceCell extends CustomerCell $this->getService()->setFormFilters(); $this->getService()->setFormRules(); $this->getService()->setFormOptions(); - $unPaids = []; - $entities = []; - foreach ($this->getService()->getEntities(['clientinfo_uid' => $params['clientinfo_uid']]) as $entity) { - if (!array_key_exists($entity->getPK(), $unPaids)) { - $unPaids[$entity->getPK()] = ['cnt' => 0, 'amount' => 0]; - } - foreach ($this->getPaymentService()->getUnPaids('serviceinfo_uid', ['serviceinfo_uid' => $entity->getPK()]) as $unPaid) { - $unPaids[$entity->getPK()]['cnt'] += $unPaid->cnt; - $unPaids[$entity->getPK()]['amount'] += $unPaid->amount; - } - $entities[] = $entity; - } + $unPaids = $this->getPaymentService()->getUnPaids('serviceinfo_uid', ['clientinfo_uid' => $params['clientinfo_uid']]); + $entities = $this->getService()->getEntities(['clientinfo_uid' => $params['clientinfo_uid']]); $template = array_key_exists('template', $params) ? $params['template'] : __FUNCTION__; return view('cells/service/' . $template, [ 'serviceCellDatas' => [ diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php index 8f830e4..d828fa6 100644 --- a/app/Controllers/Admin/Home.php +++ b/app/Controllers/Admin/Home.php @@ -77,9 +77,9 @@ class Home extends AdminController //서비스별 미납 Count $totalUnPaidCount = 0; $totalUnPaidAmount = 0; - foreach ($this->getPaymentService()->getUnPaids('serviceinfo_uid') as $unPaid) { - $totalUnPaidCount += $unPaid->cnt; - $totalUnPaidAmount += $unPaid->amount; + foreach ($this->getPaymentService()->getUnPaids('serviceinfo_uid') as $key => $datas) { + $totalUnPaidCount += $datas['cnt']; + $totalUnPaidAmount += $datas['amount']; } $this->totalUnPaidCount = $totalUnPaidCount; $this->totalUnPaidAmount = $totalUnPaidAmount; diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 62a92a6..50f3193 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -272,11 +272,11 @@ class CommonHelper // create, modify, create_form, modify_form일때 checkbox로 표시 if (in_array($viewDatas['control']['action'], ['create_form', 'modify_form'])) { $forms = []; - foreach ($viewDatas['control']['field_optons'][$field] as $key => $filterEntity) { + foreach ($viewDatas['control']['field_optons'][$field] as $key => $label) { if ($key !== '') { // 빈값은 제외 $values = is_array($value) ? $value : explode(DEFAULTS["DELIMITER_ROLE"], $value); //form_check에는 "class" => "form-control" 쓰면 않되거나 form-check를 써야함 - $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values), $extras) . $filterEntity->getTitle(); + $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values), $extras) . $label; } } $form = implode(" ", $forms); diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index 7b99a3e..d72db93 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -73,7 +73,7 @@ class ClientHelper extends CustomerHelper if (!$this->getMyAuth()->isAccessRole(['security'])) { $action = $viewDatas['entity']->getCode(); } else { - $action = parent::getListButton($action, $label ? $label : $viewDatas['entity']->getCode(), $viewDatas, $extras); + $action = parent::getListButton($action, $label, $viewDatas, $extras); } break; case 'create': diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index c9c7a1e..5031fea 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -64,6 +64,9 @@ class ServiceHelper extends CustomerHelper $attributes = ['data-price' => 'getPrice']; $form = $this->form_dropdown_common($field, $value, $viewDatas, $extras, $attributes); break; + case 'amount': + $form = form_input($field, 0, ["readonly" => "readonly", ...$extras]); + break; default: $form = parent::getFieldForm($field, $value, $viewDatas, $extras); break; @@ -79,11 +82,12 @@ class ServiceHelper extends CustomerHelper case 'billing_at': if (array_key_exists('unPaids', $viewDatas)) { if (array_key_exists($viewDatas['entity']->getPK(), $viewDatas['unPaids'])) { - foreach ($viewDatas['unPaids'] as $unPaid) { - if ($unPaid->serviceinfo_uid = $viewDatas['entity']->getPK()) { - $value .= "
getPK()}\">미지급: " . $unPaid->cnt . "개,총 " . number_format($unPaid->amount) . "원
"; - } - } + $value .= sprintf( + "
미지급: %s개,총 %s원
", + $viewDatas['entity']->getPK(), + $viewDatas['unPaids'][$viewDatas['entity']->getPK()]['cnt'], + number_format($viewDatas['unPaids'][$viewDatas['entity']->getPK()]['amount']) + ); } } break; @@ -101,7 +105,7 @@ class ServiceHelper extends CustomerHelper { switch ($action) { case 'modify': - $action = parent::getListButton($action, $label ? $label : $viewDatas['entity']->getCode(), $viewDatas, $extras); + $action = parent::getListButton($action, $label, $viewDatas, $extras); break; case 'history': $extras = ["class" => "btn btn-outline btn-primary btn-circle", "target" => "_self", ...$extras]; diff --git a/app/Helpers/Equipment/ServerHelper.php b/app/Helpers/Equipment/ServerHelper.php index fad7400..bf9b55a 100644 --- a/app/Helpers/Equipment/ServerHelper.php +++ b/app/Helpers/Equipment/ServerHelper.php @@ -14,6 +14,14 @@ class ServerHelper extends EquipmentHelper public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string { switch ($field) { + case 'clientinfo_uid': + case 'serviceinfo_uid': + $form = parent::getFieldForm($field, $value, $viewDatas, $extras); + if (in_array($viewDatas['control']['action'], ['modify_form']) && $value) { + $form = $this->getFieldView($field, $value, $viewDatas, $extras); + $form .= form_hidden($field, (string)$value); + } + break; case 'code': // $extras['readonly'] = in_array($viewDatas['control']['action'], ['modify_form']) ? ' readonly' : ''; $form = parent::getFieldForm($field, $value, $viewDatas, $extras); @@ -57,7 +65,7 @@ class ServerHelper extends EquipmentHelper { switch ($action) { case 'modify': - $action = parent::getListButton($action, $viewDatas['entity']->getCode(), $viewDatas, $extras); + $action = parent::getListButton($action, $label ? $label : $viewDatas['entity']->getCode(), $viewDatas, $extras); break; case 'history': $extras = ["class" => "btn btn-outline btn-primary btn-circle", "target" => "_self", ...$extras]; diff --git a/app/Helpers/Equipment/ServerPartHelper.php b/app/Helpers/Equipment/ServerPartHelper.php index 3853e33..2b0939a 100644 --- a/app/Helpers/Equipment/ServerPartHelper.php +++ b/app/Helpers/Equipment/ServerPartHelper.php @@ -57,6 +57,18 @@ class ServerPartHelper extends EquipmentHelper $attributes = ['data-title' => 'getTitle', 'data-price' => 'getPrice']; $form = $this->form_dropdown_common($field, $value, $viewDatas, $extras, $attributes); break; + case 'billing': + //결제방식이 항상 매월지급으로 설정되는 항목형식(IP,CS) + if (array_key_exists('type', $viewDatas['control']['form_datas'])) { + switch ($viewDatas['control']['form_datas']['type']) { + case 'IP': + case 'CS': + $value = PAYMENT['BILLING']['MONTH']; + break; + } + } + $form = parent::getFieldForm($field, $value, $viewDatas, $extras);; + break; case 'extra': if (array_key_exists('type', $viewDatas['control']['form_datas']) && $viewDatas['control']['form_datas']['type'] === 'DISK') { $options = ["" => lang("{$viewDatas['class_path']}.label.{$field}") . " 선택", ...lang("{$viewDatas['class_path']}.EXTRA.{$viewDatas['control']['form_datas']['type']}")]; diff --git a/app/Helpers/Equipment/SwitchHelper.php b/app/Helpers/Equipment/SwitchHelper.php index d99d501..4a1a1fc 100644 --- a/app/Helpers/Equipment/SwitchHelper.php +++ b/app/Helpers/Equipment/SwitchHelper.php @@ -19,7 +19,7 @@ class SwitchHelper extends EquipmentHelper if (!$this->getMyAuth()->isAccessRole(['security'])) { $action = $viewDatas['entity']->getCode(); } else { - $action = parent::getListButton($action, $viewDatas['entity']->getCode(), $viewDatas, $extras); + $action = parent::getListButton($action, $label ? $label : $viewDatas['entity']->getCode(), $viewDatas, $extras); } break; default: diff --git a/app/Helpers/PaymentHelper.php b/app/Helpers/PaymentHelper.php index 895169c..db337a7 100644 --- a/app/Helpers/PaymentHelper.php +++ b/app/Helpers/PaymentHelper.php @@ -44,8 +44,25 @@ class PaymentHelper extends CommonHelper case 'batchjob_delete': $action = ""; break; + case 'modify': + $oldBatchJobUids = old("batchjob_uids", null); + $oldBatchJobUids = is_array($oldBatchJobUids) ? $oldBatchJobUids : [$oldBatchJobUids]; + $action = form_checkbox([ + "id" => "checkbox_uid_{$viewDatas['entity']->getPK()}", + "name" => "batchjob_uids[]", + "value" => $label ? $label : $viewDatas['entity']->getPK(), + "class" => "batchjobuids_checkboxs", + "checked" => in_array($viewDatas['entity']->getPK(), $oldBatchJobUids) + ]); + if ($this->getMyAuth()->isAccessRole(['security'])) { + $action = parent::getListButton($action, $label, $viewDatas, $extras); + } + break; case 'delete': - $action = $viewDatas['entity']->getStatus() !== $viewDatas['entity']::DEFAULT_STATUS ? "" : parent::getListButton($action, $label, $viewDatas, $extras); + $action = ""; + if ($this->getMyAuth()->isAccessRole(['security'])) { + $action = $viewDatas['entity']->getStatus() !== $viewDatas['entity']::DEFAULT_STATUS ? "" : parent::getListButton($action, $label, $viewDatas, $extras); + } break; case 'invoice': $action = form_submit($action . "_submit", $label ? $label : '청구서 발행', [ diff --git a/app/Interfaces/Customer/ServiceInterface.php b/app/Interfaces/Customer/ServiceInterface.php new file mode 100644 index 0000000..dad586d --- /dev/null +++ b/app/Interfaces/Customer/ServiceInterface.php @@ -0,0 +1,10 @@ + "납부기한", ], "BILLING" => [ - "month" => "매월", - "onetime" => "일회성", + PAYMENT['BILLING']['MONTH'] => "매월", + PAYMENT['BILLING']['ONETIME'] => "일회성", ], "PAY" => [ "account" => "예치금", diff --git a/app/Models/CommonModel.php b/app/Models/CommonModel.php index c3dac67..61d4b40 100644 --- a/app/Models/CommonModel.php +++ b/app/Models/CommonModel.php @@ -73,7 +73,6 @@ abstract class CommonModel extends Model $data[8] = chr(ord($data[8]) & 0x3f | 0x80); // variant 10 return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4)); } - //기본 기능 public function getFormRule(string $action, string $field): string { if (is_array($field)) { @@ -111,7 +110,6 @@ abstract class CommonModel extends Model } return $rule; } - // create, modify 직전 작업용 작업 protected function convertFormDatas(string $action, string $field, array $formDatas): mixed { // 필드 값 존재 여부 확인 @@ -143,6 +141,7 @@ abstract class CommonModel extends Model } return $value; } + //기본 기능 public function create(array $formDatas): mixed { $convertedFormDatas = []; diff --git a/app/Models/Equipment/ServerModel.php b/app/Models/Equipment/ServerModel.php index 33db346..2bc421f 100644 --- a/app/Models/Equipment/ServerModel.php +++ b/app/Models/Equipment/ServerModel.php @@ -61,6 +61,24 @@ class ServerModel extends EquipmentModel } return $rule; } + protected function convertFormDatas(string $action, string $field, array $formDatas): mixed + { + // 필드 값 존재 여부 확인 + $value = array_key_exists($field, $formDatas) ? $formDatas[$field] : null; + switch ($field) { + case 'clientinfo_uid': + case 'serviceinfo_uid': + if ($value === '') { + $value = null; + } + break; + default: + $value = parent::convertFormDatas($action, $field, $formDatas); + break; + } + return $value; + } + //기본기능 //create용 장비코드 마지막번호 가져오기 final public function getLastestCode(string $format, int $default): string { diff --git a/app/Services/Payment/PaymentService.php b/app/Services/Payment/PaymentService.php index d0a5089..d5624c2 100644 --- a/app/Services/Payment/PaymentService.php +++ b/app/Services/Payment/PaymentService.php @@ -122,15 +122,20 @@ class PaymentService extends CommonService implements ServerPartInterface $this->getModel()->orderBy('billing_at ASC'); parent::setOrderBy($field, $value); } - //총 미납건수, 금액 + //당일 기준으로 총 미납건수, 금액 final public function getUnPaids(string $group, array $where = []): array { - return $this->getModel()->groupBy($group) - ->select("serviceinfo_uid,COUNT(uid) as cnt, SUM(amount) as amount") + $rows = $this->getModel()->groupBy($group) + ->select("{$group},COUNT(uid) as cnt, SUM(amount) as amount") ->where(['billing_at <=' => date('Y-m-d')]) ->where(['status' => STATUS['UNPAID']]) ->where($where) ->get()->getResult(); + $unPaids = []; + foreach ($rows as $row) { + $unPaids[$row->$group] = ['cnt' => $row->cnt, 'amount' => $row->amount]; + } + return $unPaids; } //생성 final public function create(array $formDatas): PaymentEntity @@ -152,32 +157,46 @@ class PaymentService extends CommonService implements ServerPartInterface } public function setServerPart(ServerPartEntity $serverPartEntity, array $formDatas = []): ServerPartEntity { - if ($serverPartEntity->getServiceInfoUID() === null) { - throw new \Exception("서비스정보가 정의된 후에만 가능합니다."); - } - //Service Entity 가져오기 - $serviceEntity = $this->getServiceService()->getEntity($serverPartEntity->getServiceInfoUID()); - if (!$serviceEntity) { - throw new \Exception("[{$serverPartEntity->getServiceInfoUID()}]에 대한 서비스정보를 찾을수 없습니다."); - } - //월비용인경우 서비스 제공가에 서버연결정보 제공가 합산금액으로 설정 - if ($serverPartEntity->getBilling() === PAYMENT['BILLING']['MONTH']) { - $formDatas['serverinfo_uid'] = $serviceEntity->getServerInfoUID(); - $formDatas['billing_at'] = $serviceEntity->getBillingAt(); - $formDatas['amount'] = $serviceEntity->getAmount() + $serverPartEntity->getAmount(); - $this->getServiceService()->modify($serviceEntity, $formDatas); - } - //일회성인경우 - if ($serverPartEntity->getBilling() === PAYMENT['BILLING']['ONETIME']) { - $formDatas['clientinfo_uid'] = $serverPartEntity->getClientInfoUID(); - $formDatas['serviceinfo_uid'] = $serverPartEntity->getServiceInfoUID(); - $formDatas['serverinfo_uid'] = $serverPartEntity->getServerInfoUID(); - $formDatas['serverpartinfo_uid'] = $serverPartEntity->getPK(); - $formDatas['title'] = $serverPartEntity->getType() === 'ETC' ? $serverPartEntity->getTitle() : $serverPartEntity->getPartEntity()->getTitle(); - $formDatas['amount'] = $serverPartEntity->getAmount(); - $formDatas['billing'] = $serverPartEntity->getBilling(); - $formDatas['billing_at'] = $serverPartEntity->getBilling() === PAYMENT['BILLING']['ONETIME'] ? date("Y-m-d") : $serviceEntity->getBillingAT(); - $serverPartEntity = $this->setServerPart_process($serverPartEntity, $serviceEntity, $formDatas); + switch ($serverPartEntity->getBilling()) { + case PAYMENT['BILLING']['MONTH']: + if ($serverPartEntity->getServiceInfoUID() === null) { + throw new \Exception(lang("{$this->getClassName()}.BILLING." . PAYMENT['BILLING']['MONTH']) . "지급 상품은 서비스정보가 정의된 후에만 가능합니다."); + } + //Service Entity 가져오기 + $serviceEntity = $this->getServiceService()->getEntity($serverPartEntity->getServiceInfoUID()); + if (!$serviceEntity) { + throw new \Exception("[{$serverPartEntity->getServiceInfoUID()}]에 대한 서비스정보를 찾을수 없습니다."); + } + //월비용인경우 서비스 제공가에 서버연결정보 제공가 합산금액으로 설정 + if ($serverPartEntity->getBilling() === PAYMENT['BILLING']['MONTH']) { + $formDatas['serverinfo_uid'] = $serviceEntity->getServerInfoUID(); + $formDatas['billing_at'] = $serviceEntity->getBillingAt(); + $formDatas['amount'] = $serviceEntity->getAmount() + $serverPartEntity->getAmount(); + $this->getServiceService()->modify($serviceEntity, $formDatas); + } + break; + case PAYMENT['BILLING']['ONETIME']: + if ($serverPartEntity->getServiceInfoUID() === null) { + throw new \Exception(lang("{$this->getClassName()}.BILLING." . PAYMENT['BILLING']['ONETIME']) . "지급 상품은 서비스정보가 정의된 후에만 가능합니다."); + } + //Service Entity 가져오기 + $serviceEntity = $this->getServiceService()->getEntity($serverPartEntity->getServiceInfoUID()); + if (!$serviceEntity) { + throw new \Exception("[{$serverPartEntity->getServiceInfoUID()}]에 대한 서비스정보를 찾을수 없습니다."); + } + //일회성인경우 + if ($serverPartEntity->getBilling() === PAYMENT['BILLING']['ONETIME']) { + $formDatas['clientinfo_uid'] = $serverPartEntity->getClientInfoUID(); + $formDatas['serviceinfo_uid'] = $serverPartEntity->getServiceInfoUID(); + $formDatas['serverinfo_uid'] = $serverPartEntity->getServerInfoUID(); + $formDatas['serverpartinfo_uid'] = $serverPartEntity->getPK(); + $formDatas['title'] = $serverPartEntity->getType() === 'ETC' ? $serverPartEntity->getTitle() : $serverPartEntity->getPartEntity()->getTitle(); + $formDatas['amount'] = $serverPartEntity->getAmount(); + $formDatas['billing'] = $serverPartEntity->getBilling(); + $formDatas['billing_at'] = $serverPartEntity->getBilling() === PAYMENT['BILLING']['ONETIME'] ? date("Y-m-d") : $serviceEntity->getBillingAT(); + $serverPartEntity = $this->setServerPart_process($serverPartEntity, $serviceEntity, $formDatas); + } + break; } return $serverPartEntity; } diff --git a/app/Views/admin/client/detail.php b/app/Views/admin/client/detail.php index 52b921c..6c852c6 100644 --- a/app/Views/admin/client/detail.php +++ b/app/Views/admin/client/detail.php @@ -63,7 +63,7 @@ getSaleRate() ?>% getAccountBalance() ?> getPK(), $viewDatas['totalAmounts']) ? number_format($viewDatas['totalAmounts'][$viewDatas['entity']->getPK()]) : 0 ?> - getPK(), $viewDatas['unPaids']) ? number_format($viewDatas['unPaids'][$viewDatas['entity']->getPK()]['amount']) : 0 ?> + getPK(), $viewDatas['unPaids']) ? "총:" . $viewDatas['unPaids'][$viewDatas['entity']->getPK()]['cnt'] . "건/" . number_format($viewDatas['unPaids'][$viewDatas['entity']->getPK()]['amount']) : 0 ?>원 diff --git a/app/Views/admin/server/index.php b/app/Views/admin/server/index.php index 49b6b1a..ae67f05 100644 --- a/app/Views/admin/server/index.php +++ b/app/Views/admin/server/index.php @@ -42,7 +42,7 @@ getHelper()->getListLabel('type', lang("{$viewDatas['class_path']}.label.type"), $viewDatas) ?>/ getHelper()->getListLabel('title', lang("{$viewDatas['class_path']}.label.title"), $viewDatas) ?> - + 부품정보
All COPY
@@ -65,7 +65,7 @@ getStatus() === $entity::DEFAULT_STATUS ? "" : 'class="table-danger"' ?>> - getHelper()->getListButton('modify', $num, $viewDatas) ?> + getHelper()->getListButton('modify', "", $viewDatas) ?> getHelper()->getFieldView('clientinfo_uid', $entity->getClientInfoUID(), $viewDatas) ?>
getHelper()->getFieldView('serviceinfo_uid', $entity->getServiceInfoUID(), $viewDatas) ?> @@ -74,7 +74,7 @@ getHelper()->getFieldView('type', $entity->type, $viewDatas) ?>
getHelper()->getFieldView('title', $entity->getTitle(), $viewDatas) ?> - + $entity->getPK(), 'types' => SERVERPART['SERVER_PARTTYPES'], diff --git a/app/Views/admin/server/view.php b/app/Views/admin/server/view.php index 2c00fa6..b85ba57 100644 --- a/app/Views/admin/server/view.php +++ b/app/Views/admin/server/view.php @@ -3,36 +3,29 @@ getHelper()->alert($error) ?>
include("templates/{$viewDatas['layout']}/form_content_top"); ?>
- -
- - - - - - - - > - -
서버정보추가정보
- - - - - - - -
getHelper()->getFieldLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?> - getHelper()->getFieldView($field, $viewDatas['entity']->$field ?? null, $viewDatas) ?> - -
- 		$viewDatas['entity']->getPK(), - 'types' => SERVERPART['ALL_PARTTYPES'] - ]) ?>
-
"btn btn-outline btn-primary")); ?>
- -
-
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
+ + + + + + + + > + +
서버정보추가정보
+ + + + + + + +
getHelper()->getFieldLabel($field, lang("{$viewDatas['class_path']}.label.{$field}"), $viewDatas) ?>getHelper()->getFieldView($field, $viewDatas['entity']->$field ?? null, $viewDatas) ?>
+ 		$viewDatas['entity']->getPK(), + 'types' => SERVERPART['ALL_PARTTYPES'] + ]) ?>
+
+
include("templates/{$viewDatas['layout']}/form_content_bottom"); ?>
endSection() ?> \ No newline at end of file diff --git a/app/Views/admin/service/index.php b/app/Views/admin/service/index.php index 3ec00cf..c12ca46 100644 --- a/app/Views/admin/service/index.php +++ b/app/Views/admin/service/index.php @@ -46,7 +46,7 @@ getHelper()->getListLabel('clientinfo_uid', lang("{$viewDatas['class_path']}.label.clientinfo_uid"), $viewDatas) ?> - + 서버정보
All COPY
@@ -82,7 +82,7 @@ getHelper()->getFieldView('clientinfo_uid', $entity->clientinfo_uid, $viewDatas) ?> - + $entity->getServerEntity()->getPK(), 'types' => SERVERPART['SERVICE_PARTTYPES'], @@ -98,7 +98,7 @@ getHelper()->getFieldView('status', $entity->status, $viewDatas) ?> - getHelper()->getFieldView('start_at', $entity->start_at, $viewDatas) ?> + getHelper()->getFieldView('start_at', $entity->start_at, $viewDatas) ?> getHelper()->getListButton('view', '', $viewDatas) ?>  getHelper()->getListButton('delete', '', $viewDatas) ?> diff --git a/app/Views/admin/welcome/banner.php b/app/Views/admin/welcome/banner.php index 59ed39c..b66c920 100644 --- a/app/Views/admin/welcome/banner.php +++ b/app/Views/admin/welcome/banner.php @@ -132,7 +132,7 @@
-
건/원
+
건/원
금일 기준 미납 서비스
diff --git a/app/Views/cells/service/detail.php b/app/Views/cells/service/detail.php index 1640311..d91621c 100644 --- a/app/Views/cells/service/detail.php +++ b/app/Views/cells/service/detail.php @@ -58,7 +58,11 @@ 미납금 - 총: getPK()]['cnt'] ?>건,getPK()]['amount']) ?>원 + + getPK(), $serviceCellDatas['unPaids'])): ?> + 총: getPK()]['cnt'] ?>건/getPK()]['amount']) ?>원 + +