add capacity to modify user
This commit is contained in:
osaajani
parent
f9e0312c89
commit
4a39865903
|
|
@ -103,7 +103,16 @@ namespace controllers\internals;
|
|||
if ($user)
|
||||
{
|
||||
$api_key = $api_key ?? $internal_user->generate_random_api_key();
|
||||
$success = $internal_user->update($user['id'], $email, $password, $admin, $api_key, $status, $encrypt_password);
|
||||
$user = [
|
||||
'email' => $email,
|
||||
'password' => $encrypt_password ? password_hash($password, PASSWORD_DEFAULT) : $password,
|
||||
'admin' => $admin,
|
||||
'api_key' => $api_key,
|
||||
'status' => $status,
|
||||
|
||||
];
|
||||
|
||||
$success = $internal_user->update($user['id'], $user);
|
||||
echo json_encode(['id' => $user['id']]);
|
||||
|
||||
exit($success ? 0 : 1);
|
||||
|
|
|
|||
|
|
@ -20,25 +20,25 @@ class Quota extends StandardController
|
|||
*
|
||||
* @param int $id_user : User id
|
||||
* @param int $credit : Credit for this quota
|
||||
* @param int $additional : Additionals credits
|
||||
* @param bool $report_unused : Should unused credits be re-credited
|
||||
* @param bool $report_unused_additional : Should unused additional credits be re-credited
|
||||
* @param bool $auto_renew : Should the quota be automatically renewed after expiration_date
|
||||
* @param string $renew_interval : Period to use for setting new expiration_date on renewal (format ISO_8601#Durations)
|
||||
* @param \DateTime $start_date : Starting date for the quota
|
||||
* @param ?\DateTime $expiration_date (optional) : Ending date for the quota
|
||||
* @param bool $auto_renew (optional) : Should the quota be automatically renewed after expiration_date
|
||||
* @param ?\DateInterval $renew_interval (optional) : Period to use for setting expiration_date on renewal
|
||||
* @param int $additional (optional) : Additionals credits
|
||||
* @param \DateTime $expiration_date : Ending date for the quota
|
||||
*
|
||||
* @return mixed bool|int : False if cannot create smsstop, id of the new smsstop else
|
||||
* @return mixed bool|int : False if cannot create quota, id of the new quota else
|
||||
*/
|
||||
public function create(int $id_user, int $credit, bool $report_unused, bool $report_unused_additional, \DateTime $start_date, ?\DateTime $expiration_date = null, bool $auto_renew= false, ?\DateInterval $renew_interval = null, int $additional = 0)
|
||||
public function create(int $id_user, int $credit, int $additional, bool $report_unused, bool $report_unused_additional, bool $auto_renew, string $renew_interval, \DateTime $start_date, \DateTime $expiration_date)
|
||||
{
|
||||
$quota = [
|
||||
'id_user' => $id_user,
|
||||
'credit' => $credit,
|
||||
'report_unused' => $report_unused,
|
||||
'report_unused_additional' => $report_unused_additional,
|
||||
'start_date' => $start_date,
|
||||
'expiration_date' => $expiration_date,
|
||||
'start_date' => $start_date->format('Y-m-d H:i:s'),
|
||||
'expiration_date' => $expiration_date->format('Y-m-d H:i:s'),
|
||||
'auto_renew' => $auto_renew,
|
||||
'renew_interval' => $renew_interval,
|
||||
'additional' => $additional,
|
||||
|
|
@ -52,35 +52,13 @@ class Quota extends StandardController
|
|||
*
|
||||
*
|
||||
* @param int $id_user : User id
|
||||
* @param int $id_quota : Id of the quota to update
|
||||
* @param int $credit : Credit for this quota
|
||||
* @param bool $report_unused : Should unused credits be re-credited
|
||||
* @param bool $report_unused_additional : Should unused additional credits be re-credited
|
||||
* @param \DateTime $start_date : Starting date for the quota
|
||||
* @param ?\DateTime $expiration_date (optional) : Ending date for the quota
|
||||
* @param bool $auto_renew (optional) : Should the quota be automatically renewed after expiration_date
|
||||
* @param ?string $renew_interval (optional) : Period to use for setting expiration_date on renewal
|
||||
* @param int $additional (optional) : Additionals credits
|
||||
* @param int $consumed (optional) : Number of consumed credits
|
||||
* @param int $id_quota : Quota to update id
|
||||
* @param array $quota : Fields to update whith new values
|
||||
*
|
||||
* @return mixed bool|int : False if cannot create smsstop, id of the new smsstop else
|
||||
* @return int : number of updated lines
|
||||
*/
|
||||
public function update_for_user(int $id_user, int $id_quota, int $credit, bool $report_unused, bool $report_unused_additional, \DateTime $start_date, ?\DateTime $expiration_date = null, bool $auto_renew= false, ?string $renew_interval = null, int $additional = 0, int $consumed = 0)
|
||||
public function update_for_user(int $id_user, $id_quota, array $quota)
|
||||
{
|
||||
$expiration_date = $expiration_date === null ? $expiration_date : $expiration_date->format('Y-m-d H:i:s');
|
||||
|
||||
$quota = [
|
||||
'credit' => $credit,
|
||||
'report_unused' => $report_unused,
|
||||
'report_unused_additional' => $report_unused_additional,
|
||||
'start_date' => $start_date->format('Y-m-d H:i:s'),
|
||||
'expiration_date' => $expiration_date,
|
||||
'auto_renew' => $auto_renew,
|
||||
'renew_interval' => $renew_interval,
|
||||
'additional' => $additional,
|
||||
'consumed' => $consumed,
|
||||
];
|
||||
|
||||
return $this->get_model()->update_for_user($id_user, $id_quota, $quota);
|
||||
}
|
||||
|
||||
|
|
@ -266,7 +244,14 @@ class Quota extends StandardController
|
|||
$report += $unused_additional;
|
||||
}
|
||||
|
||||
$success = $this->update_for_user($user['id'], $quota['id'], $quota['credit'], $quota['report_unused'], $quota['report_unused_additional'], $new_start_date, $new_expiration_date, $quota['auto_renew'], $quota['renew_interval'], $report, 0);
|
||||
$updated_fields = [
|
||||
'start_date' => $new_start_date->format('Y-m-d H:i:s'),
|
||||
'expiration_date' => $new_expiration_date->format('Y-m-d H:i:s'),
|
||||
'additional' => $report,
|
||||
'consumed' => 0,
|
||||
];
|
||||
|
||||
$success = $this->update_for_user($user['id'], $quota['id'], $updated_fields);
|
||||
|
||||
if (!$success)
|
||||
{
|
||||
|
|
@ -279,6 +264,18 @@ class Quota extends StandardController
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the quota for a user if it exists.
|
||||
*
|
||||
* @param int $id_user : user id
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function get_user_quota(int $id_user)
|
||||
{
|
||||
return $this->get_model()->get_user_quota($id_user);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the model for the Controller.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -145,6 +145,27 @@ namespace controllers\internals;
|
|||
return $objectDate && $objectDate->format($format) === $date;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a sting represent a valid PHP period for creating an interval.
|
||||
*
|
||||
* @param string $period : Period string to check
|
||||
*
|
||||
* @return bool : True if valid period, false else
|
||||
*/
|
||||
public static function validate_period($period)
|
||||
{
|
||||
try
|
||||
{
|
||||
$interval = new \DateInterval($period);
|
||||
}
|
||||
catch (\Throwable $e)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cette fonction retourne un mot de passe généré aléatoirement.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ namespace controllers\internals;
|
|||
*/
|
||||
class User extends \descartes\InternalController
|
||||
{
|
||||
private $bdd;
|
||||
private $model_user;
|
||||
private $internal_event;
|
||||
private $internal_setting;
|
||||
|
|
@ -23,12 +24,25 @@ namespace controllers\internals;
|
|||
|
||||
public function __construct(\PDO $bdd)
|
||||
{
|
||||
$this->bdd = $bdd;
|
||||
$this->model_user = new \models\User($bdd);
|
||||
$this->internal_event = new \controllers\internals\Event($bdd);
|
||||
$this->internal_setting = new \controllers\internals\Setting($bdd);
|
||||
$this->internal_phone = new Phone($bdd);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a list of users by their ids
|
||||
*
|
||||
* @param array $ids : ids of entries to find
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function gets_in_by_id(array $ids)
|
||||
{
|
||||
return $this->model_user->gets_in_by_id($ids);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return list of users as an array.
|
||||
*
|
||||
|
|
@ -180,27 +194,56 @@ namespace controllers\internals;
|
|||
/**
|
||||
* Update a user by his id.
|
||||
*
|
||||
* @param mixed $id
|
||||
* @param mixed $email
|
||||
* @param mixed $password
|
||||
* @param mixed $admin
|
||||
* @param mixed $api_key
|
||||
* @param string $status : User status
|
||||
* @param bool $encrypt_password : Should the password be encrypted, by default true
|
||||
* @param mixed $id : User id
|
||||
* @param array $user : Array of fields to update for user
|
||||
* @param mixed (?array|bool) $quota : Quota to update for the user, by default null -> no update, if false, remove quota
|
||||
*
|
||||
* @return int : Number of modified user
|
||||
* @return bool : True on success, false on error
|
||||
*/
|
||||
public function update($id, $email, $password, $admin, $api_key, $status, bool $encrypt_password = true)
|
||||
public function update($id, array $user, $quota = null)
|
||||
{
|
||||
$user = [
|
||||
'email' => $email,
|
||||
'password' => $encrypt_password ? password_hash($password, PASSWORD_DEFAULT) : $password,
|
||||
'admin' => $admin,
|
||||
'api_key' => $api_key,
|
||||
'status' => $status,
|
||||
];
|
||||
$internal_quota = new Quota($this->bdd);
|
||||
$current_quota = $internal_quota->get_user_quota($id);
|
||||
|
||||
return $this->model_user->update($id, $user);
|
||||
$this->bdd->beginTransaction();
|
||||
|
||||
$this->model_user->update($id, $user);
|
||||
|
||||
if ($current_quota && $quota === false)
|
||||
{
|
||||
$success = $internal_quota->delete_for_user($id, $current_quota['id']);
|
||||
if (!$success)
|
||||
{
|
||||
$this->bdd->rollback();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if ($quota)
|
||||
{
|
||||
if ($current_quota)
|
||||
{
|
||||
$internal_quota->update_for_user($id, $current_quota['id'], $quota);
|
||||
}
|
||||
else
|
||||
{
|
||||
$success = $internal_quota->create($id, $quota['credit'], $quota['additional'], $quota['report_unused'], $quota['report_unused_additional'], $quota['auto_renew'], $quota['renew_interval'], new \DateTime($quota['start_date']), new \DateTime($quota['expiration_date']));
|
||||
if (!$success)
|
||||
{
|
||||
$this->bdd->rollback();
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!$this->bdd->commit())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -212,10 +255,11 @@ namespace controllers\internals;
|
|||
* @param ?string $api_key : The api key of the user, if null generate randomly
|
||||
* @param string $status : User status, default \models\User::STATUS_ACTIVE
|
||||
* @param bool $encrypt_password : Should the password be encrypted, by default true
|
||||
* @param ?array $quota : Quota to create for the user, by default null -> no quota
|
||||
*
|
||||
* @return mixed bool|int : false on error, id of the new user else
|
||||
*/
|
||||
public function create($email, $password, $admin, ?string $api_key = null, string $status = \models\User::STATUS_ACTIVE, bool $encrypt_password = true)
|
||||
public function create($email, $password, $admin, ?string $api_key = null, string $status = \models\User::STATUS_ACTIVE, bool $encrypt_password = true, ?array $quota = null)
|
||||
{
|
||||
$user = [
|
||||
'email' => $email,
|
||||
|
|
@ -225,22 +269,42 @@ namespace controllers\internals;
|
|||
'status' => $status,
|
||||
];
|
||||
|
||||
$new_id_user = $this->model_user->insert($user);
|
||||
$this->bdd->beginTransaction();
|
||||
|
||||
$new_id_user = $this->model_user->insert($user);
|
||||
if (!$new_id_user)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
$success = $this->internal_setting->create_defaults_for_user($new_id_user);
|
||||
|
||||
$success = $this->internal_setting->create_defaults_for_user($new_id_user);
|
||||
if (!$success)
|
||||
{
|
||||
$this->delete($new_id_user);
|
||||
$this->bdd->rollback();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if ($quota !== null)
|
||||
{
|
||||
$internal_quota = new Quota($this->bdd);
|
||||
$success = $internal_quota->create($new_id_user, $quota['credit'], $quota['additional'], $quota['report_unused'], $quota['report_unused_additional'], $quota['auto_renew'], $quota['renew_interval'], $quota['start_date'], $quota['expiration_date']);
|
||||
if (!$success)
|
||||
{
|
||||
$this->bdd->rollback();
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!$this->bdd->commit())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return $new_id_user;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ namespace controllers\publics;
|
|||
class User extends \descartes\Controller
|
||||
{
|
||||
private $internal_user;
|
||||
private $internal_quota;
|
||||
|
||||
/**
|
||||
* Cette fonction est appelée avant toute les autres :
|
||||
|
|
@ -28,6 +29,7 @@ class User extends \descartes\Controller
|
|||
{
|
||||
$bdd = \descartes\Model::_connect(DATABASE_HOST, DATABASE_NAME, DATABASE_USER, DATABASE_PASSWORD);
|
||||
$this->internal_user = new \controllers\internals\User($bdd);
|
||||
$this->internal_quota = new \controllers\internals\Quota($bdd);
|
||||
|
||||
\controllers\internals\Tool::verifyconnect();
|
||||
|
||||
|
|
@ -58,7 +60,7 @@ class User extends \descartes\Controller
|
|||
/**
|
||||
* Update status of users.
|
||||
*
|
||||
* @param array int $_GET['ids'] : User ids
|
||||
* @param array int $_GET['user_ids'] : User ids
|
||||
* @param mixed $csrf
|
||||
* @param int $status : 1 -> active, 0 -> suspended
|
||||
*
|
||||
|
|
@ -82,7 +84,7 @@ class User extends \descartes\Controller
|
|||
$status = \models\User::STATUS_ACTIVE;
|
||||
}
|
||||
|
||||
$ids = $_GET['ids'] ?? [];
|
||||
$ids = $_GET['user_ids'] ?? [];
|
||||
foreach ($ids as $id)
|
||||
{
|
||||
$this->internal_user->update_status($id, $status);
|
||||
|
|
@ -94,7 +96,7 @@ class User extends \descartes\Controller
|
|||
/**
|
||||
* Cette fonction va supprimer une liste de users.
|
||||
*
|
||||
* @param array int $_GET['ids'] : Les id des useres à supprimer
|
||||
* @param array int $_GET['user_ids'] : Les id des useres à supprimer
|
||||
* @param mixed $csrf
|
||||
*
|
||||
* @return boolean;
|
||||
|
|
@ -115,7 +117,7 @@ class User extends \descartes\Controller
|
|||
return $this->redirect(\descartes\Router::url('User', 'list'));
|
||||
}
|
||||
|
||||
$ids = $_GET['ids'] ?? [];
|
||||
$ids = $_GET['user_ids'] ?? [];
|
||||
foreach ($ids as $id)
|
||||
{
|
||||
$this->internal_user->delete($id);
|
||||
|
|
@ -130,24 +132,27 @@ class User extends \descartes\Controller
|
|||
public function add()
|
||||
{
|
||||
$now = new \DateTime();
|
||||
$now_plus_one_month = clone $now;
|
||||
$now_plus_one_month->add(new \DateInterval('P1M'));
|
||||
|
||||
$now = $now->format('Y-m-d H:i:00');
|
||||
$now_plus_one_month = $now_plus_one_month->format('Y-m-d H:i:00');
|
||||
|
||||
return $this->render('user/add', ['now' => $now, 'now_plus_one_month' => $now_plus_one_month]);
|
||||
return $this->render('user/add', ['now' => $now]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Cette fonction insert un nouveau user.
|
||||
*
|
||||
* @param $csrf : Le jeton CSRF
|
||||
* @param string $_POST['email'] : L'email de l'utilisateur
|
||||
* @param string $_POST['email_confirm'] : Verif de l'email de l'utilisateur
|
||||
* @param optional string $_POST['password'] : Le mot de passe de l'utilisateur (si vide, généré automatiquement)
|
||||
* @param optional string $_POST['password_confirm'] : Confirmation du mot de passe de l'utilisateur
|
||||
* @param optional boolean $_POST['admin'] : Si vrai, l'utilisateur est admin, si vide non
|
||||
* @param string $_POST['email'] : User email
|
||||
* @param optional string $_POST['password'] : User password, (if empty the password is randomly generated)
|
||||
* @param optional boolean $_POST['admin'] : If true user is admin
|
||||
* @param optional boolean $_POST['quota_enable'] : If true create a quota for the user
|
||||
* @param boolean $_POST['quota_enable'] : If true create a quota for the user
|
||||
* @param optional int $_POST['quota_credit'] : credit for quota
|
||||
* @param optional int $_POST['quota_additional'] : additional credit
|
||||
* @param optional string $_POST['quota_start_date'] : quota beginning date
|
||||
* @param optional string $_POST['quota_renewal_interval'] : period to use on renewal to calculate new expiration date. Also use to calculate first expiration date.
|
||||
* @param optional boolean $_POST['quota_auto_renew'] : Should the quota be automatically renewed on expiration
|
||||
* @param optional boolean $_POST['quota_report_unused'] : Should unused credit be reported next month
|
||||
* @param optional boolean $_POST['quota_report_unused_additional'] : Should unused additional credit be transfered next month
|
||||
*/
|
||||
public function create($csrf)
|
||||
{
|
||||
|
|
@ -162,6 +167,15 @@ class User extends \descartes\Controller
|
|||
$password = !empty($_POST['password']) ? $_POST['password'] : \controllers\internals\Tool::generate_password(rand(6, 12));
|
||||
$admin = $_POST['admin'] ?? false;
|
||||
$status = 'active';
|
||||
$quota_enable = $_POST['quota_enable'] ?? false;
|
||||
$quota_credit = $_POST['quota_credit'] ?? false;
|
||||
$quota_additional = $_POST['quota_additional'] ?? false;
|
||||
$quota_start_date = $_POST['quota_start_date'] ?? false;
|
||||
$quota_renew_interval = $_POST['quota_renew_interval'] ?? false;
|
||||
$quota_auto_renew = $_POST['quota_auto_renew'] ?? false;
|
||||
$quota_report_unused = $_POST['quota_report_unused'] ?? false;
|
||||
$quota_report_unused_additional = $_POST['quota_report_unused_additional'] ?? false;
|
||||
|
||||
|
||||
if (!$email)
|
||||
{
|
||||
|
|
@ -177,14 +191,49 @@ class User extends \descartes\Controller
|
|||
return $this->redirect(\descartes\Router::url('User', 'add'));
|
||||
}
|
||||
|
||||
$id_user = $this->internal_user->create($email, $password, $admin);
|
||||
|
||||
//Forge quota for user if needed
|
||||
$quota = null;
|
||||
if ($quota_enable)
|
||||
{
|
||||
$quota = [];
|
||||
$quota['credit'] = (int) $quota_credit;
|
||||
$quota['additional'] = (int) $quota_additional;
|
||||
|
||||
if ($quota_start_date === false || !\controllers\internals\Tool::validate_date($quota_start_date, 'Y-m-d H:i:s'))
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'Vous devez définir une date de début valide pour le quota.');
|
||||
|
||||
return $this->redirect(\descartes\Router::url('User', 'add'));
|
||||
}
|
||||
$quota['start_date'] = new \DateTime($quota_start_date);
|
||||
|
||||
if ($quota_renew_interval === false || !\controllers\internals\Tool::validate_period($quota_renew_interval))
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'Vous devez définir une durée de quota parmis la liste proposée.');
|
||||
|
||||
return $this->redirect(\descartes\Router::url('User', 'add'));
|
||||
}
|
||||
$quota['renew_interval'] = $quota_renew_interval;
|
||||
|
||||
$quota['expiration_date'] = clone $quota['start_date'];
|
||||
$quota['expiration_date']->add(new \DateInterval($quota_renew_interval));
|
||||
|
||||
$quota['auto_renew'] = (bool) $quota_auto_renew;
|
||||
$quota['report_unused'] = (bool) $quota_report_unused;
|
||||
$quota['report_unused_additional'] = (bool) $quota_report_unused_additional;
|
||||
}
|
||||
|
||||
|
||||
$id_user = $this->internal_user->create($email, $password, $admin, null, \models\User::STATUS_ACTIVE, true, $quota);
|
||||
if (!$id_user)
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce user.');
|
||||
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer cet utilisateur.');
|
||||
|
||||
return $this->redirect(\descartes\Router::url('User', 'add'));
|
||||
}
|
||||
|
||||
|
||||
$mailer = new \controllers\internals\Mailer();
|
||||
$email_send = $mailer->enqueue($email, EMAIL_CREATE_USER, ['email' => $email, 'password' => $password]);
|
||||
if (!$email_send)
|
||||
|
|
@ -196,4 +245,145 @@ class User extends \descartes\Controller
|
|||
|
||||
return $this->redirect(\descartes\Router::url('User', 'list'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the edition page for the users
|
||||
*
|
||||
* @param int... $ids : users ids
|
||||
*/
|
||||
public function edit()
|
||||
{
|
||||
$ids = $_GET['user_ids'] ?? [];
|
||||
$id_user = $_SESSION['user']['id'];
|
||||
|
||||
$users = $this->internal_user->gets_in_by_id($ids);
|
||||
|
||||
if (!$users)
|
||||
{
|
||||
return $this->redirect(\descartes\Router::url('User', 'list'));
|
||||
}
|
||||
|
||||
foreach ($users as &$user)
|
||||
{
|
||||
$user['quota'] = $this->internal_quota->get_user_quota($user['id']);
|
||||
}
|
||||
|
||||
$now = new \DateTime();
|
||||
$now = $now->format('Y-m-d H:i:00');
|
||||
|
||||
$this->render('user/edit', [
|
||||
'users' => $users,
|
||||
'now' => $now,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Update a list of users
|
||||
*
|
||||
* @param $csrf : Le jeton CSRF
|
||||
* @param array $_POST['users'] : Array of the users and new values, id as key. Quota may also be defined.
|
||||
*/
|
||||
public function update($csrf)
|
||||
{
|
||||
if (!$this->verify_csrf($csrf))
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'Jeton CSRF invalid !');
|
||||
|
||||
return $this->redirect(\descartes\Router::url('User', 'add'));
|
||||
}
|
||||
|
||||
$users = $_POST['users'] ?? [];
|
||||
foreach ($users as $id_user => $user)
|
||||
{
|
||||
$email = $user['email'] ?? false;
|
||||
$password = !empty($user['password']) ? $user['password'] : null;
|
||||
$admin = $user['admin'] ?? false;
|
||||
|
||||
$quota_enable = $user['quota_enable'] ?? false;
|
||||
$quota_consumed = $user['quota_consumed'] ?? false;
|
||||
$quota_credit = $user['quota_credit'] ?? false;
|
||||
$quota_additional = $user['quota_additional'] ?? false;
|
||||
$quota_start_date = $user['quota_start_date'] ?? false;
|
||||
$quota_renew_interval = $user['quota_renew_interval'] ?? false;
|
||||
$quota_auto_renew = $user['quota_auto_renew'] ?? false;
|
||||
$quota_report_unused = $user['quota_report_unused'] ?? false;
|
||||
$quota_report_unused_additional = $user['quota_report_unused_additional'] ?? false;
|
||||
|
||||
if (!$email)
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'L\'utilisateur #' . (int) $id_user . ' n\'as pas pu être mis à jour car l\'adresse e-mail n\'as pas été fournie.');
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!filter_var($email, FILTER_VALIDATE_EMAIL))
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'L\'utilisateur #' . (int) $id_user . ' n\'as pas pu être mis à jour car l\'adresse e-mail fournie n\'est pas valide.');
|
||||
|
||||
return $this->redirect(\descartes\Router::url('User', 'add'));
|
||||
}
|
||||
|
||||
//Forge quota for user if needed
|
||||
$quota = false;
|
||||
if ($quota_enable)
|
||||
{
|
||||
$quota = [];
|
||||
$quota['credit'] = (int) $quota_credit;
|
||||
$quota['consumed'] = (int) $quota_consumed;
|
||||
$quota['additional'] = (int) $quota_additional;
|
||||
|
||||
if ($quota_start_date === false || !\controllers\internals\Tool::validate_date($quota_start_date, 'Y-m-d H:i:s'))
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'L\'utilisateur #' . (int) $id_user . ' n\'as pas pu être mis à jour car la date de début du quota associé n\'est pas valide.');
|
||||
|
||||
continue;
|
||||
}
|
||||
$quota['start_date'] = new \DateTime($quota_start_date);
|
||||
|
||||
if ($quota_renew_interval === false || !\controllers\internals\Tool::validate_period($quota_renew_interval))
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'L\'utilisateur #' . (int) $id_user . ' n\'as pas pu être mis à jour car la durée du quota associé n\'est pas valide.');
|
||||
|
||||
continue;
|
||||
}
|
||||
$quota['renew_interval'] = $quota_renew_interval;
|
||||
|
||||
$quota['expiration_date'] = clone $quota['start_date'];
|
||||
$quota['expiration_date']->add(new \DateInterval($quota_renew_interval));
|
||||
|
||||
$quota['auto_renew'] = (bool) $quota_auto_renew;
|
||||
$quota['report_unused'] = (bool) $quota_report_unused;
|
||||
$quota['report_unused_additional'] = (bool) $quota_report_unused_additional;
|
||||
|
||||
|
||||
//Format dates
|
||||
$quota['start_date'] = $quota['start_date']->format('Y-m-d H:i:s');
|
||||
$quota['expiration_date'] = $quota['expiration_date']->format('Y-m-d H:i:s');
|
||||
}
|
||||
|
||||
|
||||
$updated_user = [
|
||||
'email' => $email,
|
||||
'admin' => $admin,
|
||||
];
|
||||
|
||||
if ($password)
|
||||
{
|
||||
$updated_user['password'] = $password;
|
||||
}
|
||||
|
||||
$success = $this->internal_user->update($id_user, $updated_user, $quota);
|
||||
if (!$success)
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'L\'utilisateur #' . (int) $id_user . ' n\'as pas pu être mis à jour.');
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
return $this->redirect(\descartes\Router::url('User', 'list'));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,12 +39,13 @@ class AddQuotas extends AbstractMigration
|
|||
->addColumn('report_unused', 'boolean', ['null' => false])
|
||||
->addColumn('report_unused_additional', 'boolean', ['null' => false])
|
||||
->addColumn('auto_renew', 'boolean', ['null' => false, 'default' => false])
|
||||
->addColumn('renew_interval', 'string', ['null' => true, 'default' => NULL])
|
||||
->addColumn('renew_interval', 'string', ['null' => false, 'default' => NULL])
|
||||
->addColumn('start_date', 'datetime', ['null' => false])
|
||||
->addColumn('expiration_date', 'datetime', ['null' => true])
|
||||
->addColumn('expiration_date', 'datetime', ['null' => false])
|
||||
->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP'])
|
||||
->addColumn('updated_at', 'timestamp', ['null' => true, 'update' => 'CURRENT_TIMESTAMP'])
|
||||
->addForeignKey('id_user', 'user', 'id', ['delete' => 'CASCADE', 'update' => 'CASCADE'])
|
||||
->addIndex(['id_user'], ['unique' => true])
|
||||
->create();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,18 @@ namespace models;
|
|||
|
||||
class Quota extends StandardModel
|
||||
{
|
||||
/**
|
||||
* Return the quota for a user if it exists.
|
||||
*
|
||||
* @param int $id_user : user id
|
||||
*
|
||||
* @return array : quota if found, else empty array
|
||||
*/
|
||||
public function get_user_quota(int $id_user)
|
||||
{
|
||||
return $this->_select_one($this->get_table_name(), ['id_user' => $id_user]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get remaining credit for a date
|
||||
* if no quota for this user return max int
|
||||
|
|
@ -168,7 +180,6 @@ namespace models;
|
|||
{
|
||||
$at = $at->format('Y-m-d H:i:s');
|
||||
$where = [
|
||||
'!=expiration_date' => null,
|
||||
'<=expiration_date' => $at,
|
||||
'auto_renew' => true,
|
||||
];
|
||||
|
|
|
|||
|
|
@ -31,6 +31,32 @@ namespace models;
|
|||
return $this->_select_one('user', ['id' => $id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find user by ids
|
||||
* @param array $ids : users ids
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function gets_in_by_id($ids)
|
||||
{
|
||||
if (!$ids)
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
$query = '
|
||||
SELECT * FROM `user`
|
||||
WHERE id ';
|
||||
|
||||
$params = [];
|
||||
|
||||
$generated_in = $this->_generate_in_from_array($ids);
|
||||
$query .= $generated_in['QUERY'];
|
||||
$params = $generated_in['PARAMS'];
|
||||
|
||||
return $this->_run_query($query, $params);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a user using his email.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -145,6 +145,8 @@
|
|||
'add' => '/user/add/',
|
||||
'create' => '/user/create/{csrf}/',
|
||||
'delete' => '/user/delete/{csrf}/',
|
||||
'edit' => '/user/edit/',
|
||||
'update' => '/user/update/{csrf}/',
|
||||
'update_status' => '/user/delete/{status}/{csrf}/',
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
<label>Mot de passe (laissez vide pour générer le mot de passe automatiquement)</label>
|
||||
<div class="form-group input-group">
|
||||
<span class="input-group-addon"><span class="fa fa-lock"></span></span>
|
||||
<input name="password" class="form-control" type="password" placeholder="Mot de passe de l'utilisateur">
|
||||
<input name="password" class="form-control" type="password" placeholder="Mot de passe de l'utilisateur" value="<?php $this->s($_SESSION['previous_http_post']['password'] ?? ''); ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
|
|
@ -74,79 +74,81 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Nombre de SMS disponibles</label>
|
||||
<input name="quota_credit" class="form-control" type="number" required placeholder="Crédit de base" value="<?php $this->s($_SESSION['previous_http_post']['quota_credit'] ?? '') ?>">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>SMS additionels</label>
|
||||
<p class="italic small help">
|
||||
SMS venants s'ajouter au crédit de base. Vous pouvez par exemple utiliser des SMS additionels pour augmenter temporairement la limite de SMS d'un utilisateur.
|
||||
</p>
|
||||
<input name="quota_additional" class="form-control" type="number" required placeholder="Nombre de SMS additionel au crédit de base" value="<?php $this->s($_SESSION['previous_http_post']['quota_additional'] ?? '') ?>">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Date de début du quota</label>
|
||||
<input name="quota_start_date" class="form-control form-datetime auto-width" type="text" required readonly value="<?php $this->s($_SESSION['previous_http_post']['quota_start_date'] ?? $now) ?>">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Durée du quota : </label>
|
||||
<p class="italic small help">
|
||||
Sur quelle durée le quota doit-il s'appliqué. Une fois cette durée passée, le quota sera soit désactivé soit renouvelé automatiquement.
|
||||
</p>
|
||||
<div class="quota-settings hidden">
|
||||
<div class="form-group">
|
||||
<select name="quota_renew_interval" class="form-control" required>
|
||||
<option value="P1D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P1D' ? 'selected' : '' ?>>1 jour</option>
|
||||
<option value="P15D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P15D' ? 'selected' : '' ?>>15 jours</option>
|
||||
<option value="P28D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P28D' ? 'selected' : '' ?>>28 jours</option>
|
||||
<option value="P30D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P30D' ? 'selected' : '' ?>>30 jours</option>
|
||||
<option value="P31D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P31D' ? 'selected' : '' ?>>31 jours</option>
|
||||
<option value="P1W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P1W' ? 'selected' : '' ?>>1 semaine</option>
|
||||
<option value="P2W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P2W' ? 'selected' : '' ?>>2 semaines</option>
|
||||
<option value="P3W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P3W' ? 'selected' : '' ?>>3 semaines</option>
|
||||
<option value="P4W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P4W' ? 'selected' : '' ?>>4 semaines</option>
|
||||
<option value="P1M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P1M' ? 'selected' : '' ?>>1 mois</option>
|
||||
<option value="P2M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P2M' ? 'selected' : '' ?>>2 mois</option>
|
||||
<option value="P3M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P3M' ? 'selected' : '' ?>>3 mois</option>
|
||||
<option value="P6M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P6M' ? 'selected' : '' ?>>6 mois</option>
|
||||
<option value="P9M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P9M' ? 'selected' : '' ?>>9 mois</option>
|
||||
<option value="P12M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P12M' ? 'selected' : '' ?>>12 mois</option>
|
||||
</select>
|
||||
<label>Nombre de SMS disponibles</label>
|
||||
<input name="quota_credit" class="form-control" type="number" required disabled placeholder="Crédit de base" value="<?php $this->s($_SESSION['previous_http_post']['quota_credit'] ?? '') ?>">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Renouveler automatiquement le quota : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, le crédit consommé sera automatiquement remis à zéro et le quota renouvelé pour la même durée à chaque fois qu'il arrivera à sa fin.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="quota_auto_renew" type="radio" value="1" required <?= (isset($_SESSION['previous_http_post']['quota_auto_renew']) && (bool) $_SESSION['previous_http_post']['quota_auto_renew']) ? 'checked' : ''; ?>/> Oui
|
||||
<input name="quota_auto_renew" type="radio" value="0" required <?= (isset($_SESSION['previous_http_post']['quota_auto_renew']) && !(bool) $_SESSION['previous_http_post']['quota_auto_renew']) ? 'checked' : ''; ?>/> Non
|
||||
<label>SMS additionels</label>
|
||||
<p class="italic small help">
|
||||
SMS venants s'ajouter au crédit de base. Vous pouvez par exemple utiliser des SMS additionels pour augmenter temporairement la limite de SMS d'un utilisateur.
|
||||
</p>
|
||||
<input name="quota_additional" class="form-control" type="number" required disabled placeholder="Nombre de SMS additionel au crédit de base" value="<?php $this->s($_SESSION['previous_http_post']['quota_additional'] ?? '') ?>">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Reporter les SMS non consommés à la fin de la période : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, les SMS non consommés serons reportés au mois suivant sous la forme de crédit additionel. Sinon, les SMS non utilisés seront simplement perdus.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="quota_report_unused" type="radio" value="1" required <?= (isset($_SESSION['previous_http_post']['quota_report_unused']) && (bool) $_SESSION['previous_http_post']['quota_report_unused']) ? 'checked' : ''; ?>/> Oui
|
||||
<input name="quota_report_unused" type="radio" value="0" required <?= (isset($_SESSION['previous_http_post']['quota_report_unused']) && !(bool) $_SESSION['previous_http_post']['quota_report_unused']) ? 'checked' : ''; ?>/> Non
|
||||
<label>Date de début du quota</label>
|
||||
<input name="quota_start_date" class="form-control form-datetime auto-width" type="text" required disabled readonly value="<?php $this->s($_SESSION['previous_http_post']['quota_start_date'] ?? $now) ?>">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Reporter les SMS additionels non consommés à la fin de la période : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, les SMS additionels non consommés serons reportés au mois suivant sous la forme de crédit additionel. Sinon, les SMS additionels non utilisés seront simplement perdus.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="quota_report_unused_additional" type="radio" value="1" required <?= (isset($_SESSION['previous_http_post']['quota_report_unused_additional']) && (bool) $_SESSION['previous_http_post']['quota_report_unused_additional']) ? 'checked' : ''; ?>/> Oui
|
||||
<input name="quota_report_unused_additional" type="radio" value="0" required <?= (isset($_SESSION['previous_http_post']['quota_report_unused_additional']) && !(bool) $_SESSION['previous_http_post']['quota_report_unused_additional']) ? 'checked' : ''; ?>/> Non
|
||||
<label>Durée du quota : </label>
|
||||
<p class="italic small help">
|
||||
Sur quelle durée le quota doit-il s'appliqué. Une fois cette durée passée, le quota sera soit désactivé soit renouvelé automatiquement.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<select name="quota_renew_interval" class="form-control" disabled required>
|
||||
<option value="P1D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P1D' ? 'selected' : '' ?>>1 jour</option>
|
||||
<option value="P15D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P15D' ? 'selected' : '' ?>>15 jours</option>
|
||||
<option value="P28D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P28D' ? 'selected' : '' ?>>28 jours</option>
|
||||
<option value="P30D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P30D' ? 'selected' : '' ?>>30 jours</option>
|
||||
<option value="P31D" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P31D' ? 'selected' : '' ?>>31 jours</option>
|
||||
<option value="P1W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P1W' ? 'selected' : '' ?>>1 semaine</option>
|
||||
<option value="P2W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P2W' ? 'selected' : '' ?>>2 semaines</option>
|
||||
<option value="P3W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P3W' ? 'selected' : '' ?>>3 semaines</option>
|
||||
<option value="P4W" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P4W' ? 'selected' : '' ?>>4 semaines</option>
|
||||
<option value="P1M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P1M' ? 'selected' : '' ?>>1 mois</option>
|
||||
<option value="P2M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P2M' ? 'selected' : '' ?>>2 mois</option>
|
||||
<option value="P3M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P3M' ? 'selected' : '' ?>>3 mois</option>
|
||||
<option value="P6M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P6M' ? 'selected' : '' ?>>6 mois</option>
|
||||
<option value="P9M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P9M' ? 'selected' : '' ?>>9 mois</option>
|
||||
<option value="P12M" <?= ($_SESSION['previous_http_post']['quota_renew_interval'] ?? '') == 'P12M' ? 'selected' : '' ?>>12 mois</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Renouveler automatiquement le quota : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, le crédit consommé sera automatiquement remis à zéro et le quota renouvelé pour la même durée à chaque fois qu'il arrivera à sa fin.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="quota_auto_renew" type="radio" value="1" disabled required <?= (isset($_SESSION['previous_http_post']['quota_auto_renew']) && (bool) $_SESSION['previous_http_post']['quota_auto_renew']) ? 'checked' : ''; ?>/> Oui
|
||||
<input name="quota_auto_renew" type="radio" value="0" disabled required <?= (isset($_SESSION['previous_http_post']['quota_auto_renew']) && !(bool) $_SESSION['previous_http_post']['quota_auto_renew']) ? 'checked' : ''; ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Reporter les SMS non consommés à la fin de la période : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, les SMS non consommés serons reportés au mois suivant sous la forme de crédit additionel. Sinon, les SMS non utilisés seront simplement perdus.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="quota_report_unused" type="radio" value="1" disabled required <?= (isset($_SESSION['previous_http_post']['quota_report_unused']) && (bool) $_SESSION['previous_http_post']['quota_report_unused']) ? 'checked' : ''; ?>/> Oui
|
||||
<input name="quota_report_unused" type="radio" value="0" disabled required <?= (isset($_SESSION['previous_http_post']['quota_report_unused']) && !(bool) $_SESSION['previous_http_post']['quota_report_unused']) ? 'checked' : ''; ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Reporter les SMS additionels non consommés à la fin de la période : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, les SMS additionels non consommés serons reportés au mois suivant sous la forme de crédit additionel. Sinon, les SMS additionels non utilisés seront simplement perdus.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="quota_report_unused_additional" type="radio" value="1" disabled required <?= (isset($_SESSION['previous_http_post']['quota_report_unused_additional']) && (bool) $_SESSION['previous_http_post']['quota_report_unused_additional']) ? 'checked' : ''; ?>/> Oui
|
||||
<input name="quota_report_unused_additional" type="radio" value="0" disabled required <?= (isset($_SESSION['previous_http_post']['quota_report_unused_additional']) && !(bool) $_SESSION['previous_http_post']['quota_report_unused_additional']) ? 'checked' : ''; ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
|
@ -171,6 +173,24 @@
|
|||
minuteStep: 1,
|
||||
language: 'fr'
|
||||
});
|
||||
|
||||
jQuery('input[name="quota_enable"]').on('change', function(event)
|
||||
{
|
||||
if (event.target.value == 0)
|
||||
{
|
||||
console.log('disable');
|
||||
jQuery('.quota-settings').addClass('hidden');
|
||||
jQuery('.quota-settings input, .quota-settings select').prop('disabled', true);
|
||||
}
|
||||
else
|
||||
{
|
||||
console.log('enable');
|
||||
jQuery('.quota-settings').removeClass('hidden');
|
||||
jQuery('.quota-settings input, .quota-settings select').prop('disabled', false);
|
||||
}
|
||||
})
|
||||
|
||||
jQuery('input[name="quota_enable"]:checked').trigger('change');
|
||||
});
|
||||
</script>
|
||||
<?php
|
||||
|
|
|
|||
|
|
@ -0,0 +1,202 @@
|
|||
<?php
|
||||
//Template dashboard
|
||||
|
||||
$this->render('incs/head', ['title' => 'Users - Show All'])
|
||||
?>
|
||||
<div id="wrapper">
|
||||
<?php
|
||||
$this->render('incs/nav', ['page' => 'users'])
|
||||
?>
|
||||
<div id="page-wrapper">
|
||||
<div class="container-fluid">
|
||||
<!-- Page Heading -->
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<h1 class="page-header">
|
||||
Nouvel utilisateur
|
||||
</h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<i class="fa fa-dashboard"></i> <a href="<?php echo \descartes\Router::url('Dashboard', 'show'); ?>">Dashboard</a>
|
||||
</li>
|
||||
<li>
|
||||
<i class="fa fa-user"></i> <a href="<?php echo \descartes\Router::url('User', 'list'); ?>">Utilisateurs</a>
|
||||
</li>
|
||||
<li class="active">
|
||||
<i class="fa fa-plus"></i> Nouveau
|
||||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.row -->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title"><i class="fa fa-user fa-fw"></i> Ajout d'un utilisateur</h3>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form action="<?php echo \descartes\Router::url('User', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
|
||||
<?php foreach ($users as $user) { ?>
|
||||
<div class="form-group">
|
||||
<label>Adresse e-mail</label>
|
||||
<div class="form-group input-group">
|
||||
<span class="input-group-addon"><span class="fa fa-at"></span></span>
|
||||
<input name="users[<?php $this->s($user['id']); ?>][email]" class="form-control" type="email" placeholder="Adresse e-mail de l'utilisateur" autofocus required value="<?php $this->s($user['email']) ?>">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Mot de passe (laissez vide pour conserver le mot de passe actuel)</label>
|
||||
<div class="form-group input-group">
|
||||
<span class="input-group-addon"><span class="fa fa-lock"></span></span>
|
||||
<input name="users[<?php $this->s($user['id']); ?>][password]" class="form-control" type="password" placeholder="Mot de passe de l'utilisateur" value="">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Niveau administrateur : </label>
|
||||
<div class="form-group">
|
||||
<input name="users[<?php $this->s($user['id']); ?>][admin]" type="radio" value="1" required <?= ($user['admin'] ? 'checked' : ''); ?>/> Oui
|
||||
<input name="users[<?php $this->s($user['id']); ?>][admin]" type="radio" value="0" required <?= ($user['admin'] ? '' : 'checked'); ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
<fieldset>
|
||||
<legend>Quota de SMS</legend>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Définir un quota pour cet utilisateur : </label>
|
||||
<p class="italic small help">
|
||||
Définir un quota pour un utilisateur vous permet de choisir combien de SMS cet utilisateur pourras envoyer sur une période donnée.
|
||||
</p>
|
||||
|
||||
<div class="form-group">
|
||||
<input class="quota_enable_radio" name="users[<?php $this->s($user['id']); ?>][quota_enable]" type="radio" value="1" required <?= $user['quota'] ? 'checked' : ''; ?>/> Oui
|
||||
<input class="quota_enable_radio" name="users[<?php $this->s($user['id']); ?>][quota_enable]" type="radio" value="0" required <?= $user['quota'] ? '' : 'checked'; ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="quota-settings hidden">
|
||||
<div class="form-group">
|
||||
<label>Nombre de SMS disponibles</label>
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_credit]" class="form-control" type="number" required disabled placeholder="Crédit de base" value="<?php $this->s($user['quota']['credit'] ?? 0) ?>">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Nombre de SMS déjà consommés</label>
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_consumed]" class="form-control" type="number" required disabled placeholder="Crédit déjà consommé" value="<?php $this->s($user['quota']['consumed'] ?? 0) ?>">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>SMS additionels</label>
|
||||
<p class="italic small help">
|
||||
SMS venants s'ajouter au crédit de base. Vous pouvez par exemple utiliser des SMS additionels pour augmenter temporairement la limite de SMS d'un utilisateur.
|
||||
</p>
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_additional]" class="form-control" type="number" required disabled placeholder="Nombre de SMS additionel au crédit de base" value="<?php $this->s($user['quota']['additional'] ?? 0) ?>">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Date de début du quota</label>
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_start_date]" class="form-control form-datetime auto-width" type="text" required disabled readonly value="<?php $this->s($user['quota']['start_date'] ?? $now) ?>">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Durée du quota : </label>
|
||||
<p class="italic small help">
|
||||
Sur quelle durée le quota doit-il s'appliqué. Une fois cette durée passée, le quota sera soit désactivé soit renouvelé automatiquement.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<select name="users[<?php $this->s($user['id']); ?>][quota_renew_interval]" class="form-control" disabled required>
|
||||
<option value="P1D" <?= ($user['quota']['renew_interval'] ?? '') == 'P1D' ? 'selected' : '' ?>>1 jour</option>
|
||||
<option value="P15D" <?= ($user['quota']['renew_interval'] ?? '') == 'P15D' ? 'selected' : '' ?>>15 jours</option>
|
||||
<option value="P28D" <?= ($user['quota']['renew_interval'] ?? '') == 'P28D' ? 'selected' : '' ?>>28 jours</option>
|
||||
<option value="P30D" <?= ($user['quota']['renew_interval'] ?? '') == 'P30D' ? 'selected' : '' ?>>30 jours</option>
|
||||
<option value="P31D" <?= ($user['quota']['renew_interval'] ?? '') == 'P31D' ? 'selected' : '' ?>>31 jours</option>
|
||||
<option value="P1W" <?= ($user['quota']['renew_interval'] ?? '') == 'P1W' ? 'selected' : '' ?>>1 semaine</option>
|
||||
<option value="P2W" <?= ($user['quota']['renew_interval'] ?? '') == 'P2W' ? 'selected' : '' ?>>2 semaines</option>
|
||||
<option value="P3W" <?= ($user['quota']['renew_interval'] ?? '') == 'P3W' ? 'selected' : '' ?>>3 semaines</option>
|
||||
<option value="P4W" <?= ($user['quota']['renew_interval'] ?? '') == 'P4W' ? 'selected' : '' ?>>4 semaines</option>
|
||||
<option value="P1M" <?= ($user['quota']['renew_interval'] ?? '') == 'P1M' ? 'selected' : '' ?>>1 mois</option>
|
||||
<option value="P2M" <?= ($user['quota']['renew_interval'] ?? '') == 'P2M' ? 'selected' : '' ?>>2 mois</option>
|
||||
<option value="P3M" <?= ($user['quota']['renew_interval'] ?? '') == 'P3M' ? 'selected' : '' ?>>3 mois</option>
|
||||
<option value="P6M" <?= ($user['quota']['renew_interval'] ?? '') == 'P6M' ? 'selected' : '' ?>>6 mois</option>
|
||||
<option value="P9M" <?= ($user['quota']['renew_interval'] ?? '') == 'P9M' ? 'selected' : '' ?>>9 mois</option>
|
||||
<option value="P12M" <?= ($user['quota']['renew_interval'] ?? '') == 'P12M' ? 'selected' : '' ?>>12 mois</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Renouveler automatiquement le quota : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, le crédit consommé sera automatiquement remis à zéro et le quota renouvelé pour la même durée à chaque fois qu'il arrivera à sa fin.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_auto_renew]" type="radio" value="1" disabled required <?= (($user['quota']['auto_renew'] ?? false) ? 'checked' : ''); ?>/> Oui
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_auto_renew]" type="radio" value="0" disabled required <?= (($user['quota']['auto_renew'] ?? false) ? '' : 'checked'); ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Reporter les SMS non consommés à la fin de la période : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, les SMS non consommés serons reportés au mois suivant sous la forme de crédit additionel. Sinon, les SMS non utilisés seront simplement perdus.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_report_unused]" type="radio" value="1" disabled required <?= (($user['quota']['report_unused'] ?? false) ? 'checked' : ''); ?>/> Oui
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_report_unused]" type="radio" value="0" disabled required <?= (($user['quota']['report_unused'] ?? false) ? '' : 'checked'); ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Reporter les SMS additionels non consommés à la fin de la période : </label>
|
||||
<p class="italic small help">
|
||||
Si activé, les SMS additionels non consommés serons reportés au mois suivant sous la forme de crédit additionel. Sinon, les SMS additionels non utilisés seront simplement perdus.
|
||||
</p>
|
||||
<div class="form-group">
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_report_unused_additional]" type="radio" value="1" disabled required <?= (($user['quota']['report_unused_additional'] ?? false) ? 'checked' : ''); ?>/> Oui
|
||||
<input name="users[<?php $this->s($user['id']); ?>][quota_report_unused_additional]" type="radio" value="0" disabled required <?= (($user['quota']['report_unused_additional'] ?? false) ? '' : 'checked'); ?>/> Non
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<hr/>
|
||||
<?php } ?>
|
||||
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('User', 'list'); ?>">Annuler</a>
|
||||
<input type="submit" class="btn btn-success" value="Enregistrer le user" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
jQuery(document).ready(function()
|
||||
{
|
||||
jQuery('.form-datetime').datetimepicker(
|
||||
{
|
||||
format: 'yyyy-mm-dd hh:ii:ss',
|
||||
autoclose: true,
|
||||
minuteStep: 1,
|
||||
language: 'fr'
|
||||
});
|
||||
|
||||
jQuery('.quota_enable_radio').on('change', function(event)
|
||||
{
|
||||
if (event.target.value == 0)
|
||||
{
|
||||
jQuery(event.target).parents('fieldset').find('.quota-settings').addClass('hidden');
|
||||
jQuery(event.target).parents('fieldset').find('.quota-settings input, .quota-settings select').prop('disabled', true);
|
||||
}
|
||||
else
|
||||
{
|
||||
jQuery(event.target).parents('fieldset').find('.quota-settings').removeClass('hidden');
|
||||
jQuery(event.target).parents('fieldset').find('.quota-settings input, .quota-settings select').prop('disabled', false);
|
||||
}
|
||||
})
|
||||
|
||||
jQuery('.quota_enable_radio:checked').trigger('change');
|
||||
});
|
||||
</script>
|
||||
<?php
|
||||
$this->render('incs/footer');
|
||||
|
|
@ -57,7 +57,8 @@
|
|||
<strong>Action pour la séléction :</strong>
|
||||
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('User', 'update_status', ['csrf' => $_SESSION['csrf'], 'status' => 0]); ?>"><span class="fa fa-pause"></span> Suspendre</button>
|
||||
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('User', 'update_status', ['csrf' => $_SESSION['csrf'], 'status' => 1]); ?>"><span class="fa fa-play"></span> Activer</button>
|
||||
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('User', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
|
||||
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('User', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>
|
||||
<button class="btn btn-default btn-confirm" type="submit" formaction="<?php echo \descartes\Router::url('User', 'delete', ['csrf' => $_SESSION['csrf']]); ?>"><span class="fa fa-trash-o"></span> Supprimer</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -94,7 +95,7 @@ jQuery(document).ready(function ()
|
|||
{
|
||||
data: 'id',
|
||||
render: function (data, type, row, meta) {
|
||||
return '<input name="ids[]" type="checkbox" value="' + data + '">';
|
||||
return '<input name="user_ids[]" type="checkbox" value="' + data + '">';
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in New Issue