From c3da50df044a58d664840a3d13316b883d4bf721 Mon Sep 17 00:00:00 2001 From: Noizette Date: Mon, 31 Jan 2022 20:00:45 +0100 Subject: [PATCH] Fix indent --- www/admin/facture_ajouter.php | 282 ++++++++++++++++---------------- www/admin/facture_modifier.php | 288 ++++++++++++++++----------------- 2 files changed, 285 insertions(+), 285 deletions(-) diff --git a/www/admin/facture_ajouter.php b/www/admin/facture_ajouter.php index 2e9dbfb..10e6bf4 100644 --- a/www/admin/facture_ajouter.php +++ b/www/admin/facture_ajouter.php @@ -27,14 +27,14 @@ $doc = null; $require_number = $plugin->getConfig('pattern') ? false : true; if (qg('copy') !== null && $f = $facture->get((int)qg('copy'))) { - $doc = (array) $f; + $doc = (array) $f; - // Copié depuis facture_modifier.php - $doc['type'] = $f->type_facture; - $doc['numero_facture'] = ''; - $doc['base_receveur'] = $f->receveur_membre ? 'membre' : 'client'; - $doc['client'] = $f->receveur_id; - $doc['membre'] = $f->receveur_id; + // Copié depuis facture_modifier.php + $doc['type'] = $f->type_facture; + $doc['numero_facture'] = ''; + $doc['base_receveur'] = $f->receveur_membre ? 'membre' : 'client'; + $doc['client'] = $f->receveur_id; + $doc['membre'] = $f->receveur_id; if ( $f->type_facture == CERFA ) { $doc['forme_don'] = $f->contenu['forme']; @@ -60,43 +60,43 @@ $tpl->assign('textes_don', $facture->listTextesCerfa()); if (f('save')) { - $form->check($csrf_key, [ - 'type' => 'required|in:'.implode(',', [DEVIS, FACT, CERFA]), - 'numero_facture' => $require_number ? 'required|string' : 'string', - 'date_emission' => 'required|date_format:d/m/Y', - 'date_echeance' => 'required|date_format:d/m/Y', - // 'reglee' => '', - // 'archivee' => '', - 'base_receveur' => 'required|in:membre,client', - // 'client' => '', - // 'membre' => '', - 'moyen_paiement' => 'required|in:' . implode(',', array_keys($moyens_paiement)), - 'designation' => 'array|required', - 'prix' => 'array|required' - ]); + $form->check($csrf_key, [ + 'type' => 'required|in:'.implode(',', [DEVIS, FACT, CERFA]), + 'numero_facture' => $require_number ? 'required|string' : 'string', + 'date_emission' => 'required|date_format:d/m/Y', + 'date_echeance' => 'required|date_format:d/m/Y', + // 'reglee' => '', + // 'archivee' => '', + 'base_receveur' => 'required|in:membre,client', + // 'client' => '', + // 'membre' => '', + 'moyen_paiement' => 'required|in:' . implode(',', array_keys($moyens_paiement)), + 'designation' => 'array|required', + 'prix' => 'array|required' + ]); - if (!$form->hasErrors()) - { - try - { - if ( count(f('designation')) !== count(f('prix')) ) - { - throw new UserException('Nombre de désignations et de prix reçus différent.'); - } + if (!$form->hasErrors()) + { + try + { + if ( count(f('designation')) !== count(f('prix')) ) + { + throw new UserException('Nombre de désignations et de prix reçus différent.'); + } - $truc = [ - 'numero' => f('numero_facture'), - 'date_emission' => f('date_emission'), - 'date_echeance' => f('date_echeance'), - 'reglee' => f('reglee') == 1?1:0, - 'archivee' => f('archivee') == 1?1:0, - 'moyen_paiement' => f('moyen_paiement'), - 'toto' => 0 - ]; - $truc['type_facture'] = f('type'); - if (in_array(f('type'), [DEVIS, FACT])) - { - + $truc = [ + 'numero' => f('numero_facture'), + 'date_emission' => f('date_emission'), + 'date_echeance' => f('date_echeance'), + 'reglee' => f('reglee') == 1?1:0, + 'archivee' => f('archivee') == 1?1:0, + 'moyen_paiement' => f('moyen_paiement'), + 'toto' => 0 + ]; + $truc['type_facture'] = f('type'); + if (in_array(f('type'), [DEVIS, FACT])) + { + foreach(f('designation') as $k=>$value) { @@ -109,7 +109,7 @@ if (f('save')) } elseif (f('type') == CERFA) { - $truc['moyen_paiement'] = f('moyen_paiement2'); + $truc['moyen_paiement'] = f('moyen_paiement2'); $truc['contenu'] = [ 'forme' => f('forme_don'), 'nature' => f('nature_don'), @@ -117,100 +117,100 @@ if (f('save')) unset($truc['toto']); $truc['total'] = Utils::moneyToInteger(f('total')); } - if (f('base_receveur') == 'client') - { - $truc['receveur_membre'] = 0; - $truc['receveur_id'] = f('client'); - } - elseif (f('base_receveur') == 'membre') - { - $truc['receveur_membre'] = 1; - $truc['receveur_id'] = f('membre'); - } + if (f('base_receveur') == 'client') + { + $truc['receveur_membre'] = 0; + $truc['receveur_id'] = f('client'); + } + elseif (f('base_receveur') == 'membre') + { + $truc['receveur_membre'] = 1; + $truc['receveur_id'] = f('membre'); + } - $id = $facture->add($truc, $plugin->getConfig('pattern')); + $id = $facture->add($truc, $plugin->getConfig('pattern')); - Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); + Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); - } - catch(UserException $e) - { - $form->addError($e->getMessage()); - } + } + catch(UserException $e) + { + $form->addError($e->getMessage()); + } } } elseif (f('select_cotis')) { - $form->check('add_cotis_1',[ - 'numero_facture' => 'required|string', - 'date_emission' => 'required|date_format:d/m/Y', - 'membre_cotis' => 'required|numeric', - ]); + $form->check('add_cotis_1',[ + 'numero_facture' => 'required|string', + 'date_emission' => 'required|date_format:d/m/Y', + 'membre_cotis' => 'required|numeric', + ]); - $step = true; + $step = true; } elseif (f('add_cotis')) { - $form->check('add_cotis_2',[ - 'numero_facture' => 'required|string', - 'date_emission' => 'required|date_format:d/m/Y', - 'membre_cotis' => 'required|numeric', - 'cotisation' => 'required', - ]); + $form->check('add_cotis_2',[ + 'numero_facture' => 'required|string', + 'date_emission' => 'required|date_format:d/m/Y', + 'membre_cotis' => 'required|numeric', + 'cotisation' => 'required', + ]); - $radio['type'] = f('cotisation'); - - if (!$form->hasErrors()) - { - 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]; + $radio['type'] = f('cotisation'); + + if (!$form->hasErrors()) + { + 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]; - $data = [ - 'type_facture' => COTIS, - 'numero' => f('numero_facture'), - 'receveur_membre' => 1, - 'receveur_id' => f('membre_cotis'), - 'date_emission' => f('date_emission'), - 'moyen_paiement' => f('moyen_paiement'), - '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' => f('moyen_paiement'), + 'total' => $r->paid_amount ?? $r->amount, + 'contenu' => ['id' => $cotis['id'], + 'intitule' => $cotis['label'], + 'souscription' => $cotis['date'], + 'expiration' => $cotis['expiry'] ] + ]; - $id = $facture->add($data, $plugin->getConfig('pattern')); + $id = $facture->add($data, $plugin->getConfig('pattern')); - Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); - } - catch (UserException $e) - { - $form->addError($e->getMessage()); - } - } + Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); + } + catch (UserException $e) + { + $form->addError($e->getMessage()); + } + } - $step = true; + $step = true; } if ($step) { - try - { - $liste = $facture->getCotis((int)f('membre_cotis')); - } - catch (UserException $e) - { - $form->addError($e->getMessage()); - } + try + { + $liste = $facture->getCotis((int)f('membre_cotis')); + } + catch (UserException $e) + { + $form->addError($e->getMessage()); + } } @@ -218,18 +218,18 @@ $type = qg('t') ? (int) qg('t') : null; if (in_array($type, [DEVIS, FACT, CERFA, COTIS], true)) { - $radio['type'] = $type; + $radio['type'] = $type; } elseif (null !== f('type')) { - $radio['type'] = f('type'); + $radio['type'] = f('type'); } elseif (isset($doc['type'])) { - $radio['type'] = $doc['type']; + $radio['type'] = $doc['type']; } else { - $radio['type'] = FACT; + $radio['type'] = FACT; } @@ -241,31 +241,31 @@ $tpl->assign('membre_id', f('membre') ?: -1); $from_user = false; if (($d = f('designation')) && ($p = f('prix')) && implode($d)) { - foreach($d as $k=>$v) - { - if (empty($v) && empty($p[$k])) - { - continue; - } - $designations[] = $v; - $prix[] = $p[$k]; - } - $from_user = true; + foreach($d as $k=>$v) + { + if (empty($v) && empty($p[$k])) + { + continue; + } + $designations[] = $v; + $prix[] = $p[$k]; + } + $from_user = true; } else if (!empty($doc['contenu'])) { - foreach($doc['contenu'] as $k=>$v) - { - if (empty($v['designation']) && empty($v['prix'])) - { - continue; - } - $designations[] = $v['designation']; - $prix[] = $v['prix']; - } + foreach($doc['contenu'] as $k=>$v) + { + if (empty($v['designation']) && empty($v['prix'])) + { + continue; + } + $designations[] = $v['designation']; + $prix[] = $v['prix']; + } } else { - $designations = ['Exemple']; - $prix = [250]; + $designations = ['Exemple']; + $prix = [250]; } $tpl->assign(compact('liste', 'radio', 'step')); diff --git a/www/admin/facture_modifier.php b/www/admin/facture_modifier.php index da6dd81..1ba0d3d 100644 --- a/www/admin/facture_modifier.php +++ b/www/admin/facture_modifier.php @@ -32,7 +32,7 @@ $id = (int) qg('id'); if (!$f = $facture->get($id)) { - throw new UserException("Ce document n'existe pas."); + throw new UserException("Ce document n'existe pas."); } $csrf_key = 'modifier_facture'; @@ -41,44 +41,44 @@ $csrf_key = 'modifier_facture'; if(f('save')) { - $form->check($csrf_key, [ - 'type' => 'required|in:'.implode(',', [DEVIS, FACT, CERFA]), - 'numero_facture' => 'required|string', - 'date_emission' => 'required|date_format:d/m/Y', - 'date_echeance' => 'required|date_format:d/m/Y', - // 'reglee' => '', - // 'archivee' => '', - 'base_receveur' => 'required|in:membre,client', - // 'client' => '', - // 'membre' => '', - 'moyen_paiement' => 'required|in:' . implode(',', array_keys($moyens_paiement)), - 'designation' => 'array|required', - 'prix' => 'array|required' - ]); + $form->check($csrf_key, [ + 'type' => 'required|in:'.implode(',', [DEVIS, FACT, CERFA]), + 'numero_facture' => 'required|string', + 'date_emission' => 'required|date_format:d/m/Y', + 'date_echeance' => 'required|date_format:d/m/Y', + // 'reglee' => '', + // 'archivee' => '', + 'base_receveur' => 'required|in:membre,client', + // 'client' => '', + // 'membre' => '', + 'moyen_paiement' => 'required|in:' . implode(',', array_keys($moyens_paiement)), + 'designation' => 'array|required', + 'prix' => 'array|required' + ]); - if (!$form->hasErrors()) - { + if (!$form->hasErrors()) + { - try - { - if ( count(f('designation')) !== count(f('prix')) ) - { - throw new UserException('Nombre de désignations et de prix reçus différent.'); - } + try + { + if ( count(f('designation')) !== count(f('prix')) ) + { + throw new UserException('Nombre de désignations et de prix reçus différent.'); + } - $truc = [ - 'numero' => f('numero_facture'), - 'date_emission' => f('date_emission'), - 'date_echeance' => f('date_echeance'), - 'reglee' => f('reglee') == 1?1:0, - 'archivee' => f('archivee') == 1?1:0, - 'moyen_paiement' => f('moyen_paiement'), - 'toto' => 0 - ]; - $truc['type_facture'] = f('type'); + $truc = [ + 'numero' => f('numero_facture'), + 'date_emission' => f('date_emission'), + 'date_echeance' => f('date_echeance'), + 'reglee' => f('reglee') == 1?1:0, + 'archivee' => f('archivee') == 1?1:0, + 'moyen_paiement' => f('moyen_paiement'), + 'toto' => 0 + ]; + $truc['type_facture'] = f('type'); - if (in_array(f('type'), [DEVIS, FACT])) - { + if (in_array(f('type'), [DEVIS, FACT])) + { foreach(f('designation') as $k=>$value) { $truc['contenu'][$k]['designation'] = $value; @@ -88,40 +88,40 @@ if(f('save')) } $truc['total'] = $truc['toto']; unset($truc['toto']); - } - elseif ( f('type') == CERFA ) - { - $truc['moyen_paiement'] = f('moyen_paiement2'); + } + elseif ( f('type') == CERFA ) + { + $truc['moyen_paiement'] = f('moyen_paiement2'); $truc['contenu'] = [ 'forme' => f('forme_don'), 'nature' => f('nature_don'), 'texte' => f('texte_don')]; - $truc['total'] = Utils::moneyToInteger(f('total')); - unset($truc['toto']); - } + $truc['total'] = Utils::moneyToInteger(f('total')); + unset($truc['toto']); + } - if (f('base_receveur') == 'client') - { - $truc['receveur_membre'] = 0; - $truc['receveur_id'] = f('client'); - } - elseif (f('base_receveur') == 'membre') - { - $truc['receveur_membre'] = 1; - $truc['receveur_id'] = f('membre'); - } + if (f('base_receveur') == 'client') + { + $truc['receveur_membre'] = 0; + $truc['receveur_id'] = f('client'); + } + elseif (f('base_receveur') == 'membre') + { + $truc['receveur_membre'] = 1; + $truc['receveur_id'] = f('membre'); + } - $r = $facture->edit($id, $truc); + $r = $facture->edit($id, $truc); - Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); + Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); - } - catch(UserException $e) - { - $form->addError($e->getMessage()); - } - } + } + catch(UserException $e) + { + $form->addError($e->getMessage()); + } + } } @@ -138,77 +138,77 @@ $radio = $liste = []; if (f('select_cotis')) { - $form->check('add_cotis_1',[ - 'numero_facture' => 'required|string', - 'date_emission' => 'required|date_format:d/m/Y', - 'membre_cotis' => 'required|numeric', - ]); + $form->check('add_cotis_1',[ + 'numero_facture' => 'required|string', + 'date_emission' => 'required|date_format:d/m/Y', + 'membre_cotis' => 'required|numeric', + ]); - $step = true; + $step = true; } elseif (f('add_cotis')) { - $form->check('add_cotis_2',[ - 'numero_facture' => 'required|string', - 'date_emission' => 'required|date_format:d/m/Y', - 'membre_cotis' => 'required|numeric', - 'cotisation' => 'required', - ]); + $form->check('add_cotis_2',[ + 'numero_facture' => 'required|string', + 'date_emission' => 'required|date_format:d/m/Y', + 'membre_cotis' => 'required|numeric', + 'cotisation' => 'required', + ]); - $radio['type'] = f('cotisation'); - - if (!$form->hasErrors()) - { - try - { - $num = (int) str_replace('cotis_', '', $radio['type']); - foreach($fields as $field) - { - $cotis[$field] = f($field.'_'.$num); - } + $radio['type'] = f('cotisation'); + + if (!$form->hasErrors()) + { + 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' => 3, - 'numero' => f('numero_facture'), - 'receveur_membre' => 1, - 'receveur_id' => f('membre_cotis'), - 'date_emission' => f('date_emission'), - 'moyen_paiement' => f('moyen_paiement'), - 'total' => $r->paid_amount ?? $r->amount, - 'contenu' => ['id' => $cotis['id'], - 'intitule' => $cotis['label'], - 'souscription' => $cotis['date'], - 'expiration' => $cotis['expiry'] ] - ]; + $data = [ + 'type_facture' => 3, + 'numero' => f('numero_facture'), + 'receveur_membre' => 1, + 'receveur_id' => f('membre_cotis'), + 'date_emission' => f('date_emission'), + 'moyen_paiement' => f('moyen_paiement'), + 'total' => $r->paid_amount ?? $r->amount, + 'contenu' => ['id' => $cotis['id'], + 'intitule' => $cotis['label'], + 'souscription' => $cotis['date'], + 'expiration' => $cotis['expiry'] ] + ]; - if($facture->edit($id, $data)) - { - Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); - } - throw new UserException('Erreur d\'édition du reçu'); - } - catch (UserException $e) - { - $form->addError($e->getMessage()); - } - } + if($facture->edit($id, $data)) + { + Utils::redirect(PLUGIN_URL . 'facture.php?id='.(int)$id); + } + throw new UserException('Erreur d\'édition du reçu'); + } + catch (UserException $e) + { + $form->addError($e->getMessage()); + } + } - $step = true; + $step = true; } if ($step) { - try - { - $liste = $facture->getCotis((int)f('membre_cotis')); - } - catch (UserException $e) - { - $form->addError($e->getMessage()); - } + try + { + $liste = $facture->getCotis((int)f('membre_cotis')); + } + catch (UserException $e) + { + $form->addError($e->getMessage()); + } } @@ -250,32 +250,32 @@ $prix = []; $from_user = false; if (in_array($f->type_facture, [DEVIS, FACT])) { - if (($d = f('designation')) && ($p = f('prix'))) - { - foreach($d as $k=>$v) - { - if (empty($v) && empty($p[$k])) - { - continue; - } - $designations[] = $v; - $prix[] = $p[$k]; - } - $from_user = true; - } - else - { - foreach($f->contenu as $k=>$v) - { - if (empty($v['designation']) && empty($v['prix'])) - { - continue; - } - $designations[] = $v['designation']; - $prix[] = $v['prix']; - } - $from_user = false; - } + if (($d = f('designation')) && ($p = f('prix'))) + { + foreach($d as $k=>$v) + { + if (empty($v) && empty($p[$k])) + { + continue; + } + $designations[] = $v; + $prix[] = $p[$k]; + } + $from_user = true; + } + else + { + foreach($f->contenu as $k=>$v) + { + if (empty($v['designation']) && empty($v['prix'])) + { + continue; + } + $designations[] = $v['designation']; + $prix[] = $v['prix']; + } + $from_user = false; + } }