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

Amélioration contrôles saisie facture

Browse Source
This commit is contained in:
Jean-Christophe Engel 2025-02-26 11:02:45 +01:00
parent 6e2ee31670
commit f63f3b6ecd
2 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
admin/_facture_common.php
View File

@ -94,10 +94,15 @@ $form->runIf(f('save') && !$form->hasErrors(),
$data['type_facture'] = f('type');
if (in_array(f('type'), [DEVIS, FACT]))
{
foreach(f('designation') as $k=>$value)
foreach(f('designation') as $k=>$value)
{
if ($value != '' && f('prix')[$k] == null) {
if (empty($value) && f('prix')[$k] != null) {
throw new UserException("Il manque la désignation de la ligne " . $k+1 . " !!");
}
elseif ($value != '' && f('prix')[$k] == null) {
throw new UserException('Il manque le prix sur la ligne '. $k+1 . ' !!');
} elseif (empty($value) && f('prix')[$k] == null) {
continue;
}
$data['contenu'][$k]['designation'] = $value;
@ -106,6 +111,9 @@ $form->runIf(f('save') && !$form->hasErrors(),
}
$data['total'] = $data['toto'];
unset($data['toto']);
if (! isset($data['contenu'])) {
throw new UserException("Aucune désignation ni aucun prix saisi !!");
}
}
elseif ( f('type') == CERFA )
{
@ -142,45 +150,45 @@ $form->runIf(f('save') && !$form->hasErrors(),
$form->runIf(f('select_cotis') && !$form->hasErrors(),
function () use ($step)
{
$step = true;
}, 'add_cotis_1');
{
$step = true;
}, 'add_cotis_1');
$form->runIf(f('add_cotis') && !$form->hasErrors(),
function () use ($radio, $fields, $facture, $form)
{
$radio['type'] = f('cotisation');
try
{
$num = (int) str_replace('cotis_', '', $radio['type']);
foreach($fields as $field)
{
$cotis[$field] = f($field.'_'.$num);
}
{
$radio['type'] = f('cotisation');
try
{
$num = (int) str_replace('cotis_', '', $radio['type']);
foreach($fields as $field)
{
$cotis[$field] = f($field.'_'.$num);
}
$r = $facture->getCotis(f('membre_cotis'), $cotis['id']);
$r = $r[0];
$r = $facture->getCotis(f('membre_cotis'), $cotis['id']);
$r = $r[0];
$data = [
'type_facture' => COTIS,
'numero' => f('numero_facture'),
'receveur_membre' => 1,
'receveur_id' => f('membre_cotis'),
'date_emission' => f('date_emission'),
'moyen_paiement' => 'AU',
'total' => $r->paid_amount ?? $r->amount,
'contenu' => ['id' => $cotis['id'],
'intitule' => $cotis['label'],
'souscription' => $cotis['date'],
'expiration' => $cotis['expiry'] ]
];
$data = [
'type_facture' => COTIS,
'numero' => f('numero_facture'),
'receveur_membre' => 1,
'receveur_id' => f('membre_cotis'),
'date_emission' => f('date_emission'),
'moyen_paiement' => 'AU',
'total' => $r->paid_amount ?? $r->amount,
'contenu' => ['id' => $cotis['id'],
'intitule' => $cotis['label'],
'souscription' => $cotis['date'],
'expiration' => $cotis['expiry'] ]
];
}
catch (UserException $e)
{
$form->addError($e->getMessage());
}
}, 'add_cotis_2');
}
catch (UserException $e)
{
$form->addError($e->getMessage());
}
}, 'add_cotis_2');
if (! $form->hasErrors())
{
@ -314,8 +322,10 @@ if (in_array($radio['type'], [DEVIS, FACT]))
}
}
else {
$designations = ['Exemple'];
$prix = [250];
/*
$designations = ['Exemple'];
$prix = [250];
*/
}
}

7
lib/Facture.php
View File

@ -144,10 +144,13 @@ class Facture
unset($datas[$k]['prix']);
continue;
}
elseif (empty($r['prix']))
elseif (! is_numeric($r['prix']) && empty($r['prix']))
{
$datas[$k]['prix'] = 0;
}
elseif (empty($r['designation'])) {
throw new UserException("Une au moins des désignations est absente.");
}
if (!is_int($r['prix']))
{
@ -157,7 +160,7 @@ class Facture
$total += $r['prix'];
}
if($fac && !$total)
if ($fac && count($datas['contenu']) == 0)
{
throw new UserException("Toutes les désignations/prix sont vides.");
}