lesanges/facturation
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Update pour Garradin 1.1

Browse source
This commit is contained in:
Noizette 2021-04-11 14:25:59 +02:00
parent 1bdc2baf82
commit 11974482f2
20 changed files with 43 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/admin/aide.php
View file

@ -4,6 +4,6 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ACCES);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
$tpl->display(PLUGIN_ROOT . '/templates/aide.tpl');

2
www/admin/client.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ACCES);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
qv(['id' => 'required|numeric']);

2
www/admin/client_modifier.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ECRITURE);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE);
qv(['id' => 'required|numeric']);
$id = (int) qg('id');

2
www/admin/client_supprimer.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ADMIN);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE);
qv(['id' => 'required|numeric']);

2
www/admin/clients.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ACCES);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
if(f('add'))
{

7
www/admin/config.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ADMIN);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_ADMIN);
if (f('save') && $form->check('facturation_config'))
{
@ -39,6 +39,7 @@ if (f('save') && $form->check('facturation_config'))
// Traitement de l'image de signature
// Copié du plugin de nfrery
/*
if (f('upload') || isset($_POST['uploadHelper_status']))
{
$form->check('signature_config');
@ -115,12 +116,12 @@ else
{
$tpl->assign('image', false);
}
*/
$tpl->assign('ok', qg('ok') !== null);
$tpl->assign('max_size', Utils::getMaxUploadSize());
// $tpl->assign('max_size', Utils::getMaxUploadSize());
$tpl->display(PLUGIN_ROOT . '/templates/config.tpl');

2
www/admin/facture.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ACCES);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
use Garradin\Membres;

4
www/admin/facture_ajouter.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ECRITURE);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE);
use Garradin\DB;
use stdClass;
@ -223,7 +223,7 @@ $tpl->assign('date', $date->format('d/m/Y'));
$tpl->assign('designations', $designations);
$tpl->assign('prix', $prix);
$tpl->assign('identite', $identite);
$tpl->assign('membres', $db->getAssoc('SELECT id, '.$identite.' FROM membres WHERE id_categorie != -2 NOT IN (SELECT id FROM membres_categories WHERE cacher = 1);'));
$tpl->assign('membres', $db->getAssoc('SELECT id, '.$identite.' FROM membres WHERE id_category != -2 NOT IN (SELECT id FROM users_categories WHERE hidden = 1);'));
$tpl->assign('clients', $db->getAssoc('SELECT id, nom FROM plugin_facturation_clients;'));
$tpl->display(PLUGIN_ROOT . '/templates/facture_ajouter.tpl');

4
www/admin/facture_modifier.php
View file

@ -4,7 +4,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ECRITURE);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE);
use Garradin\DB;
@ -262,7 +262,7 @@ if ($f->type_facture != COTIS)
$tpl->assign('designations', $designations??[]);
$tpl->assign('prix', $prix??[]);
$tpl->assign('identite', $identite);
$tpl->assign('membres', $db->getAssoc('SELECT id, '.$identite.' FROM membres WHERE id_categorie != -2 NOT IN (SELECT id FROM membres_categories WHERE cacher = 1);'));
$tpl->assign('membres', $db->getAssoc('SELECT id, '.$identite.' FROM membres WHERE id_category != -2 NOT IN (SELECT id FROM users_categories WHERE hidden = 1);'));
$tpl->assign('clients', $db->getAssoc('SELECT id, nom FROM plugin_facturation_clients;'));
$date = new \DateTime;

2
www/admin/index.php
View file

@ -5,7 +5,7 @@ namespace Garradin;
require_once __DIR__ . '/_upgrade_trick.php';
require_once __DIR__ . '/_inc.php';
$session->requireAccess('compta', Membres::DROIT_ACCES);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
$membres = new Membres;

5
www/admin/pdf.php
View file

@ -5,7 +5,7 @@ namespace Garradin;
require_once __DIR__ . '/_inc.php';
require_once PLUGIN_ROOT . '/lib/MPDF/vendor/autoload.php';
$session->requireAccess('compta', Membres::DROIT_ACCES);
$session->requireAccess($session::SECTION_ACCOUNTING, $session::ACCESS_READ);
$membres = new Membres;
@ -306,6 +306,7 @@ elseif ($f->type_facture == 2)
$pdf->WriteText(160, 246.2, utf8_decode($f->date_echeance->format('Y')));
// Signature
/*
$img = new Fichiers($plugin->getConfig('signaturetxt'));
$cache_id = 'fichiers.' . $img->id_contenu;
if (!Static_Cache::exists($cache_id))
@ -316,7 +317,7 @@ elseif ($f->type_facture == 2)
}
$uri = Static_Cache::getPath($cache_id);
$pdf->Image($uri, 150, 245, 32, 0, 'PNG' ); // Emplacement de la signature avec restriction de largeur pour tenir dans sur la case.
*/
} // End if cerfa
elseif ($f->type_facture == 3)
{