diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php
index e66c81a..3d9f337 100644
--- a/app/Controllers/CommonController.php
+++ b/app/Controllers/CommonController.php
@@ -672,8 +672,9 @@ abstract class CommonController extends BaseController
{
try {
//각 Field 초기화
- $this->getMyAuth()->pushCurrentUrl($this->request->getUri()->getPath() . ($this->request->getUri()->getQuery() ? "?" . $this->request->getUri()->getQuery() : ""));
$this->initAction(__FUNCTION__);
+ //Return Url정의
+ $this->getMyAuth()->pushCurrentUrl($this->request->getUri()->getPath() . ($this->request->getUri()->getQuery() ? "?" . $this->request->getUri()->getQuery() : ""));
//FieldRule정의
foreach ($this->getIndexFields() as $field) {
$this->setFieldRule($field, $this->getFormFieldRule($this->getAction(), $field));
@@ -717,6 +718,7 @@ abstract class CommonController extends BaseController
switch ($output_type) {
case 'excel':
case 'pdf':
+ helper(['form']);
// string buffer에서 읽어오는 경우
$this->entities = $this->index_process();
$html = $this->getResultSuccess();
diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php
index 6b41608..a3aba9f 100644
--- a/app/Helpers/CommonHelper.php
+++ b/app/Helpers/CommonHelper.php
@@ -284,6 +284,9 @@ class CommonHelper
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
{
switch ($field) {
+ case 'user_uid':
+ $value = array_key_exists($value, $viewDatas['control']['filter_optons'][$field]) && $viewDatas['control']['filter_optons'][$field][$value] ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : "";
+ break;
case 'role':
$roles = [];
foreach (explode(DEFAULTS["DELIMITER_ROLE"], $value) as $key) {
@@ -291,25 +294,19 @@ class CommonHelper
}
$value = implode(" , ", $roles);
break;
- case 'billing_at':
- case 'start_at':
- case 'end_at':
case 'updated_at':
case 'created_at':
+ case 'deleted_at':
$value = $value ? date("Y-m-d", strtotime($value)) : "";
break;
case 'price':
case 'amount':
- $value = $value ? number_format($value) : "";
+ $value = number_format($value) . "원";
break;
default:
if (in_array($field, $viewDatas['control']['filter_fields'])) {
- if (env('app.debug.filter_options')) {
- echo "field=>" . $field . ",value=>" . $value . "
";
- echo var_dump($viewDatas['control']['filter_optons'][$field]) . "
";
- }
- //index 액션에서만 filter_options를 변경시 선택된 값을 변경하는 기능능
- if (in_array($viewDatas['control']['action'], ['index'])) {
+ //index 액션에서만 filter_options를 변경시 선택된 값을 변경하는 기능
+ if ($viewDatas['control']['action'] == 'index') {
$extras["onChange"] = sprintf(
"document.location.href='%s/toggle/%s/%s?%s='+this.options[this.selectedIndex].value",
current_url(),
@@ -319,11 +316,7 @@ class CommonHelper
);
$value = $this->getFieldForm($field, $value, $viewDatas, $extras);
} else {
- if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) {
- $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle();
- } else {
- $value = "";
- }
+ $value = array_key_exists($value, $viewDatas['control']['filter_optons'][$field]) ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : "";
}
}
break;
diff --git a/app/Helpers/Customer/AccountHelper.php b/app/Helpers/Customer/AccountHelper.php
index 0ef3feb..d8a6cd5 100644
--- a/app/Helpers/Customer/AccountHelper.php
+++ b/app/Helpers/Customer/AccountHelper.php
@@ -14,16 +14,9 @@ class AccountHelper extends CustomerHelper
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
{
switch ($field) {
- case 'amount':
- $value = number_format($value) . "원";
- break;
default:
if (in_array($field, $viewDatas['control']['filter_fields'])) {
- if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) {
- $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle();
- } else {
- $value = "";
- }
+ $value = array_key_exists($value, $viewDatas['control']['filter_optons'][$field]) ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : "";
}
break;
}
diff --git a/app/Helpers/Customer/CouponHelper.php b/app/Helpers/Customer/CouponHelper.php
index 3952e52..ff069e6 100644
--- a/app/Helpers/Customer/CouponHelper.php
+++ b/app/Helpers/Customer/CouponHelper.php
@@ -14,16 +14,9 @@ class CouponHelper extends CustomerHelper
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
{
switch ($field) {
- case 'amount':
- $value = number_format($value) . "개";
- break;
default:
if (in_array($field, $viewDatas['control']['filter_fields'])) {
- if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) {
- $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle();
- } else {
- $value = "";
- }
+ $value = array_key_exists($value, $viewDatas['control']['filter_optons'][$field]) ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : "";
}
break;
}
diff --git a/app/Helpers/Customer/PointHelper.php b/app/Helpers/Customer/PointHelper.php
index 3c795ca..e171a06 100644
--- a/app/Helpers/Customer/PointHelper.php
+++ b/app/Helpers/Customer/PointHelper.php
@@ -15,16 +15,9 @@ class PointHelper extends CustomerHelper
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
{
switch ($field) {
- case 'amount':
- $value = number_format($value) . "원";
- break;
default:
if (in_array($field, $viewDatas['control']['filter_fields'])) {
- if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) {
- $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle();
- } else {
- $value = "";
- }
+ $value = array_key_exists($value, $viewDatas['control']['filter_optons'][$field]) ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : "";
}
break;
}
diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php
index b900863..2864608 100644
--- a/app/Helpers/Customer/ServiceHelper.php
+++ b/app/Helpers/Customer/ServiceHelper.php
@@ -103,9 +103,6 @@ class ServiceHelper extends CustomerHelper
public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
{
switch ($field) {
- case 'user_uid':
- $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle();
- break;
case 'clientinfo_uid':
case 'ownerinfo_uid':
$temp = parent::getFieldForm($field, $value, $viewDatas, $extras);
diff --git a/app/Helpers/Customer/ServiceItemHelper.php b/app/Helpers/Customer/ServiceItemHelper.php
index c1234dc..9557e65 100644
--- a/app/Helpers/Customer/ServiceItemHelper.php
+++ b/app/Helpers/Customer/ServiceItemHelper.php
@@ -109,21 +109,4 @@ class ServiceItemHelper extends CustomerHelper
}
return $form;
}
- public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null
- {
- switch ($field) {
- case 'amount':
- case 'price':
- $value = number_format($value) . "원";
- break;
- default:
- $value = parent::getFieldView($field, $value, $viewDatas, $extras);
- break;
- }
- if (is_array($value)) {
- echo __METHOD__ . "에서 오류: {$field}의 값이 Array형태입니다";
- exit;
- }
- return $value;
- }
}
diff --git a/app/Helpers/Customer/ServicePaymentHelper.php b/app/Helpers/Customer/ServicePaymentHelper.php
index ce64de2..3251665 100644
--- a/app/Helpers/Customer/ServicePaymentHelper.php
+++ b/app/Helpers/Customer/ServicePaymentHelper.php
@@ -19,24 +19,14 @@ class ServicePaymentHelper extends CustomerHelper
$value = $viewDatas['entity']->getView_CounDueAt();
break;
case 'item_uid':
- // echo "Value:" . $viewDatas['entity']->getItemType() . ":" . $value;
- // dd($viewDatas['control']['filter_optons']);
- $value = $viewDatas['control']['filter_optons'][$viewDatas['entity']->getItemType()][$value]->getTitle();
- break;
- case 'amount':
- $value = number_format($value) . "원";
- break;
- case 'status':
- $value = parent::getFieldView($field, $value, $viewDatas, $extras);
+ case 'serviceinfo_uid':
+ case 'ownerinfo_uid':
+ case 'item_type':
+ case 'billing_cycle':
+ $value = array_key_exists($value, $viewDatas['control']['filter_optons'][$field]) && $viewDatas['control']['filter_optons'][$field][$value] ? $viewDatas['control']['filter_optons'][$field][$value]->getTitle() : "";
break;
default:
- if (in_array($field, $viewDatas['control']['filter_fields'])) {
- if (array_key_exists($value, $viewDatas['control']['filter_optons'][$field])) {
- $value = $viewDatas['control']['filter_optons'][$field][$value]->getTitle();
- } else {
- $value = "";
- }
- }
+ $value = parent::getFieldView($field, $value, $viewDatas, $extras);
break;
}
if (is_array($value)) {
diff --git a/app/Views/admin/download.php b/app/Views/admin/download.php
index e0cd377..d734359 100644
--- a/app/Views/admin/download.php
+++ b/app/Views/admin/download.php
@@ -9,9 +9,10 @@