dbmsv2 init...1

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' => "납부기한",
   ],

app/Language/en/Customer/Service.php

@@ -10,7 +10,7 @@ return [
     'type' => "형식",
     'location' => "위치",
     'billing_at' => "결제일",
-    'amount' => "과금액",
+    'amount' => "월청구액",
     'start_at' => "시작일",
     'end_at' => "해지일",
     'history' => "사용이력",

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' => "작성일",

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' => "수정일",

app/Language/en/Equipment/Part.php

@@ -5,6 +5,7 @@ return [
     'type' => "종류",
     'title' => "모델명",
     'price' => "기본가",
+    'amount' => "제공가",
     'status' => "상태",
     'updated_at' => "수정일",
     'created_at' => "작성일",

app/Language/en/Equipment/Server.php

@@ -7,8 +7,8 @@ return [
     'code'          => "장비번호",
     'type'          => "장비벤더",
     'title'         => "모델명",
-    'price'         => "기본금액",
-    'total_price'   => "최종금액",
+    'price'         => "기본가",
+    'amount'         => "제공가",
     'manufactur_at' => "입고일",
     'format_at'     => "포맷보류일",
     'status'        => "상태",

app/Models/Customer/ServiceModel.php

@@ -21,7 +21,7 @@ class ServiceModel extends CustomerModel
         "site",
         "type",
         "location",
-        "billing_at",
+        "billing",
         "amount",
         "start_at",
         "end_at",

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";

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":

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;

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' => [

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',