ajout fonctionnalités choix versements
FossilOrigin-Name: 62fb6243e8d4dfb25f2b856342249e827a261366be106680411204b5b58977f2
This commit is contained in:
parent
9bbd9de84f
commit
7b426d3e32
12 changed files with 243 additions and 187 deletions
|
|
@ -96,13 +96,12 @@ class Utils
|
|||
services_fees.amount as montant,
|
||||
acc_transactions_users.id_user as idUser,
|
||||
acc_transactions_lines.credit as versement,
|
||||
membres.id as idMembre,
|
||||
membres.nom as nom,
|
||||
membres.adresse as adresse,
|
||||
membres.ville as ville,
|
||||
membres.code_postal as codePostal,
|
||||
membres.email as courriel,
|
||||
acc_transactions.date as Date,
|
||||
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
|
||||
|
|
@ -125,10 +124,11 @@ class Utils
|
|||
* @param $activite
|
||||
* @param $tarif
|
||||
*/
|
||||
public static function getVersementsActivite($annee, $activite, $tarif)
|
||||
public static function getVersementsActivite($annee, $lesTarifs)
|
||||
{
|
||||
$sql =
|
||||
"SELECT
|
||||
$db = DB::getInstance();
|
||||
$sql = sprintf(
|
||||
'SELECT
|
||||
services.id as idActivite,
|
||||
services_fees.id as idTarif,
|
||||
services.label as activite,
|
||||
|
|
@ -137,7 +137,11 @@ class Utils
|
|||
acc_transactions_users.id_user as idUser,
|
||||
acc_transactions_lines.credit as versement,
|
||||
membres.nom as nom,
|
||||
acc_transactions.date as Date,
|
||||
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
|
||||
|
|
@ -147,15 +151,16 @@ class Utils
|
|||
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) = ?
|
||||
(strftime(%s, acc_transactions.date) = "%d"
|
||||
AND
|
||||
services.id = ?
|
||||
AND
|
||||
services_fees.id = ?
|
||||
services_fees.%s
|
||||
AND
|
||||
acc_transactions_lines.credit > 0)
|
||||
ORDER by membres.nom, acc_transactions.date";
|
||||
return DB::getInstance()->get($sql, $annee, $activite, $tarif);
|
||||
ORDER by membres.nom, acc_transactions.date',
|
||||
'"%Y"',
|
||||
$annee,
|
||||
$db->where('id', $lesTarifs));
|
||||
return $db->get($sql);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -230,9 +235,13 @@ class Utils
|
|||
return $anneesFiscales;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// zip archive creation
|
||||
// ------------------------------------------------------------------------
|
||||
/** TODO
|
||||
* générer les reçus
|
||||
* @param tableau des versements par personne
|
||||
*/
|
||||
static function genererRecus() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* enregistrer les fichiers dans une archive zip
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue