Commit graph

165 commits

Author SHA1 Message Date
Reynir Björnsson
408970f16e Create subscription periods in bootstrap_dev_data (#78)
Otherwise the /admin/members/ endpoint fails. Related to #77.

The README should also be updated to reflect that you should probably do the bootstrap_dev_data on first setup.

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/78
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Reynir Björnsson <reynir@reynir.dk>
Co-committed-by: Reynir Björnsson <reynir@reynir.dk>
2025-03-01 13:50:21 +00:00
reynir
b64779c780 Remove the sign-up for now (#72)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/72
Reviewed-by: reynir <data.coop@reynir.dk>
2025-02-10 10:44:20 +00:00
bbb
4e10d7d000
Change link label for people who never received a password 2025-02-08 12:06:57 +01:00
bbb
22fcd25f55
Remove sign-up link for now 2025-02-08 12:04:38 +01:00
bbb
dbd851bf19 Add modified to Order Admin list display (#71)
icanhaz? 🥺

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/71
Reviewed-by: reynir <data.coop@reynir.dk>
Co-authored-by: bbb <benjamin@overtag.dk>
Co-committed-by: bbb <benjamin@overtag.dk>
2025-02-05 07:53:14 +00:00
Víðir Valberg Guðmundsson
257f1a26eb Add a custom OAuth2 validator to provide some more info in the OIDC dance. 2025-02-02 14:41:11 +01:00
Víðir Valberg Guðmundsson
78f36c1502 Add assigned_to field to ServiceRequest. Ensure a administrator group exists. Close #66. 2025-02-02 14:29:50 +01:00
Víðir Valberg Guðmundsson
314416740f Do not replace spaces in private key. Error was in environment definition in ansible repo. 2025-02-01 22:13:38 +01:00
Víðir Valberg Guðmundsson
630a098ba5 Replace spaces in private key. 2025-02-01 21:49:45 +01:00
Víðir Valberg Guðmundsson
cd467adb06 Set PKCE_REQUIRED to False for now. 2025-02-01 21:40:12 +01:00
Víðir Valberg Guðmundsson
860d8ed5b2 Default must be set for running manage.py during docker build. 2025-02-01 21:12:53 +01:00
Víðir Valberg Guðmundsson
b3bf381186 Get OIDC_RSA_PRIVATE_KEY from environment. 2025-02-01 21:09:39 +01:00
Víðir Valberg Guðmundsson
ee537adc05 Configure ruff and fix issues. (#64)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/64
Co-authored-by: Víðir Valberg Guðmundsson <valberg@orn.li>
Co-committed-by: Víðir Valberg Guðmundsson <valberg@orn.li>
2025-01-26 12:44:10 +00:00
Víðir Valberg Guðmundsson
21b59467ea Add a way to make it easy to reset the database with some testing data. 2025-01-22 22:35:09 +01:00
Víðir Valberg Guðmundsson
e2cb4b220d Fix CSS stuff (#61)
Co-authored-by: Halfdan Mouritzen <halfdan@robothangarskib.dk>
Co-authored-by: halfd <halfd@noreply@git.data.coop>
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/61
Co-authored-by: Víðir Valberg Guðmundsson <valberg@orn.li>
Co-committed-by: Víðir Valberg Guðmundsson <valberg@orn.li>
2025-01-22 21:26:06 +00:00
Víðir Valberg Guðmundsson
cda633134e Fix wrong field. 2025-01-16 08:27:46 +01:00
Víðir Valberg Guðmundsson
9b78e81f00 Add missing migrations. 2025-01-16 08:20:58 +01:00
benjaoming
ee46541025 Fix renamed field (#60)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/60
2025-01-15 13:06:26 +00:00
bbb
83b3e42192
Fix renamed field 2025-01-15 14:05:34 +01:00
bbb
43d19d3106 New Service Request setup (#59)
* [x] Adds a ServiceRequest model for all service types
* [x] Pre-define simple service requests to begin with
* [x] Django admin for admins to handle requests
* [x] Notifications for Matrix
* [x] Moved Service Access to `services` app
* [x] Auto-create default service requests for new memberships
* [x] Most simple kinds of tests added
* [x] Fix issue in generating service requests (check for service access firstly)
* [ ] Channel and bot account

## Deployment

1. Create a bot account. Get an access token with:

   ```
   curl -XPOST \
     -d '{"type":"m.login.password", "user":"<userid>", "password":"<password>"}' \
     "https://data.coop/_matrix/client/r0/login"
   ```

2. Create an admin room for admins. Add admins + bot. Copy the room ID.
3. Add new environment variables for the setup `MATRIX_ACCESS_TOKEN` and `MATRIX_SERVICE_REQUEST_ADMIN_ROOM`

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/59
Co-authored-by: bbb <benjamin@overtag.dk>
Co-committed-by: bbb <benjamin@overtag.dk>
2025-01-15 07:16:12 +00:00
Víðir Valberg Guðmundsson
c4df844da6 Move to uv - it is the hot new thing. 2024-12-26 13:24:25 +01:00
Víðir Valberg Guðmundsson
3dd7352d90 Services (#25)
Dette PR handler om at få en måde hvorpå medlemmer kan få adgang til de forskellige services vi udbyder.

Co-authored-by: Halfdan Mouritzen <halfdan@robothangarskib.dk>
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/25
Reviewed-by: benjaoming <benjaoming@data.coop>
Co-authored-by: Víðir Valberg Guðmundsson <valberg@orn.li>
Co-committed-by: Víðir Valberg Guðmundsson <valberg@orn.li>
2024-12-22 23:46:13 +00:00
Benjamin Bach
43d5dcbd52 Set FROM field on emails (#55)
Fixes #54

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/55
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-14 20:44:11 +00:00
Benjamin Bach
f5feda3414 Fix invite text and add accounting context to translation messages (#53)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/53
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-14 19:52:09 +00:00
Benjamin Bach
3659cf40df Add more precision to the order email (#51)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/51
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-14 10:08:01 +00:00
Benjamin Bach
8f3e8f06f0 Remove unique constraint from initial field (#50)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/50
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-14 09:37:13 +00:00
Benjamin Bach
b3795977ed Membership invitations and order emails (#47)
* [x] Create invite emails from admin
* [x] Sign up on special invite form (create password and username)
* [x] Create email with unpaid orders and payment links
* [x] Lodge unpaid orders somewhere in UI for visibility

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/47
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-14 09:17:29 +00:00
Benjamin Bach
c81481747f Add a footer link to the git repo (#49)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/49
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-14 05:08:02 +00:00
Víðir Valberg Guðmundsson
52b38abf2a chore: cleanup and fix Dockerfile for development 2024-08-09 08:33:14 +02:00
Benjamin Bach
00c615f318 More admin controls + Fix pay/success error 500 (#45)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/45
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-04 17:12:02 +00:00
Benjamin Bach
1070e93885 Divide the amount received from Stripe by 100.0 (#40)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/40
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-04 07:34:50 +00:00
Víðir Valberg Guðmundsson
ca8987ba3b Use mail_admins instead of send_mail. 2024-08-03 20:53:18 +02:00
Benjamin Bach
4254baf09d Changes to payment models (#32)
Flagging incoming changes, no actions required.

This is stuff I consider "MVP", as in what we need urgently to send out payment links to members and receive payments via Stripe.

- [x] Allow products, orders etc
- [x] Define several products per membership type
- [x] Possibility to create a membership BEFORE it's paid
- [x] Mark memberships active when payments are received
- [x] Create membership history for each member (via Django admin)
- [x] Efficiently mark members in a list and choose "create <membership type> for current year with an unpaid order" (Django Admin actions)
- [x] Order payment page w/ Stripe integration
- [ ] Send email with order payment link
- [ ] Send payment confirmation emails
- [x] Re-generate migrations

Co-authored-by: valberg <valberg@orn.li>
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/32
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-03 17:55:32 +00:00
Benjamin Bach
59620aa309 Switch to using uv instead of pip-tools (#39)
Seems to work!

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/39
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-08-02 22:58:19 +00:00
Benjamin Bach
865bc6c7bd New WaitingListEntry (#33)
Sorted the pre-commit things... some were because of `src/static` being included, and some have been fixed in another PR 🎉

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/33
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-07-31 22:49:46 +00:00
Víðir Valberg Guðmundsson
0cf579c5f6 Update dockerfile to using bookworm, and to avoid invalidating cache unless updating requirements. 2024-07-31 23:48:39 +02:00
Víðir Valberg Guðmundsson
7a3a629d6f Update requirements compilation to use hatch-pip-compile. 2024-07-31 23:26:40 +02:00
Benjamin Bach
f6d8f82065 Requirements pinning + some cleanup (#36)
Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/36
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-07-31 21:17:00 +00:00
Benjamin Bach
2c99799d4d Shorten and document Docker tweaks for Python and pip (#35)
Wanted to use some of the setup for bootstrapping another project, so I had a close look over these couple of items.

Reviewed-on: https://git.data.coop/data.coop/membersystem/pulls/35
Reviewed-by: valberg <valberg@orn.li>
Co-authored-by: Benjamin Bach <benjamin@overtag.dk>
Co-committed-by: Benjamin Bach <benjamin@overtag.dk>
2024-07-23 22:48:24 +00:00
Víðir Valberg Guðmundsson
5d516b7851 Update packages. 2024-07-17 08:44:07 +02:00
Víðir Valberg Guðmundsson
f18469833a The ruffening. 2024-07-15 00:19:37 +02:00
Víðir Valberg Guðmundsson
480eecca12 Cleanup. 2024-07-14 23:14:07 +02:00
Víðir Valberg Guðmundsson
b39b114e30 pre-commit autoupdate 2024-07-14 20:55:22 +02:00
Víðir Valberg Guðmundsson
d31f62ebb4 Upd. 2024-05-31 21:26:20 +02:00
Víðir Valberg Guðmundsson
712c50fac7 Use hatch for installing. 2024-03-03 11:05:21 +01:00
Halfdan Mouritzen
fedfca25a5 Adding flow to add new emails to an account 2024-03-02 17:43:16 +01:00
Halfdan Mouritzen
89d7c9c9d5 CSS should be merged correctly now 2024-03-02 14:49:50 +01:00
Halfdan Mouritzen
f5acfbedd4 Cleaning 2024-03-02 12:15:33 +01:00
Víðir Valberg Guðmundsson
cf3c84b8d9 More linting. 2024-02-29 21:30:36 +01:00
Víðir Valberg Guðmundsson
1b65558608 Lint galore. Also use python 3.12. 2024-02-29 21:28:17 +01:00