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 @@ $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 = [