diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index eec181f3..9306710d 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -86,7 +86,19 @@ switch ($action) {
             $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one();
 
             $mikrotik = Router::_info($server);
-            $date_exp = date("Y-m-d", mktime(0, 0, 0, date("m"), date("d") + $p['validity'], date("Y")));
+            if($p['validity_unit']=='Months'){
+                $date_exp = date("Y-m-d", strtotime('+'.$p['validity'].' month'));
+            }else if($p['validity_unit']=='Days'){
+                $date_exp = date("Y-m-d", strtotime('+'.$p['validity'].' day'));
+            }else if($p['validity_unit']=='Hrs'){
+                $datetime = explode(' ',date("Y-m-d H:i:s", strtotime('+'.$p['validity'].' hour')));
+                $date_exp = $datetime[0];
+                $time = $datetime[1];
+            }else if($p['validity_unit']=='Mins'){
+                $datetime = explode(' ',date("Y-m-d H:i:s", strtotime('+'.$p['validity'].' minute')));
+                $date_exp = $datetime[0];
+                $time = $datetime[1];
+            }
 
             if ($type == 'Hotspot') {
                 if ($b) {
@@ -708,7 +720,20 @@ switch ($action) {
         $time = date("H:i:s");
 
         $mikrotik = Router::_info($v1['routers']);
-        $date_exp = date("Y-m-d", mktime(0, 0, 0, date("m"), date("d") + $p['validity'], date("Y")));
+
+        if($p['validity_unit']=='Months'){
+            $date_exp = date("Y-m-d", strtotime('+'.$p['validity'].' month'));
+        }else if($p['validity_unit']=='Days'){
+            $date_exp = date("Y-m-d", strtotime('+'.$p['validity'].' day'));
+        }else if($p['validity_unit']=='Hrs'){
+            $datetime = explode(' ',date("Y-m-d H:i:s", strtotime('+'.$p['validity'].' hour')));
+            $date_exp = $datetime[0];
+            $time = $datetime[1];
+        }else if($p['validity_unit']=='Mins'){
+            $datetime = explode(' ',date("Y-m-d H:i:s", strtotime('+'.$p['validity'].' minute')));
+            $date_exp = $datetime[0];
+            $time = $datetime[1];
+        }
 
         if ($v1) {
             if ($v1['type'] == 'Hotspot') {
diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php
index 3012b89a..28d9d9f3 100644
--- a/system/controllers/voucher.php
+++ b/system/controllers/voucher.php
@@ -3,10 +3,6 @@
 /**
  * PHP Mikrotik Billing (https://ibnux.github.io/phpmixbill/)
 
-
- * @copyright	Copyright (C) 2014-2015 PHP Mikrotik Billing
- * @license		GNU General Public License version 2 or later; see LICENSE.txt
-
  **/
 _auth();
 $ui->assign('_title', $_L['Voucher'] . '- ' . $config['CompanyName']);
@@ -40,8 +36,19 @@ switch ($action) {
         $time = date("H:i:s");
 
         $mikrotik = Router::_info($v1['routers']);
-        $date_exp = date("Y-m-d", mktime(0, 0, 0, date("m"), date("d") + $p['validity'], date("Y")));
-
+        if($p['validity_unit']=='Months'){
+            $date_exp = date("Y-m-d", strtotime('+'.$p['validity'].' month'));
+        }else if($p['validity_unit']=='Days'){
+            $date_exp = date("Y-m-d", strtotime('+'.$p['validity'].' day'));
+        }else if($p['validity_unit']=='Hrs'){
+            $datetime = explode(' ',date("Y-m-d H:i:s", strtotime('+'.$p['validity'].' hour')));
+            $date_exp = $datetime[0];
+            $time = $datetime[1];
+        }else if($p['validity_unit']=='Mins'){
+            $datetime = explode(' ',date("Y-m-d H:i:s", strtotime('+'.$p['validity'].' minute')));
+            $date_exp = $datetime[0];
+            $time = $datetime[1];
+        }
         if ($v1) {
             if ($v1['type'] == 'Hotspot') {
                 if ($b) {
@@ -143,10 +150,6 @@ switch ($action) {
                     $t->routers = $v1['routers'];
                     $t->type = "Hotspot";
                     $t->save();
-                    // Telegram to Admin
-                    sendTelegram( $c['username']." Activate Voucher Hotspot\n".$p['name_plan'].
-                    "\nRouter: ".$v1['routers'].
-                    "\nPrice: ".$p['price']);
                 } else {
                     try {
                         $iport = explode(":", $mikrotik['ip_address']);
@@ -238,15 +241,15 @@ switch ($action) {
                     $t->routers = $v1['routers'];
                     $t->type = "Hotspot";
                     $t->save();
-                    // Telegram to Admin
-                    sendTelegram( $c['username']." Activate Voucher Hotspot\n".$p['name_plan'].
-                    "\nRouter: ".$v1['routers'].
-                    "\nPrice: ".$p['price']);
                 }
 
                 $v1->status = "1";
                 $v1->user = $c['username'];
                 $v1->save();
+                // Telegram to Admin
+                sendTelegram( $c['username']." Activate Voucher Hotspot\n".$p['name_plan'].
+                "\nRouter: ".$v1['routers'].
+                "\nPrice: ".$p['price']);
             } else {
                 if ($b) {
                     try {
@@ -299,10 +302,6 @@ switch ($action) {
                     $t->routers = $v1['routers'];
                     $t->type = "PPPOE";
                     $t->save();
-                    // Telegram to Admin
-                    sendTelegram( $c['username']." Activate Voucher PPPOE\n".$p['name_plan'].
-                    "\nRouter: ".$v1['routers'].
-                    "\nPrice: ".$p['price']);
                 } else {
                     try {
                         $iport = explode(":", $mikrotik['ip_address']);
@@ -346,14 +345,15 @@ switch ($action) {
                     $t->routers = $v1['routers'];
                     $t->type = "PPPOE";
                     $t->save();
-                    sendTelegram( $c['username']." Activate Voucher PPPOE\n".$p['name_plan'].
-                    "\nRouter: ".$v1['routers'].
-                    "\nPrice: ".$p['price']);
                 }
 
                 $v1->status = "1";
                 $v1->user = $c['username'];
                 $v1->save();
+                // Telegram to Admin
+                sendTelegram( $c['username']." Activate Voucher PPPOE\n".$p['name_plan'].
+                "\nRouter: ".$v1['routers'].
+                "\nPrice: ".$p['price']);
             }
 
             r2(U . "voucher/list-activated", 's', $_L['Activation_Vouchers_Successfully']);
diff --git a/ui/theme/default/hotspot-add.tpl b/ui/theme/default/hotspot-add.tpl
index d4bf5bb4..37658531 100644
--- a/ui/theme/default/hotspot-add.tpl
+++ b/ui/theme/default/hotspot-add.tpl
@@ -6,7 +6,7 @@
 					<div class="panel-heading">{$_L['Add_Plan']}</div>
 						<div class="panel-body">
 
-                <form class="form-horizontal" method="post" role="form" action="{$_url}services/add-post" >            
+                <form class="form-horizontal" method="post" role="form" action="{$_url}services/add-post" >
                     <div class="form-group">
 						<label class="col-md-2 control-label">{$_L['Plan_Name']}</label>
 						<div class="col-md-6">
@@ -16,17 +16,17 @@
                     <div class="form-group">
 						<label class="col-md-2 control-label">{$_L['Plan_Type']}</label>
 						<div class="col-md-10">
-							<input type="radio" id="Unlimited" name="typebp" value="Unlimited" checked> {$_L['Unlimited']} 
-							<input type="radio" id="Limited" name="typebp" value="Limited"> {$_L['Limited']} 
+							<input type="radio" id="Unlimited" name="typebp" value="Unlimited" checked> {$_L['Unlimited']}
+							<input type="radio" id="Limited" name="typebp" value="Limited"> {$_L['Limited']}
 						</div>
                     </div>
 					<div style="display:none;" id="Type">
 						<div class="form-group">
 							<label class="col-md-2 control-label">{$_L['Limit_Type']}</label>
 							<div class="col-md-10">
-								<input type="radio" id="Time_Limit" name="limit_type" value="Time_Limit" checked> {$_L['Time_Limit']} 
-								<input type="radio" id="Data_Limit" name="limit_type" value="Data_Limit"> {$_L['Data_Limit']} 
-								<input type="radio" id="Both_Limit" name="limit_type" value="Both_Limit"> {$_L['Both_Limit']} 
+								<input type="radio" id="Time_Limit" name="limit_type" value="Time_Limit" checked> {$_L['Time_Limit']}
+								<input type="radio" id="Data_Limit" name="limit_type" value="Data_Limit"> {$_L['Data_Limit']}
+								<input type="radio" id="Both_Limit" name="limit_type" value="Both_Limit"> {$_L['Both_Limit']}
 							</div>
 						</div>
 					</div>
@@ -88,8 +88,10 @@
 						</div>
 						<div class="col-md-2">
 							<select class="form-control" id="validity_unit" name="validity_unit">
-								<option value="Days">{$_L['Days']}</option>
-								<option value="Months">{$_L['Months']}</option>
+                                <option value="Mins" {if $d['validity_unit'] eq 'Mins'} selected {/if}>{$_L['Mins']}</option>
+                                <option value="Hrs" {if $d['validity_unit'] eq 'Hrs'} selected {/if}>{$_L['Hrs']}</option>
+                                <option value="Days" {if $d['validity_unit'] eq 'Days'} selected {/if}>{$_L['Days']}</option>
+                                <option value="Months" {if $d['validity_unit'] eq 'Months'} selected {/if}>{$_L['Months']}</option>
 							</select>
 						</div>
                     </div>
@@ -103,7 +105,7 @@
                             </select>
 						</div>
                     </div>
-					
+
 					<div class="form-group">
 						<div class="col-lg-offset-2 col-lg-10">
 							<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button>
@@ -111,7 +113,7 @@
 						</div>
 					</div>
                 </form>
-				
+
 					</div>
 				</div>
 			</div>
diff --git a/ui/theme/default/hotspot-edit.tpl b/ui/theme/default/hotspot-edit.tpl
index c07f1fb4..2cdbbef0 100644
--- a/ui/theme/default/hotspot-edit.tpl
+++ b/ui/theme/default/hotspot-edit.tpl
@@ -17,17 +17,17 @@
 							<div class="form-group">
 								<label class="col-md-2 control-label">{$_L['Plan_Type']}</label>
 								<div class="col-md-10">
-									<input type="radio" id="Unlimited" name="typebp" value="Unlimited" {if $d['typebp'] eq 'Unlimited'} checked {/if}> {$_L['Unlimited']} 
-									<input type="radio" id="Limited" name="typebp" value="Limited" {if $d['typebp'] eq 'Limited'} checked {/if}> {$_L['Limited']} 
+									<input type="radio" id="Unlimited" name="typebp" value="Unlimited" {if $d['typebp'] eq 'Unlimited'} checked {/if}> {$_L['Unlimited']}
+									<input type="radio" id="Limited" name="typebp" value="Limited" {if $d['typebp'] eq 'Limited'} checked {/if}> {$_L['Limited']}
 								</div>
 							</div>
 							<div {if $d['typebp'] eq 'Unlimited'} style="display:none;" {/if} id="Type">
 								<div class="form-group">
 									<label class="col-md-2 control-label">{$_L['Limit_Type']}</label>
 									<div class="col-md-10">
-										<input type="radio" id="Time_Limit" name="limit_type" value="Time_Limit" {if $d['limit_type'] eq 'Time_Limit'} checked {/if}> {$_L['Time_Limit']} 
-										<input type="radio" id="Data_Limit" name="limit_type" value="Data_Limit" {if $d['limit_type'] eq 'Data_Limit'} checked {/if}> {$_L['Data_Limit']} 
-										<input type="radio" id="Both_Limit" name="limit_type" value="Both_Limit" {if $d['limit_type'] eq 'Both_Limit'} checked {/if}> {$_L['Both_Limit']} 
+										<input type="radio" id="Time_Limit" name="limit_type" value="Time_Limit" {if $d['limit_type'] eq 'Time_Limit'} checked {/if}> {$_L['Time_Limit']}
+										<input type="radio" id="Data_Limit" name="limit_type" value="Data_Limit" {if $d['limit_type'] eq 'Data_Limit'} checked {/if}> {$_L['Data_Limit']}
+										<input type="radio" id="Both_Limit" name="limit_type" value="Both_Limit" {if $d['limit_type'] eq 'Both_Limit'} checked {/if}> {$_L['Both_Limit']}
 									</div>
 								</div>
 							</div>
@@ -88,6 +88,8 @@
 								</div>
 								<div class="col-md-2">
 									<select class="form-control" id="validity_unit" name="validity_unit">
+										<option value="Mins" {if $d['validity_unit'] eq 'Mins'} selected {/if}>{$_L['Mins']}</option>
+										<option value="Hrs" {if $d['validity_unit'] eq 'Hrs'} selected {/if}>{$_L['Hrs']}</option>
 										<option value="Days" {if $d['validity_unit'] eq 'Days'} selected {/if}>{$_L['Days']}</option>
 										<option value="Months" {if $d['validity_unit'] eq 'Months'} selected {/if}>{$_L['Months']}</option>
 									</select>
@@ -99,7 +101,7 @@
 									<input type="text" class="form-control" id="routers" name="routers" value="{$d['routers']}" readonly>
 								</div>
 							</div>
-							
+
 							<div class="form-group">
 								<div class="col-lg-offset-2 col-lg-10">
 									<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Save']}</button>
@@ -107,7 +109,7 @@
 								</div>
 							</div>
 						</form>
-				
+
 					</div>
 				</div>
 			</div>