diff --git a/admin/_facture_common.php b/admin/_facture_common.php index b729f34..8b93c95 100644 --- a/admin/_facture_common.php +++ b/admin/_facture_common.php @@ -69,7 +69,10 @@ if ( !$target ) { throw new UserException("Ce document n'existe pas."); } } - +if ($f->archivee) +{ + throw new UserException("Ce document est archivé, vous n'avez pas le droit de le modifier"); +} // Traitement $data=[]; $form->runIf(f('save') && !$form->hasErrors(), @@ -227,7 +230,6 @@ if (! $form->hasErrors()) } // Affichage - if ($target) { $doc = null; @@ -274,6 +276,7 @@ else $doc['type'] = $f->type_facture; $doc['numero_facture'] = $f->numero; $doc['reglee'] = $f->reglee; + $doc['archivee'] = $f->archivee; $doc['base_receveur'] = $f->receveur_membre?'membre':'client'; $doc['client'] = $f->receveur_id; $doc['membre'] = $f->receveur_id; @@ -294,6 +297,7 @@ else $radio['type'] = f('type')??$doc['type']; } + $tpl->assign('types_details', $facture->types); $tpl->assign('client_id', f('client') ?: -1); diff --git a/admin/facture.php b/admin/facture.php index e375bf3..565b53c 100644 --- a/admin/facture.php +++ b/admin/facture.php @@ -20,10 +20,12 @@ if (!$f) throw new UserException("Ce document n'existe pas."); } +$archive = $f->archivee; $tpl->assign('type', $f->type_facture); $tpl->assign('facture', $f); $tpl->assign('id', $id); $tpl->assign('footer', $plugin->getConfig('footer')?:''); $tpl->assign('siret_asso', $plugin->getConfig('siret_asso')?:''); +$tpl->assign('archive', $archive); $tpl->display(PLUGIN_ROOT . '/templates/facture.tpl'); diff --git a/admin/index.php b/admin/index.php index a0acb18..29d2d99 100644 --- a/admin/index.php +++ b/admin/index.php @@ -9,11 +9,20 @@ require_once __DIR__ . '/_inc.php'; $session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ); +$form->runIf(f('archiver') && !$form->hasErrors(), + function () use($facture) + { + foreach(f('selected') as $f) { + $facture->archiver($f); + } -$list = $facture->list(); + }, 'archiver_factures'); + + +$archive = isset($_GET['archive']) && $_GET['archive'] == 1; +$list = $facture->list(! $archive); $list->loadFromQueryString(); $list->setPageSize(50); -$tpl->assign(compact('list')); - +$tpl->assign(compact('list', 'archive')); $tpl->display(PLUGIN_ROOT . '/templates/index.tpl'); diff --git a/lib/Facture.php b/lib/Facture.php index 270fca7..761683f 100644 --- a/lib/Facture.php +++ b/lib/Facture.php @@ -318,7 +318,7 @@ class Facture return $r; } - public function list(): DynamicList + public function list($all = true): DynamicList { $id_field = \Paheko\Users\DynamicFields::getNameFieldsSQL('u'); $plugin_name = preg_replace('/^.*\/(\w+)\/$/', '${1}', \Paheko\PLUGIN_ADMIN_URL); @@ -343,6 +343,9 @@ class Facture 'receveur_id' => [ ], // Créer une colonne virtuelle + 'select' => [ + 'label' => '', + ], 'type' => [ 'label' => 'Type', 'select' => null, @@ -376,9 +379,6 @@ class Facture 'reglee' => [ 'label' => 'Réglée', ], - 'archivee' => [ - 'label' => 'Archivée', - ], 'moyen_paiement' => [ 'label' => 'Moyen de paiement', 'select' => 'mp.nom', @@ -396,7 +396,12 @@ class Facture LEFT JOIN users AS u ON f.receveur_membre = 1 AND u.id = f.receveur_id LEFT JOIN plugin_facturation_clients AS c ON f.receveur_membre = 0 AND c.id = f.receveur_id'; - $list = new DynamicList($columns, $tables); + if ($all) { + $where = "f.archivee != TRUE"; + } else { + $where = "f.archivee == TRUE"; + } + $list = new DynamicList($columns, $tables, $where); $list->orderBy('date_emission', true); $currency = Config::getInstance()->monnaie; @@ -405,7 +410,6 @@ class Facture // Remplir la colonne virtuelle $row->type = self::TYPES_NAMES[$row->type_facture] ?? null; $row->reglee = $row->reglee ? 'Réglée' : 'Non'; - $row->archivee = $row->archivee ? 'Archivée' : 'Non'; // Remplir le contenu $content = json_decode((string)$row->contenu); @@ -554,4 +558,19 @@ class Facture { return DB::getInstance()->delete('plugin_facturation_factures', 'id = '. (int)$id); } + + public function archiver($id) + { + $f = $this->get($id); + $f->archivee = 1; + $f->date_emission = $f->date_emission->format('d/m/Y'); + $f->date_echeance = $f->date_echeance->format('d/m/Y'); + $id = $f->id; + unset($f->id); + $datas = (array)$f; + $this->_checkFields($datas); + $datas["id"] = $id; + $db = DB::getInstance(); + return $db->update('plugin_facturation_factures', $datas, $db->where('id', (int)$id)); + } } diff --git a/plugin.ini b/plugin.ini index c75a449..acd3b80 100644 --- a/plugin.ini +++ b/plugin.ini @@ -1,8 +1,8 @@ name="Facturation" description="Permet d'éditer des factures et devis à ses membres ainsi qu'à une base de clients supplémentaire." -author="zou ; adapté par jce" -url="https://git.roflcopter.fr/lesanges/paheko-plugin-facturation" -version="0.16" +author="zou ; adapté par Jean-Christophe Engel" +url="https://gitea.zaclys.com/lesanges/facturation" +version="0.17" menu=true restrict_section="accounting" restrict_level="read" diff --git a/templates/_form.tpl b/templates/_form.tpl index f533acf..4ab076e 100644 --- a/templates/_form.tpl +++ b/templates/_form.tpl @@ -50,7 +50,7 @@ {input type="checkbox" name="reglee" value="1" label="Réglée" source=$doc data-types="t1"}