mirror of
https://github.com/RaspbianFrance/raspisms.git
synced 2025-06-06 14:46:27 +02:00
Add phone limit creation to phone creation
This commit is contained in:
parent
fd1e7b5519
commit
298bba0c39
8 changed files with 231 additions and 21 deletions
|
@ -535,7 +535,7 @@ namespace controllers\publics;
|
|||
return $this->json($return);
|
||||
}
|
||||
|
||||
$name_exist = $this->internal_phone->get_by_name($name);
|
||||
$name_exist = $this->internal_phone->get_by_name_and_user($this->user['id'], $name);
|
||||
if ($name_exist)
|
||||
{
|
||||
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
|
||||
|
@ -683,7 +683,7 @@ namespace controllers\publics;
|
|||
}
|
||||
|
||||
|
||||
$phone_with_same_name = $this->internal_phone->get_by_name($name);
|
||||
$phone_with_same_name = $this->internal_phone->get_by_name_and_user($this->user['id'], $name);
|
||||
if ($phone_with_same_name && $phone_with_same_name['id'] != $phone['id'])
|
||||
{
|
||||
$return['error'] = self::ERROR_CODES['INVALID_PARAMETER'];
|
||||
|
|
|
@ -131,9 +131,10 @@ class Phone extends \descartes\Controller
|
|||
* Create a new phone.
|
||||
*
|
||||
* @param $csrf : CSRF token
|
||||
* @param string $_POST['name'] : Phone name
|
||||
* @param string $_POST['adapter'] : Phone adapter
|
||||
* @param array $_POST['adapter_data'] : Phone adapter data
|
||||
* @param string $_POST['name'] : Phone name
|
||||
* @param string $_POST['adapter'] : Phone adapter
|
||||
* @param ?array $_POST['adapter_data'] : Phone adapter data
|
||||
* @param ?array $_POST['limits'] : Limits in number of SMS for a period to be applied to this phone.
|
||||
*/
|
||||
public function create($csrf)
|
||||
{
|
||||
|
@ -148,6 +149,8 @@ class Phone extends \descartes\Controller
|
|||
$name = $_POST['name'] ?? false;
|
||||
$adapter = $_POST['adapter'] ?? false;
|
||||
$adapter_data = !empty($_POST['adapter_data']) ? $_POST['adapter_data'] : [];
|
||||
$limits = $_POST['limits'] ?? [];
|
||||
$limits = is_array($limits) ? $limits : [$limits];
|
||||
|
||||
if (!$name || !$adapter)
|
||||
{
|
||||
|
@ -156,7 +159,7 @@ class Phone extends \descartes\Controller
|
|||
return $this->redirect(\descartes\Router::url('Phone', 'add'));
|
||||
}
|
||||
|
||||
$name_exist = $this->internal_phone->get_by_name($name);
|
||||
$name_exist = $this->internal_phone->get_by_name_and_user($id_user, $name);
|
||||
if ($name_exist)
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'Ce nom est déjà utilisé pour un autre téléphone.');
|
||||
|
@ -164,6 +167,30 @@ class Phone extends \descartes\Controller
|
|||
return $this->redirect(\descartes\Router::url('Phone', 'add'));
|
||||
}
|
||||
|
||||
if ($limits)
|
||||
{
|
||||
foreach ($limits as $key => $limit)
|
||||
{
|
||||
$startpoint = $limit['startpoint'] ?? false;
|
||||
$volume = $limit['volume'] ?? false;
|
||||
|
||||
if (!$startpoint || !$volume)
|
||||
{
|
||||
unset($limits[$key]);
|
||||
continue;
|
||||
}
|
||||
|
||||
$volume = (int) $volume;
|
||||
$limits[$key]['volume'] = max($volume, 1);
|
||||
|
||||
if (!\controllers\internals\Tool::validate_relative_date($startpoint))
|
||||
{
|
||||
unset($limits[$key]);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$adapters = $this->internal_adapter->list_adapters();
|
||||
$find_adapter = false;
|
||||
foreach ($adapters as $metas)
|
||||
|
@ -245,7 +272,7 @@ class Phone extends \descartes\Controller
|
|||
return $this->redirect(\descartes\Router::url('Phone', 'add'));
|
||||
}
|
||||
|
||||
$success = $this->internal_phone->create($id_user, $name, $adapter, $adapter_data);
|
||||
$success = $this->internal_phone->create($id_user, $name, $adapter, $adapter_data, $limits);
|
||||
if (!$success)
|
||||
{
|
||||
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce téléphone.');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue