Commit graph

159 commits

Author SHA1 Message Date
Benjamin Bach 0a74f62627
Reduce amount of migrations 2024-08-01 12:51:21 +02:00
Benjamin Bach 17e5f969af
Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates 2024-08-01 00:59:18 +02:00
Benjamin Bach 865bc6c7bd New WaitingListEntry ()
Sorted the pre-commit things... some were because of `src/static` being included, and some have been fixed in another PR 🎉

Reviewed-on: 
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
Benjamin Bach 4c810efe6c
Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates 2024-08-01 00:34:15 +02:00
Benjamin Bach 44c0156890
Functional webhook, clean up some model stuff, need to update migrations 2024-08-01 00:21:42 +02: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 ()
Reviewed-on: 
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 298a453e19
Remove stripe session from success page (doesnt somehow work according to their docs hmm) 2024-07-31 21:35:04 +02:00
Benjamin Bach 9a61c237c7
WIP: Handle Stripe webhook and add success/cancel pages 2024-07-31 01:02:38 +02:00
Benjamin Bach 1029162a62
View for Stripe checkout 2024-07-30 15:21:47 +02:00
Benjamin Bach 78b3264bb6
Add Stripe to requirements 2024-07-30 00:24:16 +02:00
Benjamin Bach e2f4a66645
Add details to order page 2024-07-28 23:27:53 +02:00
Benjamin Bach 6bf42ecba3
Bootstrap an Order detail page 2024-07-28 22:39:21 +02:00
Benjamin Bach 5c5153adb6
Add signals to update Order and Membership 2024-07-28 18:55:17 +02:00
Benjamin Bach 2499c3227c
Implements bulk-creation action for memberships and orders 2024-07-28 18:38:00 +02:00
Benjamin Bach 3193cafe4b
Add dynamic admin actions for bulk creating memberships 2024-07-28 10:55:15 +02:00
Benjamin Bach 768ef5a7d2
Add new admins, rework relation between orders and memberships, MembershipType can contain many Products, Memberships can be activated and revoked 2024-07-26 00:57:22 +02:00
Benjamin Bach 84f6ad9c4b
Merge branch 'waiting-list' into payment-updates 2024-07-25 23:36:37 +02:00
Benjamin Bach fa6a5cdb86
Revert healtcheck on Postgres, do it in the entrypoint 2024-07-24 22:29:07 +02:00
Benjamin Bach 2c99799d4d Shorten and document Docker tweaks for Python and pip ()
Wanted to use some of the setup for bootstrapping another project, so I had a close look over these couple of items.

Reviewed-on: 
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
Benjamin Bach d9de265de9
Fix some admin columms 2024-07-22 16:49:24 +02:00
Benjamin Bach ee2ef48b96
Reorganize Order fields, add admin, Upgrade to Django 5.1b1 2024-07-21 19:07:59 +02:00
Benjamin Bach e27bc7969d
Merge branch 'waiting-list' into payment-updates 2024-07-21 16:11:53 +02:00
Benjamin Bach 5055095c6b
Admin for Member model, not for User 2024-07-21 16:10:20 +02:00
Benjamin Bach 1f28ffc9c5
WIP: Missing migrations 2024-07-21 13:41:50 +02:00
Benjamin Bach f30bc08451
Merge branch 'main' of git.data.coop:data.coop/membersystem into payment-updates 2024-07-21 11:05:15 +02:00
Benjamin Bach 250f203900
Fix some issues after merge conflixts 2024-07-20 22:45:44 +02:00
Benjamin Bach d769481848
Add a few more README things on Docker 2024-07-20 22:34:19 +02:00
Benjamin Bach 36d71f180a
Merge branch 'main' of git.data.coop:data.coop/membersystem into waiting-list 2024-07-20 22:24:41 +02: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
Benjamin Bach b366bc2499
WIP: cleanup setup 2024-07-14 21:19:32 +02:00
Víðir Valberg Guðmundsson b39b114e30 pre-commit autoupdate 2024-07-14 20:55:22 +02:00
Benjamin Bach 1405a95094
Waiting list function: WaitingListEntry model for people that can be invited in the future 2024-07-14 19:20:32 +02:00
Benjamin Bach 7cc22aa0a1
WIP: Changes to payment models 2024-07-14 18:12:14 +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
Halfdan Mouritzen 4112069cac feature/css ()
Reviewed-on: 
Co-authored-by: Halfdan Mouritzen <halfdan@robothangarskib.dk>
Co-committed-by: Halfdan Mouritzen <halfdan@robothangarskib.dk>
2024-02-29 20:02:39 +00:00
Víðir Valberg Guðmundsson bdc2d8717c Add devenv files. 2024-02-10 10:55:38 +01:00
Víðir Valberg Guðmundsson f99c7ee698 Fetch permissions before rendering templates. 2024-02-10 10:50:23 +01:00
Víðir Valberg Guðmundsson a098a0b032 Add logging. 2024-02-09 22:04:30 +01:00
Víðir Valberg Guðmundsson f31cd62351 Implement django-view-decorator 2024-01-14 12:27:36 +01:00
Víðir Valberg Guðmundsson b8a970d5fe Add missing migration 2024-01-14 12:14:51 +01:00