diff --git a/src/web/admin/admin_all_list.html b/src/web/admin/admin_all_list.html index b1a2337..c413908 100644 --- a/src/web/admin/admin_all_list.html +++ b/src/web/admin/admin_all_list.html @@ -97,14 +97,18 @@ var statusColorClass = accountStatusColorClass(status); var type = accountType(jsonList[i].accountType); var registerDate = jsonList[i].acceptClausesDateTime.substring(0, 10); + var availableDate = jsonList[i].availableActivateDateTime.substring(0, 10); + if(availableDate.charAt(0) == '0') + availableDate = ""; $("#maestro_list_result_contents").append( "
" + " " - + " " - + " " - + " " - + " " + + " " + + " " + + " " + + " " + + " " + " " + " " + "
" @@ -183,10 +187,11 @@
- - - - + + + + +
diff --git a/src/web/admin/admin_header.html b/src/web/admin/admin_header.html index 639b5ca..9631cb1 100644 --- a/src/web/admin/admin_header.html +++ b/src/web/admin/admin_header.html @@ -35,10 +35,10 @@
- 전체 목록 - 등록 목록 - 업그레이드 목록 - 계정 만료 목록 + 전체 + 신규 등록 + 업그레이드 + 계정 만료 이메일 발송
diff --git a/src/web/admin/admin_register_list.html b/src/web/admin/admin_register_list.html index d5e09a7..2426a08 100644 --- a/src/web/admin/admin_register_list.html +++ b/src/web/admin/admin_register_list.html @@ -96,8 +96,8 @@ "
" + " " + " " - + " " - + " " + + " " + + " " + " " + " " + "
" @@ -175,9 +175,9 @@
- - - + + +
diff --git a/src/web/admin/admin_upgrade_list.html b/src/web/admin/admin_upgrade_list.html index 0a4fecb..a19579d 100644 --- a/src/web/admin/admin_upgrade_list.html +++ b/src/web/admin/admin_upgrade_list.html @@ -91,10 +91,11 @@ + " " + " " + " " - + " " - + " " - + " " - + " " + + " " + + " " + + " " + + " " + + " " + " " + " " + "" @@ -105,10 +106,11 @@ + " " + " " + " " - + " " - + " " + + " " + + " " + + " " + + " " + " " - + " " + " " + " " + "" @@ -221,12 +223,13 @@
- - - - - - + + + + + + +
diff --git a/src/web/js/lib/account_info.js b/src/web/js/lib/account_info.js index 3a3c125..165fcbd 100644 --- a/src/web/js/lib/account_info.js +++ b/src/web/js/lib/account_info.js @@ -35,6 +35,10 @@ function accountType(accountType) { case 5: return "1,000명 (5만원)"; + + case 100: + case 101: + return "해당없음"; } return accountType + "? (N/A)"; diff --git a/src/web/server/admin/maestro_all_list.php b/src/web/server/admin/maestro_all_list.php index 32dda47..45c3f14 100644 --- a/src/web/server/admin/maestro_all_list.php +++ b/src/web/server/admin/maestro_all_list.php @@ -29,7 +29,7 @@ function get_maestro_list() { global $db_conn; $query = " - SELECT MaestroID, Name, AccountType, ActivateStatus, AcceptClausesDateTime, PlayerCount + SELECT MaestroID, Name, AccountType, ActivateStatus, AvailableActivateDateTime, AcceptClausesDateTime, PlayerCount FROM maestro ORDER BY MaestroID DESC "; @@ -37,7 +37,7 @@ function get_maestro_list() { // $stmt->bind_param("iii", $maestroID, $startNo, $endNo); // $stmt->bind_param("ii", $maestroName, $startNo); $stmt->execute(); - $stmt->bind_result($maestroID, $name, $accountType, $activateStatus, $acceptClausesDateTime, $playerCount); + $stmt->bind_result($maestroID, $name, $accountType, $activateStatus, $availableActivateDateTime , $acceptClausesDateTime, $playerCount); $maestroList = array(); while($stmt->fetch()) { @@ -45,6 +45,7 @@ function get_maestro_list() { $maestro["maestroName"] = $name; $maestro["accountType"] = $accountType; $maestro["activateStatus"] = $activateStatus; + $maestro["availableActivateDateTime"] = $availableActivateDateTime; $maestro["acceptClausesDateTime"] = $acceptClausesDateTime; $maestro["playerCount"] = $playerCount; array_push($maestroList, $maestro); diff --git a/src/web/server/admin/maestro_upgrade_list.php b/src/web/server/admin/maestro_upgrade_list.php index 894d652..60c8467 100644 --- a/src/web/server/admin/maestro_upgrade_list.php +++ b/src/web/server/admin/maestro_upgrade_list.php @@ -29,7 +29,7 @@ function get_maestro_upgrade_list() { global $db_conn; $query = " - SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, U.Status + SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, M.AvailableActivateDateTime, U.Status FROM maestro_upgrade U, maestro M WHERE U.Status < 2 AND U.MaestroID = M.MaestroID ORDER BY U.MaestroUpgradeID DESC @@ -38,7 +38,7 @@ function get_maestro_upgrade_list() { // $stmt->bind_param("iii", $maestroID, $startNo, $endNo); // $stmt->bind_param("ii", $maestroName, $startNo); $stmt->execute(); - $stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $status); + $stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $availableActivateDateTime, $status); $maestroUpgradeList = array(); while($stmt->fetch()) { @@ -48,6 +48,7 @@ function get_maestro_upgrade_list() { $maestro["registeredAccountType"] = $registeredAccountType; $maestro["requestedAccountType"] = $requestedAccountType; $maestro["requestedDateTime"] = $requestedDateTime; + $maestro["availableActivateDateTime"] = $availableActivateDateTime; $maestro["status"] = $status; array_push($maestroUpgradeList, $maestro); } @@ -59,7 +60,7 @@ function get_maestro_update_list_by_name($searchMaestroName) { global $db_conn; $query = " - SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, U.Status + SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, M.AvailableActivateDateTime, U.Status FROM maestro_upgrade U, maestro M WHERE M.Name LIKE CONCAT('%', ?, '%') AND U.MaestroID = M.MaestroID ORDER BY U.MaestroUpgradeID DESC @@ -67,7 +68,7 @@ function get_maestro_update_list_by_name($searchMaestroName) { $stmt = $db_conn->prepare($query); $stmt->bind_param("s", $searchMaestroName); $stmt->execute(); - $stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $status); + $stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $availableActivateDateTime, $status); $maestroUpgradeList = array(); while($stmt->fetch()) { @@ -77,6 +78,7 @@ function get_maestro_update_list_by_name($searchMaestroName) { $maestro["registeredAccountType"] = $registeredAccountType; $maestro["requestedAccountType"] = $requestedAccountType; $maestro["requestedDateTime"] = $requestedDateTime; + $maestro["availableActivateDateTime"] = $availableActivateDateTime; $maestro["status"] = $status; array_push($maestroUpgradeList, $maestro); }