From 224bcb11a6af8c346d7051839970ed811eee3e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Fri, 21 Nov 2025 13:52:01 +0900
Subject: [PATCH] dbmsv4 init...1

---
 app/DTOs/CommonDTO.php          |  2 +-
 app/DTOs/Customer/ClientDTO.php |  2 ++
 app/Helpers/CollectorHelper.php | 30 ------------------------------
 app/Helpers/PaymentHelper.php   | 17 +++++++++++++++++
 app/Services/PaymentService.php | 13 +++++++++++--
 5 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 app/Helpers/CollectorHelper.php

diff --git a/app/DTOs/CommonDTO.php b/app/DTOs/CommonDTO.php
index df46e72..9a80601 100644
--- a/app/DTOs/CommonDTO.php
+++ b/app/DTOs/CommonDTO.php
@@ -7,7 +7,7 @@ use ReflectionNamedType;
 
 abstract class CommonDTO
 {
-  public function __construct(array $datas = [])
+  protected function __construct(array $datas = [])
   {
     // 데이터가 없으면 바로 리턴
     if (empty($datas)) {
diff --git a/app/DTOs/Customer/ClientDTO.php b/app/DTOs/Customer/ClientDTO.php
index df5e756..2500bd2 100644
--- a/app/DTOs/Customer/ClientDTO.php
+++ b/app/DTOs/Customer/ClientDTO.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\DTOs\Customer;
+
 use App\DTOs\CommonDTO;
 
 class ClientDTO extends CommonDTO
diff --git a/app/Helpers/CollectorHelper.php b/app/Helpers/CollectorHelper.php
deleted file mode 100644
index 8ec8c1d..0000000
--- a/app/Helpers/CollectorHelper.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Helpers;
-
-class CollectorHelper extends CommonHelper
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-    public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string
-    {
-        switch ($field) {
-            case 'in':
-            case 'out':
-            case 'raw_in':
-            case 'raw_out':
-                $value = number_format($value);
-                break;
-            case 'updated_at':
-            case 'created_at':
-            case 'deleted_at':
-                break;
-            default:
-                $value = parent::getFieldView($field, $value, $viewDatas, $extras);
-                break;
-        }
-        return $value ?? "";
-    } //
-}
diff --git a/app/Helpers/PaymentHelper.php b/app/Helpers/PaymentHelper.php
index d7de39d..02c1c34 100644
--- a/app/Helpers/PaymentHelper.php
+++ b/app/Helpers/PaymentHelper.php
@@ -8,6 +8,23 @@ class PaymentHelper extends CommonHelper
     {
         parent::__construct();
     }
+    public function getFieldForm(string $field, mixed $value, array $viewDatas, array $extras = []): string
+    {
+        switch ($field) {
+            case 'billing':
+            case 'pay':
+                $forms = [];
+                array_shift($viewDatas['formOptions'][$field]['options']);
+                foreach ($viewDatas['formOptions'][$field]['options'] as $key => $label)
+                    $forms[] = form_radio($field, $key, $key == $value, $extras) . $label;
+                $form = implode(" ", $forms);
+                break;
+            default:
+                $form = parent::getFieldForm($field, $value, $viewDatas, $extras);
+                break;
+        }
+        return $form;
+    } //
     public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
     {
         switch ($field) {
diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php
index 5d46e45..147c743 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@@ -58,7 +58,7 @@ class PaymentService extends CommonService
             "amount",
             "billing",
             "billing_at",
-            "content ",
+            "content",
         ];
         $filters = ['user_uid', 'clientinfo_uid', 'serviceinfo_uid', 'status', 'billing', 'pay'];
         $indexFilter     = ['serviceinfo_uid', 'status', 'billing'];
@@ -69,7 +69,16 @@ class PaymentService extends CommonService
                 break;
             case 'modify':
             case 'modify_form':
-                $fields = ['title', 'amount', 'pay', 'status', 'content'];
+                $fields = [
+                    "serviceinfo_uid",
+                    "title",
+                    "amount",
+                    "billing",
+                    "billing_at",
+                    "pay",
+                    "status",
+                    "content"
+                ];
                 break;
             case 'view':
                 $fields = [