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

suppression fonctions inutiles ; ajout fichiers oubliés

Browse source 
FossilOrigin-Name: fd2e220b6b0f50b860d8887f6149b50756485ee81c7eecef851f476bc3514d31
This commit is contained in:
engel 2022-02-19 10:16:24 +00:00
parent c221014650
commit c7e336fa96
9 changed files with 77 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

179
lib/Utils.php
View file

@ -7,8 +7,6 @@ use KD2\ZipWriter;
class Utils
{
// ------------------------------------------------------------
// test nouvelle organisation
/**
* @return tarifs demandés
* @param array $tarifs
@ -156,60 +154,6 @@ class Utils
return $_SESSION['ligneReduction'][$taux];
}
// ------------------------------------------------------------
/**
* @return liste des activités
*/
public static function getToutesActivites()
{
return DB::getInstance()->get(
"SELECT
id as idActivite,
label,
description
FROM services
ORDER BY label"
);
}
/**
* @return liste des tarifs d'une activité
* @param $activite : identifiant de l'activité
*/
public static function getTarifsActivite($activite)
{
return DB::getInstance()->get(
"SELECT
services_fees.id as idTarif,
services_fees.label as titreTarif,
services_fees.description as descTarif,
services_fees.amount as montantTarif
FROM services_fees
WHERE services_fees.id_service = ?",
$activite
);
}
/**
* @return liste de toutes les activités et tarifs
*/
public static function getActivitesEtTarifs()
{
return DB::getInstance()->get(
"SELECT
services.id as idActivite,
services.label as titreActivite,
services.description as descActivite,
services_fees.id as idTarif,
services_fees.label as titreTarif,
services_fees.description as descTarif
FROM services
LEFT JOIN services_fees ON services_fees.id_service = services.id
ORDER BY services.id, services_fees.id"
);
}
/**
* @return liste de toutes les activités, tarifs et comptes associés
*/
@ -232,121 +176,6 @@ class Utils
);
}
/**
* @return tous les versements de l'année
* @param $annee
*/
public static function getTousLesVersements($annee)
{
$sql =
"SELECT
services.id as idActivite,
services_fees.id as idTarif,
services.label as activite,
services_fees.label as tarif,
services_fees.amount as montant,
acc_transactions_users.id_user as idUser,
acc_transactions_lines.credit as versement,
membres.nom as nom,
membres.adresse as adresse,
membres.ville as ville,
membres.code_postal as codePostal,
membres.email as courriel,
acc_transactions.date,
acc_transactions_users.id_transaction as idTrans
FROM acc_transactions_users
INNER JOIN membres on acc_transactions_users.id_user = membres.id
INNER JOIN acc_transactions on acc_transactions_users.id_transaction = acc_transactions.id
INNER JOIN services_users on acc_transactions_users.id_service_user = services_users.id
INNER JOIN services on services_users.id_service = services.id
INNER JOIN services_fees on services_users.id_fee = services_fees.id
INNER JOIN acc_transactions_lines on acc_transactions_lines.id_transaction = acc_transactions.id
WHERE
(strftime(\"%Y\", acc_transactions.date) = ?
AND
acc_transactions_lines.credit > 0)
ORDER by services.id, services_fees.id, membres.nom, acc_transactions.date";
return DB::getInstance()->get($sql, $annee);
}
/**
* @return versements d'une année pour un ensemble de tarifs donnés
* @param $annee
* @param array $lesTarifs
*/
public static function getVersementsActivite($annee, $lesTarifs)
{
$db = DB::getInstance();
$sql = sprintf(
'SELECT
services.id as idActivite,
services_fees.id as idTarif,
services.label as activite,
services_fees.label as tarif,
services_fees.amount as montant,
acc_transactions_users.id_user as idUser,
acc_transactions_lines.credit as versement,
membres.nom as nom,
membres.adresse as adresse,
membres.ville as ville,
membres.code_postal as codePostal,
membres.email as courriel,
acc_transactions.date,
acc_transactions_users.id_transaction as idTrans
FROM acc_transactions_users
INNER JOIN membres on acc_transactions_users.id_user = membres.id
INNER JOIN acc_transactions on acc_transactions_users.id_transaction = acc_transactions.id
INNER JOIN services_users on acc_transactions_users.id_service_user = services_users.id
INNER JOIN services on services_users.id_service = services.id
INNER JOIN services_fees on services_users.id_fee = services_fees.id
INNER JOIN acc_transactions_lines on acc_transactions_lines.id_transaction = acc_transactions.id
WHERE
(strftime(%s, acc_transactions.date) = "%d"
AND
services_fees.%s
AND
acc_transactions_lines.credit > 0)
ORDER by membres.nom, acc_transactions.date',
'"%Y"',
$annee,
$db->where('id', $lesTarifs));
return $db->get($sql);
}
/**
* Versements totaux par personne pour une année donnée
* @param année
*/
public static function getVersementsTotaux_old($annee) {
$sql =
"SELECT
acc_transactions_users.id_user as idUser,
membres.nom as nom,
sum(acc_transactions_lines.credit) AS montant,
membres.adresse as adresse,
membres.code_postal as codePostal,
membres.ville as ville
FROM
acc_transactions_users,
membres,
acc_transactions
INNER JOIN acc_transactions_lines
ON acc_transactions_lines.id_transaction = acc_transactions.id
WHERE (
strftime('%Y', acc_transactions.date) = ?
AND
acc_transactions_lines.credit > 0
AND
acc_transactions_users.id_transaction = acc_transactions.id
AND
acc_transactions_users.id_user = membres.id
)
GROUP by acc_transactions_users.id_user
ORDER by membres.nom COLLATE U_NOCASE;
";
return DB::getInstance()->get($sql, $annee);
}
/**
* @return nom de l'association
*/
@ -385,14 +214,6 @@ class Utils
return $anneesFiscales;
}
/** TODO
* générer les reçus
* @param tableau des versements par personne
*/
static function genererRecus() {
}
/**
* enregistrer les fichiers dans une archive zip
* @param $fileList : liste des fichiers à archiver