From ae2d59ff202aa24ede196a3876d3743cbfdeb972 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: Wed, 2 Aug 2023 12:13:54 +0900
Subject: [PATCH] shoppingmallv2 init...

---
 app/Helpers/BoardConfig_helper.php | 2 +-
 app/Helpers/Board_helper.php       | 2 +-
 app/Helpers/Category_helper.php    | 2 +-
 app/Helpers/Order_helper.php       | 2 +-
 app/Helpers/Product_helper.php     | 2 +-
 app/Helpers/UserSNS_helper.php     | 2 +-
 app/Helpers/User_helper.php        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Helpers/BoardConfig_helper.php b/app/Helpers/BoardConfig_helper.php
index 3c55c59..28980d1 100644
--- a/app/Helpers/BoardConfig_helper.php
+++ b/app/Helpers/BoardConfig_helper.php
@@ -81,7 +81,7 @@ function getFieldView_BoardConfigHelper($field, $entity, array $fieldFilters, ar
       return html_entity_decode($value);
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters)  && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //
diff --git a/app/Helpers/Board_helper.php b/app/Helpers/Board_helper.php
index 0a3f72e..f788d01 100644
--- a/app/Helpers/Board_helper.php
+++ b/app/Helpers/Board_helper.php
@@ -98,7 +98,7 @@ function getFieldView_BoardHelper($field, $entity, array $fieldFilters, array $f
       return $value ? str_split($value, 10)[0] : "";
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters)  && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //
diff --git a/app/Helpers/Category_helper.php b/app/Helpers/Category_helper.php
index 73eb02f..685d53e 100644
--- a/app/Helpers/Category_helper.php
+++ b/app/Helpers/Category_helper.php
@@ -90,7 +90,7 @@ function getFieldView_CategoryHelper($field, $entity, array $fieldFilters, array
       return isset($value) ? str_split($value, 10)[0] : "";
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters)  && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //
diff --git a/app/Helpers/Order_helper.php b/app/Helpers/Order_helper.php
index 6525641..081a155 100644
--- a/app/Helpers/Order_helper.php
+++ b/app/Helpers/Order_helper.php
@@ -62,7 +62,7 @@ function getFieldView_OrderHelper($field, $entity, array $fieldFilters, array $f
       return $value;
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters) && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //
diff --git a/app/Helpers/Product_helper.php b/app/Helpers/Product_helper.php
index 7e6f5a5..bb3e42e 100644
--- a/app/Helpers/Product_helper.php
+++ b/app/Helpers/Product_helper.php
@@ -102,7 +102,7 @@ function getFieldView_ProductHelper($field, $entity, array $fieldFilters, array
       return isset($value) ? str_split($value, 10)[0] : "";
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters)  && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //
diff --git a/app/Helpers/UserSNS_helper.php b/app/Helpers/UserSNS_helper.php
index 47c0418..e60418d 100644
--- a/app/Helpers/UserSNS_helper.php
+++ b/app/Helpers/UserSNS_helper.php
@@ -71,7 +71,7 @@ function getFieldView_UserSNSHelper($field, $entity, array $fieldFilters, array
       return isset($value) ? str_split($value, 10)[0] : "";
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters)  && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //
diff --git a/app/Helpers/User_helper.php b/app/Helpers/User_helper.php
index ed81ffa..81944f0 100644
--- a/app/Helpers/User_helper.php
+++ b/app/Helpers/User_helper.php
@@ -77,7 +77,7 @@ function getFieldView_UserHelper($field, $entity, array $fieldFilters, array $fi
       return html_entity_decode($value);
       break;
     default:
-      return in_array($field, $fieldFilters) ? $fieldFormOptions[$field][$value] : $value;
+      return in_array($field, $fieldFilters)  && $value ? $fieldFormOptions[$field][$value] : $value;
       break;
   }
 } //