lesanges
/
facturation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Correction bug oubli choix receveur

This commit is contained in:
Jean-Christophe Engel 2024-01-10 18:43:23 +01:00
parent 93c1daeffd
commit a187babbac
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
admin/_facture_common.php
View File

@ -51,7 +51,7 @@ if ( !$target ) {
// Traitement // Traitement
$data=[]; $data=[];
$form->runIf(f('save') && !$form->hasErrors(), $form->runIf(f('save') && !$form->hasErrors(),
function () use ($client, &$data) function () use ($client, &$data, $form)
{ {
try try
{ {
@ -101,6 +101,10 @@ $form->runIf(f('save') && !$form->hasErrors(),
$data['receveur_membre'] = 1; $data['receveur_membre'] = 1;
$data['receveur_id'] = f('membre'); $data['receveur_id'] = f('membre');
} }
else
{
throw new UserException('Vous devez indiquer si le receveur est un client ou un membre');
}
} }
catch(UserException $e) catch(UserException $e)
@ -152,33 +156,36 @@ $form->runIf(f('add_cotis') && !$form->hasErrors(),
} }
}, 'add_cotis_2'); }, 'add_cotis_2');
if ($step) if (! $form->hasErrors())
{ {
try if ($step)
{ {
$liste = $facture->getCotis((int)f('membre_cotis')); try
{
$liste = $facture->getCotis((int)f('membre_cotis'));
}
catch (UserException $e)
{
$form->addError($e->getMessage());
}
} }
catch (UserException $e) elseif (count($data) > 0)
{ {
$form->addError($e->getMessage()); if ($target)
{
$id = $facture->add($data, $plugin->getConfig('pattern'));
Utils::redirect(PLUGIN_ADMIN_URL . 'facture.php?id='.(int)$id);
}
else
{
if ($facture->edit($id, $data))
{
Utils::redirect(PLUGIN_ADMIN_URL . 'facture.php?id='.(int)$id);
}
throw new UserException('Erreur d\'édition du reçu');
}
} }
} }
elseif (count($data) > 0)
{
if ($target)
{
$id = $facture->add($data, $plugin->getConfig('pattern'));
Utils::redirect(PLUGIN_ADMIN_URL . 'facture.php?id='.(int)$id);
}
else
{
if ($facture->edit($id, $data))
{
Utils::redirect(PLUGIN_ADMIN_URL . 'facture.php?id='.(int)$id);
}
throw new UserException('Erreur d\'édition du reçu');
}
}
// Affichage // Affichage