Overview
Comment: | When there is no fee for the service, you can still subscribe a user to a service, it just doesn't have a fee |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
404078a8017cfbb48381e00f2db75dff |
User & Date: | bohwaz on 2021-11-11 22:12:22 |
Other Links: | manifest | tags |
Context
2021-11-11
| ||
22:17 | Don't use fee label when the subscription is not linked to a fee check-in: 6603436d79 user: bohwaz tags: trunk, stable | |
22:12 | When there is no fee for the service, you can still subscribe a user to a service, it just doesn't have a fee check-in: 404078a801 user: bohwaz tags: trunk, stable | |
22:01 | Redirect to login page after logout, and use configured website URL if provided, for return URL check-in: 430a3c262c user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/data/1.1.0_schema.sql from [1a42b63bce] to [7141d7dc46].
︙ | ︙ | |||
69 70 71 72 73 74 75 | CREATE TABLE IF NOT EXISTS services_users -- Enregistrement des cotisations et activités ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NOT NULL REFERENCES membres (id) ON DELETE CASCADE, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | CREATE TABLE IF NOT EXISTS services_users -- Enregistrement des cotisations et activités ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NOT NULL REFERENCES membres (id) ON DELETE CASCADE, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, id_fee INTEGER NULL REFERENCES services_fees (id) ON DELETE CASCADE, -- This can be NULL if there is no fee for the service paid INTEGER NOT NULL DEFAULT 0, expected_amount INTEGER NULL, date TEXT NOT NULL DEFAULT CURRENT_DATE CHECK (date(date) IS NOT NULL AND date(date) = date), expiry_date TEXT NULL CHECK (date(expiry_date) IS NULL OR date(expiry_date) = expiry_date) ); |
︙ | ︙ |
Modified src/include/data/schema.sql from [1a42b63bce] to [7141d7dc46].
︙ | ︙ | |||
69 70 71 72 73 74 75 | CREATE TABLE IF NOT EXISTS services_users -- Enregistrement des cotisations et activités ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NOT NULL REFERENCES membres (id) ON DELETE CASCADE, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | CREATE TABLE IF NOT EXISTS services_users -- Enregistrement des cotisations et activités ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NOT NULL REFERENCES membres (id) ON DELETE CASCADE, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, id_fee INTEGER NULL REFERENCES services_fees (id) ON DELETE CASCADE, -- This can be NULL if there is no fee for the service paid INTEGER NOT NULL DEFAULT 0, expected_amount INTEGER NULL, date TEXT NOT NULL DEFAULT CURRENT_DATE CHECK (date(date) IS NOT NULL AND date(date) = date), expiry_date TEXT NULL CHECK (date(expiry_date) IS NULL OR date(expiry_date) = expiry_date) ); |
︙ | ︙ |
Modified src/include/lib/Garradin/Entities/Services/Service_User.php from [7a9bb0372a] to [1a6c1ca549].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | class Service_User extends Entity { const TABLE = 'services_users'; protected $id; protected $id_user; protected $id_service; protected $id_fee; protected $paid; protected $expected_amount; protected $date; protected $expiry_date; protected $_types = [ | > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | class Service_User extends Entity { const TABLE = 'services_users'; protected $id; protected $id_user; protected $id_service; /** * This can be NULL if there is no fee for the service * @var null|int */ protected $id_fee; protected $paid; protected $expected_amount; protected $date; protected $expiry_date; protected $_types = [ |
︙ | ︙ |