From 3b245899686486abe677f451e42bcaa9585ae7f0 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Mon, 25 Aug 2025 10:33:13 +0900 Subject: [PATCH] dbmsv2 init...1 --- app/Language/en/Customer/Payment.php | 8 ++++---- app/Language/en/Customer/Service.php | 2 +- app/Language/en/Equipment/CS.php | 4 ++-- app/Language/en/Equipment/IP.php | 4 ++-- app/Language/en/Equipment/Part.php | 1 + app/Language/en/Equipment/Server.php | 4 ++-- app/Models/Customer/ServiceModel.php | 2 +- app/Models/Equipment/CSModel.php | 4 ++++ app/Models/Equipment/IPModel.php | 2 ++ app/Models/Equipment/ServerModel.php | 9 +++++---- app/Services/Equipment/CSService.php | 2 ++ app/Services/Equipment/IPService.php | 2 ++ 12 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/Language/en/Customer/Payment.php b/app/Language/en/Customer/Payment.php index 20cbf39..ad73f3a 100644 --- a/app/Language/en/Customer/Payment.php +++ b/app/Language/en/Customer/Payment.php @@ -7,12 +7,12 @@ return [ 'serviceinfo_uid' => "서비스", 'title' => "청구항목", 'amount' => "청구금액", - 'billing_method' => "청구방법", + 'billing' => "청구방법", 'billing_at' => "지급기한일", - 'pay_method' => "지급방법", + 'pay' => "지급방법", 'status' => "상태", - 'updated_at' => "지불처리일", - 'created_at' => "청구일", + 'updated_at' => "지급일", + 'created_at' => "생성일", 'deleted_at' => "삭제일", 'countdown' => "납부기한", ], diff --git a/app/Language/en/Customer/Service.php b/app/Language/en/Customer/Service.php index 6f62b70..472ee07 100644 --- a/app/Language/en/Customer/Service.php +++ b/app/Language/en/Customer/Service.php @@ -10,7 +10,7 @@ return [ 'type' => "형식", 'location' => "위치", 'billing_at' => "결제일", - 'amount' => "과금액", + 'amount' => "월청구액", 'start_at' => "시작일", 'end_at' => "해지일", 'history' => "사용이력", diff --git a/app/Language/en/Equipment/CS.php b/app/Language/en/Equipment/CS.php index ec6b44a..e11fddc 100644 --- a/app/Language/en/Equipment/CS.php +++ b/app/Language/en/Equipment/CS.php @@ -10,8 +10,8 @@ return [ 'ip' => "IP", 'accountid' => "계정ID", 'domain' => "도메인", - 'price' => "소비자금액", - 'amount' => "서비스금액", + 'price' => "기본가", + 'amount' => "제공가", 'status' => "상태", 'updated_at' => "수정일", 'created_at' => "작성일", diff --git a/app/Language/en/Equipment/IP.php b/app/Language/en/Equipment/IP.php index 06848b8..8d990ef 100644 --- a/app/Language/en/Equipment/IP.php +++ b/app/Language/en/Equipment/IP.php @@ -7,8 +7,8 @@ return [ 'clientinfo_uid' => '고객정보', 'serverinfo_uid' => '서버정보', 'ip' => "IP", - 'price' => "소비자금액", - 'amount' => "서비스금액", + 'price' => "기본가", + 'amount' => "제공가", 'history' => "사용내역", 'status' => "상태", 'updated_at' => "수정일", diff --git a/app/Language/en/Equipment/Part.php b/app/Language/en/Equipment/Part.php index 87f73a8..c533855 100644 --- a/app/Language/en/Equipment/Part.php +++ b/app/Language/en/Equipment/Part.php @@ -5,6 +5,7 @@ return [ 'type' => "종류", 'title' => "모델명", 'price' => "기본가", + 'amount' => "제공가", 'status' => "상태", 'updated_at' => "수정일", 'created_at' => "작성일", diff --git a/app/Language/en/Equipment/Server.php b/app/Language/en/Equipment/Server.php index fcfb85f..1e43f26 100644 --- a/app/Language/en/Equipment/Server.php +++ b/app/Language/en/Equipment/Server.php @@ -7,8 +7,8 @@ return [ 'code' => "장비번호", 'type' => "장비벤더", 'title' => "모델명", - 'price' => "기본금액", - 'total_price' => "최종금액", + 'price' => "기본가", + 'amount' => "제공가", 'manufactur_at' => "입고일", 'format_at' => "포맷보류일", 'status' => "상태", diff --git a/app/Models/Customer/ServiceModel.php b/app/Models/Customer/ServiceModel.php index a9a542e..87480a7 100644 --- a/app/Models/Customer/ServiceModel.php +++ b/app/Models/Customer/ServiceModel.php @@ -21,7 +21,7 @@ class ServiceModel extends CustomerModel "site", "type", "location", - "billing_at", + "billing", "amount", "start_at", "end_at", diff --git a/app/Models/Equipment/CSModel.php b/app/Models/Equipment/CSModel.php index 58fdc51..f9d6c19 100644 --- a/app/Models/Equipment/CSModel.php +++ b/app/Models/Equipment/CSModel.php @@ -21,6 +21,7 @@ class CSModel extends EquipmentModel "accountid", "domain", "price", + 'amount', "status", ]; public function __construct() @@ -40,6 +41,9 @@ class CSModel extends EquipmentModel $rule = "required|trim|valid_ip[both]"; //ipv4 , ipv6 , both(ipv4,ipv6) $rule .= in_array($action, ["create", "create_form"]) ? "|is_unique[" . $this->getTable() . "." . $field . "]" : ""; break; + case "amount": + $rule = "required|numeric"; + break; case "accountid": case "domain": $rule = "permit_empty|trim|string"; diff --git a/app/Models/Equipment/IPModel.php b/app/Models/Equipment/IPModel.php index 9052a0c..959b187 100644 --- a/app/Models/Equipment/IPModel.php +++ b/app/Models/Equipment/IPModel.php @@ -20,6 +20,7 @@ class IPModel extends EquipmentModel "serverinfo_uid", "ip", "price", + "amount", "status", ]; public function __construct() @@ -34,6 +35,7 @@ class IPModel extends EquipmentModel switch ($field) { case "lineinfo_uid": case "price": + case "amount": $rule = "required|numeric"; break; case "old_clientinfo_uid": diff --git a/app/Models/Equipment/ServerModel.php b/app/Models/Equipment/ServerModel.php index d2d2882..479151a 100644 --- a/app/Models/Equipment/ServerModel.php +++ b/app/Models/Equipment/ServerModel.php @@ -20,7 +20,7 @@ class ServerModel extends EquipmentModel "type", "title", "price", - "total_price", + "amount", "manufactur_at", "format_at", "status", @@ -39,13 +39,14 @@ class ServerModel extends EquipmentModel case "serviceinfo_uid": $rule = "permit_empty|numeric"; break; + case "price": + case "amount": + $rule = "required|numeric"; + break; case "type": case "status": $rule = "required|trim|string"; break; - case "total_price": - $rule = "permit_empty|numeric"; - break; case "manufactur_at": $rule = "required|valid_date"; break; diff --git a/app/Services/Equipment/CSService.php b/app/Services/Equipment/CSService.php index 9ef4a7c..f38e612 100644 --- a/app/Services/Equipment/CSService.php +++ b/app/Services/Equipment/CSService.php @@ -22,6 +22,7 @@ class CSService extends EquipmentService "accountid", "domain", "price", + "amount", "status", ], 'filters' => [ @@ -43,6 +44,7 @@ class CSService extends EquipmentService 'accountid', 'domain', 'price', + "amount", 'status' ], 'filters' => [ diff --git a/app/Services/Equipment/IPService.php b/app/Services/Equipment/IPService.php index 9514d8f..f800880 100644 --- a/app/Services/Equipment/IPService.php +++ b/app/Services/Equipment/IPService.php @@ -24,6 +24,7 @@ class IPService extends EquipmentService "serverinfo_uid", "ip", "price", + "amount", "status", ], 'filters' => [ @@ -42,6 +43,7 @@ class IPService extends EquipmentService 'lineinfo_uid', 'ip', 'price', + "amount", 'status', 'clientinfo_uid', 'serverinfo_uid',