Overview
Comment: | Correction cotisation membre apparaît comme valide quand aucune cotisation enregistrée (pour date à date), signalé par @Simon |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
fba3dce0bb9d969cf5346bac8d64af76 |
User & Date: | bohwaz on 2016-10-12 00:13:51 |
Other Links: | manifest | tags |
References
2020-12-08
| ||
23:25 | • Wiki page "Changelog/0.9" artifact: b9c916b4d1 user: bohwaz | |
Context
2016-11-08
| ||
03:09 | Sortie 0.7.5 check-in: 8cf1f80660 user: bohwaz tags: trunk, stable, 0.7.5 | |
2016-10-12
| ||
00:13 | Correction cotisation membre apparaît comme valide quand aucune cotisation enregistrée (pour date à date), signalé par @Simon check-in: fba3dce0bb user: bohwaz tags: trunk | |
2016-09-30
| ||
04:41 | Fix: utilisation d'un shim à la place de l'appel à Intl Locale pour extraire la langue, si nécessaire check-in: 8e0f05e71d user: bohwaz tags: trunk | |
Changes
Modified src/include/lib/Garradin/Membres/Cotisations.php from [3d57a24c20] to [09cc63eeae].
︙ | ︙ | |||
310 311 312 313 314 315 316 | * @return array Liste des cotisations en cours de validité */ public function listSubscriptionsForMember($id) { $db = DB::getInstance(); return $db->simpleStatementFetch('SELECT c.*, CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') >= date() | | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | * @return array Liste des cotisations en cours de validité */ public function listSubscriptionsForMember($id) { $db = DB::getInstance(); return $db->simpleStatementFetch('SELECT c.*, CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') >= date() WHEN c.fin IS NOT NULL THEN (cm.id IS NOT NULL AND c.fin >= date()) WHEN cm.id IS NOT NULL THEN 1 ELSE 0 END AS a_jour, CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') WHEN c.fin IS NOT NULL THEN c.fin ELSE 1 END AS expiration, (julianday(date()) - julianday(CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') WHEN c.fin IS NOT NULL THEN c.fin END)) AS nb_jours FROM cotisations_membres AS cm INNER JOIN cotisations AS c ON c.id = cm.id_cotisation |
︙ | ︙ | |||
335 336 337 338 339 340 341 | * (si NULL = cotisation jamais enregistrée, si 1 = cotisation ponctuelle enregistrée, sinon date d'expiration) */ public function isMemberUpToDate($id, $id_cotisation) { $db = DB::getInstance(); return $db->simpleQuerySingle('SELECT c.*, CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') >= date() | | | 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 | * (si NULL = cotisation jamais enregistrée, si 1 = cotisation ponctuelle enregistrée, sinon date d'expiration) */ public function isMemberUpToDate($id, $id_cotisation) { $db = DB::getInstance(); return $db->simpleQuerySingle('SELECT c.*, CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') >= date() WHEN c.fin IS NOT NULL THEN (cm.id IS NOT NULL AND c.fin >= date()) WHEN cm.id IS NOT NULL THEN 1 ELSE 0 END AS a_jour, CASE WHEN c.duree IS NOT NULL THEN date(cm.date, \'+\'||c.duree||\' days\') WHEN c.fin IS NOT NULL THEN c.fin ELSE 1 END AS expiration FROM cotisations AS c LEFT JOIN cotisations_membres AS cm ON cm.id_cotisation = c.id AND cm.id_membre = ? WHERE c.id = ? ORDER BY cm.date DESC;', true, (int)$id, (int)$id_cotisation); |
︙ | ︙ |