diff --git a/install/phpnuxbill.sql b/install/phpnuxbill.sql index d3074192..06ca775e 100644 --- a/install/phpnuxbill.sql +++ b/install/phpnuxbill.sql @@ -201,6 +201,7 @@ CREATE TABLE `tbl_voucher` ( `code` varchar(55) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `user` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `status` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `used_date` DATETIME NULL DEFAULT NULL, `generated_by` int NOT NULL DEFAULT '0' COMMENT 'id admin' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; diff --git a/radius.php b/radius.php index e3662b56..b6b46586 100644 --- a/radius.php +++ b/radius.php @@ -92,6 +92,7 @@ try { if ($v['status'] == 0) { if (Package::rechargeUser(0, $v['routers'], $v['id_plan'], "Voucher", $username)) { $v->status = "1"; + $v->used_date = date('Y-m-d H:i:s'); $v->save(); $tur = ORM::for_table('tbl_user_recharges')->where('username', $username)->find_one(); if ($tur) { diff --git a/system/controllers/login.php b/system/controllers/login.php index c931e5c6..eba9f39e 100644 --- a/system/controllers/login.php +++ b/system/controllers/login.php @@ -188,6 +188,7 @@ switch ($do) { // voucher activation if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Voucher", $voucher)) { $v1->status = "1"; + $v1->used_date = date('Y-m-d H:i:s'); $v1->user = $user['username']; $v1->save(); $user->last_login = date('Y-m-d H:i:s'); diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php index 88651718..5147eceb 100644 --- a/system/controllers/voucher.php +++ b/system/controllers/voucher.php @@ -28,6 +28,7 @@ switch ($action) { if ($v1) { if (Package::rechargeUser($user['id'], $v1['routers'], $v1['id_plan'], "Voucher", $code)) { $v1->status = "1"; + $v1->used_date = date('Y-m-d H:i:s'); $v1->user = $user['username']; $v1->save(); r2(U . "voucher/list-activated", 's', Lang::T('Activation Vouchers Successfully')); diff --git a/system/updates.json b/system/updates.json index 0ed14652..d4aa9765 100644 --- a/system/updates.json +++ b/system/updates.json @@ -125,5 +125,8 @@ "CREATE TABLE IF NOT EXISTS `rad_acct` ( `id` bigint NOT NULL, `acctsessionid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', `username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', `realm` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', `nasid` varchar(32) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', `nasipaddress` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '', `nasportid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `nasporttype` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `framedipaddress` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',`acctstatustype` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, `macaddr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `dateAdded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;", "ALTER TABLE `rad_acct` ADD PRIMARY KEY (`id`), ADD KEY `username` (`username`), ADD KEY `framedipaddress` (`framedipaddress`), ADD KEY `acctsessionid` (`acctsessionid`), ADD KEY `nasipaddress` (`nasipaddress`);", "ALTER TABLE `rad_acct` MODIFY `id` bigint NOT NULL AUTO_INCREMENT;" + ], + "2024.7.24" : [ + "ALTER TABLE `tbl_voucher` ADD `used_date` DATETIME NULL DEFAULT NULL AFTER `status`;" ] } \ No newline at end of file