From b3e7b27ed8f8254d9765d997502e92f474bb3915 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 14:59:23 -0500 Subject: [PATCH 01/11] sync lockfile --- uv.lock | 118 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/uv.lock b/uv.lock index 21df0cbdc..fcda2c75b 100644 --- a/uv.lock +++ b/uv.lock @@ -3,10 +3,10 @@ revision = 3 requires-python = ">=3.14" resolution-markers = [ "python_full_version >= '3.15' and sys_platform == 'win32'", - "python_full_version < '3.15' and sys_platform == 'win32'", "python_full_version >= '3.15' and sys_platform == 'emscripten'", - "python_full_version < '3.15' and sys_platform == 'emscripten'", "python_full_version >= '3.15' and sys_platform != 'emscripten' and sys_platform != 'win32'", + "python_full_version < '3.15' and sys_platform == 'win32'", + "python_full_version < '3.15' and sys_platform == 'emscripten'", "python_full_version < '3.15' and sys_platform != 'emscripten' and sys_platform != 'win32'", ] @@ -161,30 +161,30 @@ wheels = [ [[package]] name = "boto3" -version = "1.43.93" +version = "1.43.104" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "botocore" }, { name = "jmespath" }, { name = "s3transfer" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c2/37/7a09d8320685b3b8c8a014e392e7595025d00965c46c5f410797905fab7a/boto3-1.43.93.tar.gz", hash = "sha256:196bfc8b4c9cd5505f9f7b963e30956db3a00fd47e20dd0ee3574a243c1fb212", size = 112752, upload-time = "2026-09-11T19:23:03.484Z" } +sdist = { url = "https://files.pythonhosted.org/packages/b3/d3/aae7125fb2ed6796aea7a0f5588af71971569f14063cfa65a01178f619ca/boto3-1.43.104.tar.gz", hash = "sha256:d26ad9b8f6066e9be90c78c1f8f0cdd82e33e0a363a1ccc5ab01008b0e48c7fd", size = 112676, upload-time = "2026-09-28T19:32:15.638Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/ea/68/f8f661b9e68daba4f775bfa1e750732ec52fc89b32d55f300aef530e1d62/boto3-1.43.93-py3-none-any.whl", hash = "sha256:3c948fe231490d446bf90bf3322d1452632107329d3683b37d88b7399bf481a0", size = 140022, upload-time = "2026-09-11T19:23:01.995Z" }, + { url = "https://files.pythonhosted.org/packages/c7/94/518f876ac2ea906c67ab3d08c7659c78bbeed358604911bfba773bc2bbda/boto3-1.43.104-py3-none-any.whl", hash = "sha256:dc0c4b5c217fa38792d6b2e3c89b0d26220fd938dc173e48adab45d2d05e6977", size = 140042, upload-time = "2026-09-28T19:32:14.133Z" }, ] [[package]] name = "botocore" -version = "1.43.98" +version = "1.43.108" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "jmespath" }, { name = "python-dateutil" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/36/5e/8d655aeaae195b9856a554e724322092b4cc1b8bb58a29167bea80bf800c/botocore-1.43.98.tar.gz", hash = "sha256:6135dd639ea6d1b3b49381bc253c8a139d61f7d44cb5f7dae8e7cd1791758572", size = 16127750, upload-time = "2026-09-18T20:10:00.892Z" } +sdist = { url = "https://files.pythonhosted.org/packages/61/16/6b4477f433da2c11193802f538330ce080076c2f38d817ad437ed3cd1465/botocore-1.43.108.tar.gz", hash = "sha256:ee4f75cf3bdbb0da7912e089950e8112f692016539d939312c771499958e6cfd", size = 16312879, upload-time = "2026-10-02T19:32:20.797Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/65/ca/c7617e99c3247f545233ab2181840d142c5f72034e22864172866fb1369a/botocore-1.43.98-py3-none-any.whl", hash = "sha256:84b35b10402c2fc0c265f634fbf86336eecc6489ee23f55074b329924b2cfd6f", size = 15817751, upload-time = "2026-09-18T20:09:57.566Z" }, + { url = "https://files.pythonhosted.org/packages/7a/0b/4670b7e23914b5cc357be5ca45fae503b57d98ecff4b3eabea70412809fd/botocore-1.43.108-py3-none-any.whl", hash = "sha256:ab9d16c6b4350aaa54ed28202dfa2998b2d735fdbf3247eb60af469d8d48a5b8", size = 16008194, upload-time = "2026-10-02T19:32:15.086Z" }, ] [[package]] @@ -500,15 +500,15 @@ wheels = [ [[package]] name = "django-allauth" -version = "65.19.3" +version = "65.19.5" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "asgiref" }, { name = "django" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/62/d8/4ab919f8c8a0ac88251117e0edb09d033437d66b24e70c1f5bbfbbed9636/django_allauth-65.19.3.tar.gz", hash = "sha256:2267b66c3212645ef2f1b26bc46ca220abea6281cd78c7014a427a1f759137a3", size = 2291175, upload-time = "2026-09-11T16:58:54.948Z" } +sdist = { url = "https://files.pythonhosted.org/packages/03/0d/ca8cc8244849299160c433b7738a3f318eaad1967761083b44b0b2bee80c/django_allauth-65.19.5.tar.gz", hash = "sha256:03fdb1431e8cecd55071e6c3a3006f2fe1a45b916ee2bf5d14ed0fdadea3b7e5", size = 2294382, upload-time = "2026-09-28T19:45:56.88Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/25/66/37dba4632615d8dc110279c5d179521c73e5da3f7f9825a264d271bbf5a5/django_allauth-65.19.3-py3-none-any.whl", hash = "sha256:5dc1936001bd33771d453032366af25fc16fcd35a93789f46206d5d2a7cc83e0", size = 2075304, upload-time = "2026-09-11T16:58:52.185Z" }, + { url = "https://files.pythonhosted.org/packages/32/c5/6500f20404c8fe31ef328ffd4f165f0517c7cb8c189cf2f91c7b6f9ae687/django_allauth-65.19.5-py3-none-any.whl", hash = "sha256:eda48d77cd790d2e60862993fe19e59ff2e18c6be8aa490d407e0ee1108dd385", size = 2076097, upload-time = "2026-09-28T19:45:54.025Z" }, ] [[package]] @@ -645,15 +645,15 @@ wheels = [ [[package]] name = "django-imagekit" -version = "6.1.0" +version = "6.1.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "django-appconf" }, { name = "pilkit" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/62/5f/229c58eefe2a9051bc17152179c46002b519371001ad15097a50226e1306/django_imagekit-6.1.0.tar.gz", hash = "sha256:60fa411eaf5d2d137e1d18d17b3004a6d17b482ca46b3e4b5121a5338a8fc9ff", size = 65550, upload-time = "2026-02-22T18:17:03.951Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f2/81/c84c01d49457d589d339217402cdaa7853492dcf47c5575c55bb5b8eb482/django_imagekit-6.1.1.tar.gz", hash = "sha256:3d254c163fda1aeb163ea2c79399f9892c12a0c2ce881059e450ad7fe930a017", size = 65570, upload-time = "2026-09-15T22:17:26.037Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/a0/4f/9a3b70941982efb80fc59880a471cf26818879a00f930d80d82342cf63c1/django_imagekit-6.1.0-py3-none-any.whl", hash = "sha256:b735620d101821ae0789480b3945addfeb900f0d7653c7f377e0dc1ed63d7c39", size = 41061, upload-time = "2026-02-22T18:17:02.622Z" }, + { url = "https://files.pythonhosted.org/packages/9b/7b/807277df8641c9b5422b7a91fb33f68c01edd0e74f49af86bce0f1120a56/django_imagekit-6.1.1-py3-none-any.whl", hash = "sha256:211765099e1c435c2b1d4664621c7cdf91aa0a3394de8fc1053b89e468000d53", size = 67748, upload-time = "2026-09-15T22:17:24.59Z" }, ] [[package]] @@ -895,14 +895,14 @@ wheels = [ [[package]] name = "faker" -version = "40.38.0" +version = "40.40.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "tzdata", marker = "sys_platform == 'win32'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f2/55/baeae0ecb04ef56c92d6ac1ef7b3b965af0502ac9863fc85db7afc0884fd/faker-40.38.0.tar.gz", hash = "sha256:72e421098664edf38478f4269a5d5a539337de5da18883ce67cb1e6bb96b0b3a", size = 2029190, upload-time = "2026-09-01T19:19:46.958Z" } +sdist = { url = "https://files.pythonhosted.org/packages/43/43/7f5870d05331cb1649704040f51332d37f2468ed857de1e226482e2948b0/faker-40.40.0.tar.gz", hash = "sha256:803ee7f920679e7367c3f7b7f97752f5a9780aa5566c71723fbe57d591beafe1", size = 2029985, upload-time = "2026-09-29T00:56:19.983Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/f1/b8/48cb8733de8448023983f64e81d7f731ce1459c21e93b9b29657e5c48cab/faker-40.38.0-py3-none-any.whl", hash = "sha256:69927515d61759c8a257540b8a91891cd622ba1c24a386b62a0a777e44ba46a9", size = 2065931, upload-time = "2026-09-01T19:19:45.234Z" }, + { url = "https://files.pythonhosted.org/packages/e1/d2/58beb2b8355f89b483fa21b99fe9934ee7312e3ccf228bb7cefe9e8d979c/faker-40.40.0-py3-none-any.whl", hash = "sha256:cd45ebdd1363f92a45740ac49945e49fa18f7e10771884a83c796a235550d7b7", size = 2066663, upload-time = "2026-09-29T00:56:17.952Z" }, ] [[package]] @@ -978,11 +978,11 @@ wheels = [ [[package]] name = "idna" -version = "3.19" +version = "3.20" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/5f/f7/abb373e5757eaec4b922b92f97ec8d6d7e057cf06778247604fbc4e7c3f3/idna-3.19.tar.gz", hash = "sha256:5e0811a4383b21dc5838069f801c4fb62113b7447663d2530d2bd6e77b49bf15", size = 215237, upload-time = "2026-08-18T05:14:24.27Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f5/08/8eea9d4b8302028f3abb2c0813953f7aec26d33b7a8960ed760e65ff29fa/idna-3.20.tar.gz", hash = "sha256:a7db850025b95ded1eae8a46181a1a6c56c92c96f0e2b005d9ff8dc0210cab44", size = 216463, upload-time = "2026-09-17T14:11:04.752Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/57/b0/0e52c878c53f245edd3a11020f20979b3f490f245af532c7cae3027754b5/idna-3.19-py3-none-any.whl", hash = "sha256:815e7be7a7806d54abb586dc943addc79e8b2ee16915059658cbeff4b1b43bf4", size = 68550, upload-time = "2026-08-18T05:14:22.343Z" }, + { url = "https://files.pythonhosted.org/packages/58/a2/bb081bab032533a855d44de1d56f8e8426114ff1ba5d1f07a438a0a654f8/idna-3.20-py3-none-any.whl", hash = "sha256:ab7ae7122974553370f0bdb919e1a960b2cd1bc1ef0276416d896db81c14582c", size = 69583, upload-time = "2026-09-17T14:11:03.168Z" }, ] [[package]] @@ -1181,11 +1181,11 @@ wheels = [ [[package]] name = "markdown" -version = "3.10.3" +version = "3.11" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/29/6f/da4c6aea59b3001f2e8c0ec7497475aadaf3b021c10cab5b2858f0f32b26/markdown-3.10.3.tar.gz", hash = "sha256:3589362618f743188b4d955b874402bc814f4f83f544dc207719f4baa7d9c45f", size = 372596, upload-time = "2026-07-30T19:05:29.005Z" } +sdist = { url = "https://files.pythonhosted.org/packages/f8/4f/700155c8c20d9e655dd0732b5fc3c7614f291b9148da271d7388e50bf774/markdown-3.11.tar.gz", hash = "sha256:180224db6aed87ba9ce1f2781ebcd5826253de8ff637112090e24b84502bbf9f", size = 485623, upload-time = "2026-09-25T13:46:23.473Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/64/69/4a5af2bc115a9a33fefe51709749de8262be3f9ba063d1753a837cdbc49c/markdown-3.10.3-py3-none-any.whl", hash = "sha256:fa6c92a00a4a3c98b22728c64a935ae1928250ae65058a6ded814d2cc29a4cea", size = 110757, upload-time = "2026-07-30T19:05:27.883Z" }, + { url = "https://files.pythonhosted.org/packages/ec/1e/32971905a7ab47f8b66866ed949fa48b104ba1c4a6fa57794c4f2c4b2cb8/markdown-3.11-py3-none-any.whl", hash = "sha256:cd6c89e7eb308c8b332ed673215a52d208a43f8bacc030b1419376129408719e", size = 111296, upload-time = "2026-09-25T13:46:22.163Z" }, ] [[package]] @@ -1253,14 +1253,14 @@ wheels = [ [[package]] name = "model-bakery" -version = "1.24.0" +version = "1.24.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "django" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f9/49/3e5b51d7af52bf39e348767c1feb16c97d18654a8e3f3306eb4b899e98cf/model_bakery-1.24.0.tar.gz", hash = "sha256:6469223c9fb0eccb021d5c33667b914e9208dd2282d7dc1e55394c2310a7687d", size = 28372, upload-time = "2026-06-23T21:55:23.19Z" } +sdist = { url = "https://files.pythonhosted.org/packages/39/e7/dcd5854ba8b984510407c08b363af8f44556675cb8fe98a1413ac8967649/model_bakery-1.24.1.tar.gz", hash = "sha256:36e448446794b1a29f2bd247d76c1af990e38cb38e9e39870580f4d79899e6a7", size = 29657, upload-time = "2026-09-22T11:31:20.659Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/60/8e/9108507501846c9ee2a1b277d35d1f92ae251852bbd1527f6dbf2665d94a/model_bakery-1.24.0-py3-none-any.whl", hash = "sha256:d1f739cfc43e8d403d04734a18c73c8e677f655dd08719e35342c2f5ada1d7e9", size = 30819, upload-time = "2026-06-23T21:55:21.911Z" }, + { url = "https://files.pythonhosted.org/packages/22/00/9cadd0e5d36ba732e3b58ccf7567b9e80059da2780a1b281096f0e91e846/model_bakery-1.24.1-py3-none-any.whl", hash = "sha256:58eae4ab3ed3504bbac965daf89626a034021233ad7bc81482aef75228cafb5c", size = 32028, upload-time = "2026-09-22T11:31:19.302Z" }, ] [[package]] @@ -1753,7 +1753,7 @@ docs = [ [package.metadata] requires-dist = [ { name = "beautifulsoup4", specifier = "==4.15.0" }, - { name = "boto3", marker = "extra == 'prod'", specifier = "==1.43.93" }, + { name = "boto3", marker = "extra == 'prod'", specifier = "==1.43.104" }, { name = "celery", extras = ["redis"], specifier = "==5.6.3" }, { name = "chardet", specifier = "==7.6.0" }, { name = "cmarkgfm", specifier = "==2024.11.20" }, @@ -1761,7 +1761,7 @@ requires-dist = [ { name = "dj-database-url", specifier = "==3.1.2" }, { name = "django", specifier = "==5.2.17" }, { name = "django-admin-interface", specifier = "==0.32.0" }, - { name = "django-allauth", specifier = "==65.19.3" }, + { name = "django-allauth", specifier = "==65.19.5" }, { name = "django-apptemplates", specifier = "==1.5" }, { name = "django-celery-beat", specifier = "==2.9.0" }, { name = "django-countries", specifier = "==8.2.0" }, @@ -1770,7 +1770,7 @@ requires-dist = [ { name = "django-filter", specifier = "==26.1" }, { name = "django-haystack", specifier = "==3.4.0" }, { name = "django-honeypot", specifier = "==1.3.0" }, - { name = "django-imagekit", specifier = "==6.1.0" }, + { name = "django-imagekit", specifier = "==6.1.1" }, { name = "django-import-export", extras = ["ods", "xls", "xlsx", "yaml"], specifier = "==4.4.1" }, { name = "django-markupfield", specifier = "==2.0.1" }, { name = "django-ordered-model", specifier = "==3.7.4" }, @@ -1788,9 +1788,9 @@ requires-dist = [ { name = "feedparser", specifier = "==6.0.14" }, { name = "gunicorn", marker = "extra == 'prod'", specifier = "==23.0.0" }, { name = "icalendar", specifier = "==7.3.0" }, - { name = "idna", specifier = "==3.19" }, + { name = "idna", specifier = "==3.20" }, { name = "lxml", specifier = "==6.1.3" }, - { name = "markdown", specifier = "==3.10.3" }, + { name = "markdown", specifier = "==3.11" }, { name = "nh3", specifier = "==0.3.7" }, { name = "num2words", specifier = "==0.5.14" }, { name = "panflute", specifier = "==2.3.1" }, @@ -1802,7 +1802,7 @@ requires-dist = [ { name = "python-decouple", specifier = "==3.8" }, { name = "python3-openid", specifier = "==3.2.0" }, { name = "requests", specifier = ">=2.34.2" }, - { name = "sentry-sdk", extras = ["django"], marker = "extra == 'prod'", specifier = "==2.69.1" }, + { name = "sentry-sdk", extras = ["django"], marker = "extra == 'prod'", specifier = "==2.71.0" }, { name = "sorl-thumbnail", specifier = "==13.1.0" }, { name = "unidecode", specifier = "==1.4.0" }, { name = "whitenoise", marker = "extra == 'prod'", specifier = "==6.12.0" }, @@ -1816,12 +1816,12 @@ dev = [ { name = "django-debug-toolbar", specifier = "==8.0.0" }, { name = "django-stubs", specifier = "==5.2.9" }, { name = "factory-boy", specifier = "==3.3.3" }, - { name = "faker", specifier = "==40.38.0" }, - { name = "model-bakery", specifier = "==1.24.0" }, + { name = "faker", specifier = "==40.40.0" }, + { name = "model-bakery", specifier = "==1.24.1" }, { name = "mypy", specifier = "==2.4.0" }, { name = "pyproject-fmt", specifier = "==2.29.4" }, { name = "responses", specifier = "==0.26.3" }, - { name = "ruff", specifier = "==0.16.7" }, + { name = "ruff", specifier = "==0.16.9" }, { name = "tblib", specifier = "==1.7.0" }, ] docs = [ @@ -1909,27 +1909,27 @@ wheels = [ [[package]] name = "ruff" -version = "0.16.7" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/82/bb/5a449b9162e49b139d72f61672bd3ac1d790221f796d3304e2241fff4c58/ruff-0.16.7.tar.gz", hash = "sha256:5f71d004ac1263b22fa39462ac5ae618a4b77d58981af2cc79bf79a29c12b1a6", size = 4924184, upload-time = "2026-09-10T18:04:06.336Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e3/b2/c80aeeb7f9e469c0d63a85d2f1ab6e1ebfbe10ea7a8d2438b7e09e3ff09e/ruff-0.16.7-py3-none-linux_armv6l.whl", hash = "sha256:727307773e7c7f9181d3ed3a2484186e56c1fa1874255911c74585eb2c7c19f9", size = 10048917, upload-time = "2026-09-10T18:03:30.28Z" }, - { url = "https://files.pythonhosted.org/packages/7b/96/20bb7bcae008004df52afcb7ac83432d4a467f2c17b672fe46d26be231c5/ruff-0.16.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:9d61c258deabf58f34c67bd4bb4d939c7f2e6b5f0e59c1cdd1cf771b11cde929", size = 10242929, upload-time = "2026-09-10T18:03:32.706Z" }, - { url = "https://files.pythonhosted.org/packages/90/b2/f184b0d5abec02db69cfd7e49b688ae0237554528ca777136c613bf36bee/ruff-0.16.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7ab81118df8945e0193d0240712aa4496573595b75185c3636ed825592a0f728", size = 9847245, upload-time = "2026-09-10T18:03:34.509Z" }, - { url = "https://files.pythonhosted.org/packages/eb/2d/db1633a641866ed801e34cc6b60ef236c5e16f9b2124ab1d49cc24a5fe4f/ruff-0.16.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c196c968874fc8019da8e7163de7a1a370f111e2309b4b7dfea0fce950198d0", size = 9961780, upload-time = "2026-09-10T18:03:36.618Z" }, - { url = "https://files.pythonhosted.org/packages/4d/98/edea21e1a3e38dbbc3bf6bb068b863b3b06184cf8533a4c7dbbe208a89d5/ruff-0.16.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac8c3bd0a7e10ad31e6ce51e7a99f3cb772e69aecdd6b9ea7e99b362f62a62c0", size = 9866337, upload-time = "2026-09-10T18:03:38.805Z" }, - { url = "https://files.pythonhosted.org/packages/0b/11/a15e60d4c87b214646f116ca9d204475bf993ee1047459bc9a360fd4d6d1/ruff-0.16.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:398d3988edde000b5c75dc1b3f584708da9bc990de069c18909142580fec1af9", size = 10562512, upload-time = "2026-09-10T18:03:40.71Z" }, - { url = "https://files.pythonhosted.org/packages/29/42/eaff4c9b6d0c7cdf56df313a17e89ae854f5bbc0b0c8f9cce19be0ab7a8f/ruff-0.16.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce05b62b770a8217c4646a9c4139fca00efe8fe5d71f87df2b243ff20d4584d1", size = 11302938, upload-time = "2026-09-10T18:03:42.607Z" }, - { url = "https://files.pythonhosted.org/packages/5d/43/c75aa59a4ec181fe2ec06cab30e198c1c6d107229a9f008ae3a7c16cabd8/ruff-0.16.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:af1b576fddb9d9ef2ececfb5fadcd6a624b25070ed85e3cfcfe449fc3ff6a7b9", size = 10840857, upload-time = "2026-09-10T18:03:44.604Z" }, - { url = "https://files.pythonhosted.org/packages/21/33/81f3da371942ea031105ba679d8d6e28ec1660ccd690a45f42d381161356/ruff-0.16.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ce7f8f22df67c93ed96c717f9128eadb797144ac2bad475cf536f31d6100c55", size = 10370001, upload-time = "2026-09-10T18:03:46.706Z" }, - { url = "https://files.pythonhosted.org/packages/fa/0b/6345fb4dbf6dd0ed1cfe5d18391dc9c3f59cc81622a7b0a65b84b3e730ba/ruff-0.16.7-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:06d0e93d04f392996435ebd600c153f65b47d73fbec2415aa99c5ee5756b3a5f", size = 10548735, upload-time = "2026-09-10T18:03:48.658Z" }, - { url = "https://files.pythonhosted.org/packages/3f/4d/c5576adf511f92a328e5569dda190ecdd430da51f1a649f3a4a2fd73e21e/ruff-0.16.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:142151a5e7b93c1b11111337142f89dd2fbfee92161225c99a97222f22e32656", size = 10108496, upload-time = "2026-09-10T18:03:50.563Z" }, - { url = "https://files.pythonhosted.org/packages/ff/8c/667d83c16199a17a56adc6b0bd4c3beb5b767a2babcd16a56f76f9be7fd6/ruff-0.16.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:e6651f97a342d8b35d54d8991544ca22169b86dc54111cb604666940c431b750", size = 9860136, upload-time = "2026-09-10T18:03:52.621Z" }, - { url = "https://files.pythonhosted.org/packages/99/75/78d401106731999a1dd20cc5a6961e37e1eb9397a3b589f73f3a5ce146a3/ruff-0.16.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:ef140c6eb935fa9a84c9c607dfb2cb1b85843c192e79265b0c54f35f557ea8e5", size = 10286290, upload-time = "2026-09-10T18:03:55.207Z" }, - { url = "https://files.pythonhosted.org/packages/68/49/56f9c3a8b755df93a0ad318b2147bf4ef5dae9a7e5ec61c460109c67957f/ruff-0.16.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:53e39506a730fadeee0d998ed5946f30671f0db240c6c7c73bdabbe33604bb6f", size = 10745048, upload-time = "2026-09-10T18:03:57.299Z" }, - { url = "https://files.pythonhosted.org/packages/5f/ea/7f9b938a63ece4bec677ad7f9f7fa02df3383db1949ed93a382441c09a87/ruff-0.16.7-py3-none-win32.whl", hash = "sha256:2ea3470fcebcbc5df2fb0c6f3b90333fa9084c534e0111c038fa4a6ab9f1c4b7", size = 10059082, upload-time = "2026-09-10T18:03:59.632Z" }, - { url = "https://files.pythonhosted.org/packages/39/11/480a6973a927aa653e1cead6a6416008640e03a99d05b34c0434b8c6c366/ruff-0.16.7-py3-none-win_amd64.whl", hash = "sha256:7ac26aca826e9e21d0f1cb25b54ac660760a9fdd094d3e4df9848232be98cfc6", size = 10593368, upload-time = "2026-09-10T18:04:01.999Z" }, - { url = "https://files.pythonhosted.org/packages/8b/4b/51327018d056f0dad2c2238f26d1fb0f53707a9d91b75dea6d1b3039f136/ruff-0.16.7-py3-none-win_arm64.whl", hash = "sha256:aab7f39e2c9df6c596216070f98eef1207b94f8516cca20c808826974971855b", size = 10412401, upload-time = "2026-09-10T18:04:04.098Z" }, +version = "0.16.9" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/96/bf/c935ca98e73fe8ce65b87ef08a280c0c1e85295d569228c15e87d8fdfaf1/ruff-0.16.9.tar.gz", hash = "sha256:12b625c6cfba78d285d9f48eda5f053374f1e53cb10ef17342a383750db99161", size = 4948764, upload-time = "2026-09-24T20:37:49.416Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/0d/26/df51322b52ee1ada7eff2d071ea09d11d5c2d1dcc9f02594f5785c4d1635/ruff-0.16.9-py3-none-linux_armv6l.whl", hash = "sha256:95e6f022090368ab3b824c36276839c53b2adf1a3f4c09fefc33dfc400f6da96", size = 10082922, upload-time = "2026-09-24T20:37:13.045Z" }, + { url = "https://files.pythonhosted.org/packages/a5/27/7bf51f5a7aa375e9f339280a303aab44ca75dc1525f1cdc5991761685b0f/ruff-0.16.9-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:a5f27be168556594a86d2f415db0cf43f5291917849318f873c7e2791f7a8c67", size = 10236360, upload-time = "2026-09-24T20:37:16.049Z" }, + { url = "https://files.pythonhosted.org/packages/b6/63/09659283f92f02dff45809da194a70da2f688d87c55d8875c4fae3536072/ruff-0.16.9-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1632eb1d6197f33bd00b1acbc5b71009e89a8895c158e2d2b03a834fac964ab6", size = 9892940, upload-time = "2026-09-24T20:37:17.957Z" }, + { url = "https://files.pythonhosted.org/packages/24/58/98de1b72ec172f5f8f1731236fe21585b3998bf7dfe9fcc44ae9ba626012/ruff-0.16.9-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b3f951b14d865d5952c89d40a5ca07e87abe24fa5453299878411e127748fb1c", size = 10032114, upload-time = "2026-09-24T20:37:19.942Z" }, + { url = "https://files.pythonhosted.org/packages/c8/7d/f1e17c54ab59d4bad1dce8ee3e22a7a1d0ef4745240decacdcf3832b5bb2/ruff-0.16.9-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:447fc07e1573afff7cb02803462b12b6c8ece7cf10e2cd78565fa6d7a1c0bf8d", size = 9910227, upload-time = "2026-09-24T20:37:21.872Z" }, + { url = "https://files.pythonhosted.org/packages/34/19/436f647a65075bbd3bab2668b3bdaa5120559b294694018cdcefabbbf30b/ruff-0.16.9-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8a3e039a6a40ed976c491722b60e0ae4a4aa1a86057f540ee7a37a5d19ae9120", size = 10547484, upload-time = "2026-09-24T20:37:24.229Z" }, + { url = "https://files.pythonhosted.org/packages/03/59/38430a6bc2f6d8095447ac39625cf8b6e9344a47e6c26225c8ba1bff3ffb/ruff-0.16.9-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4684dded7db60aa57cb118fa158630f5feade4af5782903b6053484bdf9bd129", size = 11412367, upload-time = "2026-09-24T20:37:26.307Z" }, + { url = "https://files.pythonhosted.org/packages/c8/bd/bbb6d7fc7f208c8b8c50dd5dc8206e4cfdb1e7a8fb852606a3adf370c880/ruff-0.16.9-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d29c934357e45642fda2f34c0b1f4025b4a6c01e15e4bf0016879d60078a142c", size = 10869787, upload-time = "2026-09-24T20:37:28.35Z" }, + { url = "https://files.pythonhosted.org/packages/bc/b8/9c543074918061abbefc3bd139bee22de35abedb00dde0f2d27288838962/ruff-0.16.9-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a21713e629d3e5bdb2f5c2def1cc7f04f47fa8e1a7eb0571b4a28e1da64bc728", size = 10406494, upload-time = "2026-09-24T20:37:30.624Z" }, + { url = "https://files.pythonhosted.org/packages/35/7a/5a8851bd146e7ccf8fd4b003f6c75c11f8fbdb0e60673b45097986b6bf41/ruff-0.16.9-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:7baa24ef5fc8e77aa93879e1d3f43754a01ae488e869f1ae30cf431afd4d2452", size = 10590083, upload-time = "2026-09-24T20:37:32.439Z" }, + { url = "https://files.pythonhosted.org/packages/87/f0/4c3467188f23f806960b46fa76575a7cd0514c9ba90562650b71efc96980/ruff-0.16.9-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:a41aac6230aadfaa133bdfa1614488531ffa3e0837567ae04c0da2058a9c0f9e", size = 10119151, upload-time = "2026-09-24T20:37:34.581Z" }, + { url = "https://files.pythonhosted.org/packages/15/34/5a4def5adea572ce6aea0bb64f21f928ee317b80e0db747d7979b01d7261/ruff-0.16.9-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:c2529fb5896d49115b0e9aa8f887490b34bbe76baf879ec2264ac59406869ce7", size = 9911544, upload-time = "2026-09-24T20:37:36.796Z" }, + { url = "https://files.pythonhosted.org/packages/62/5d/d15ebea7499eef9373318c0ee6ca127832927c6529731f6d48e18dce7ca9/ruff-0.16.9-py3-none-musllinux_1_2_i686.whl", hash = "sha256:41e3870277694177429b56406d65dfbdb2c2802c52b715edaf6a0b829c69d4ee", size = 10269884, upload-time = "2026-09-24T20:37:38.857Z" }, + { url = "https://files.pythonhosted.org/packages/d1/56/c5d3cd119ded7a3c7aba0e961b69cb3df701c91662c98ad694467d060ce1/ruff-0.16.9-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:8adbe4e58af167f767d7b2ba5e83c42e878350796cf78c2f5e14ab9903a92588", size = 10749366, upload-time = "2026-09-24T20:37:41.042Z" }, + { url = "https://files.pythonhosted.org/packages/ac/fe/734ec7527029ac757ecf821f143c9f3fcf69149c21f53a044a899b430f5a/ruff-0.16.9-py3-none-win32.whl", hash = "sha256:0e1dbc2073624dee6618d41d0098690a7244654af746704b64759e12b6b6b385", size = 10152355, upload-time = "2026-09-24T20:37:43.025Z" }, + { url = "https://files.pythonhosted.org/packages/14/21/26e4643629b3ebb44f0a06f9c9a53058d63d989415f63a9a3c28e2ee7f22/ruff-0.16.9-py3-none-win_amd64.whl", hash = "sha256:6bd40fec8cd4c8a3d4dd589bd8ad4e6320c13c29234159bfd959a40d529d597b", size = 10592965, upload-time = "2026-09-24T20:37:44.944Z" }, + { url = "https://files.pythonhosted.org/packages/51/60/5fb1a39dbb5ae314d5f59bc7348a63c1d5c20f3cd83914c4b5cb0be31d2d/ruff-0.16.9-py3-none-win_arm64.whl", hash = "sha256:ed1a252039200f57a59eebc063b54beabea67bfbaaca0eeaa7f54b5fbcda2284", size = 10458649, upload-time = "2026-09-24T20:37:46.882Z" }, ] [[package]] @@ -1946,15 +1946,15 @@ wheels = [ [[package]] name = "sentry-sdk" -version = "2.69.1" +version = "2.71.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/10/16/85874f5e51f8d0767ee8c4b4c460c5ea2bc8a1b613d641d9d9577ba39d3a/sentry_sdk-2.69.1.tar.gz", hash = "sha256:f9284b417540b0784b994fa021eb6f1e30ae1cce593d83541274d03c93966eff", size = 1043599, upload-time = "2026-09-08T14:18:19.505Z" } +sdist = { url = "https://files.pythonhosted.org/packages/67/93/9ef70bfb7346c778caf09b7cd10c17c33f601f2d17019fa1aedcda738b5f/sentry_sdk-2.71.0.tar.gz", hash = "sha256:7beb27a22f06396f3a05510c3da6ea10e1c79e02e859993c27ce4ff074e296d6", size = 1052358, upload-time = "2026-09-28T14:04:00.645Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/43/eb/17040f8a60c300fe4cc349088d3e351b88812f478b57a0af05a49af7cb7c/sentry_sdk-2.69.1-py3-none-any.whl", hash = "sha256:2d2556d9a14db548982b914cbed2a2dc07b6e55d941a620752f89a2afccfd78d", size = 528587, upload-time = "2026-09-08T14:18:18.151Z" }, + { url = "https://files.pythonhosted.org/packages/a4/f6/b3e68b2e08e9a52e6c8a279ca2fc0d3a535f3886222375f54ef9efbd694d/sentry_sdk-2.71.0-py3-none-any.whl", hash = "sha256:9ed36b4c206048aa67b5ddba0a6e28d59fc55cf10d60f5f7aea2c3917184bf4a", size = 534254, upload-time = "2026-09-28T14:03:58.668Z" }, ] [package.optional-dependencies] From eb3df3055e70f14419bab6bb103a88ed0fc48b46 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 14:59:44 -0500 Subject: [PATCH 02/11] clarify tier svcs describe availability --- apps/agreements/orders/catalog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/agreements/orders/catalog.py b/apps/agreements/orders/catalog.py index 61dae58d4..22f8b2f84 100644 --- a/apps/agreements/orders/catalog.py +++ b/apps/agreements/orders/catalog.py @@ -131,7 +131,7 @@ def addon(self, key: str) -> AddOn: return _lookup(self.addons, key, "add-on") def services_at(self, tier_key: str) -> list[Service]: - """Return services included at a valid tier.""" + """Return services available for selection at a valid tier.""" self.tier(tier_key) return [service for service in self.services if service.included_at(tier_key)] From edfb5042c2adfde85b083037bef9b147ded4ebac Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:00:01 -0500 Subject: [PATCH 03/11] base svc styling --- apps/agreements/static/agreements/package-builder.css | 5 +++++ apps/agreements/templates/agreements/orders/base.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/agreements/static/agreements/package-builder.css b/apps/agreements/static/agreements/package-builder.css index 4840a9618..11c07e9b2 100644 --- a/apps/agreements/static/agreements/package-builder.css +++ b/apps/agreements/static/agreements/package-builder.css @@ -219,6 +219,11 @@ .package-builder .pb-tier-facts { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0.75em; margin-top: 0.65em; } .package-builder .pb-tier-facts dt { margin-top: 0; } } +.package-builder .pb-base-services { margin-top: 1.25em; } +.package-builder .pb-base-service input { width: 1.1em; height: 1.1em; accent-color: var(--pb-blue); } +.package-builder .pb-base-service .choice-help { display: block; } +.package-builder .pb-base-service:has(input:disabled) { color: var(--pb-muted); cursor: default; } +.package-builder .pb-base-services .pb-services-changed { margin-top: 1em; } .package-builder .pb-staff-details { margin-top: 1.5em; border-bottom: 1px solid var(--pb-line); } .package-builder .pb-staff-details > summary { padding: 0.7em 0; color: var(--pb-blue-dark); font-size: 0.9375em; font-family: SourceSansProBold, Arial, sans-serif; cursor: pointer; } .package-builder .pb-staff-details[open] { padding-bottom: 1em; } diff --git a/apps/agreements/templates/agreements/orders/base.html b/apps/agreements/templates/agreements/orders/base.html index 22b5187f8..b35e48664 100644 --- a/apps/agreements/templates/agreements/orders/base.html +++ b/apps/agreements/templates/agreements/orders/base.html @@ -3,7 +3,7 @@ {% block title %}Service orders{% endblock %} {% block body_attributes %}class="psf agreements agreement-orders"{% endblock %} -{% block head %}{{ block.super }}{% endblock %} +{% block head %}{{ block.super }}{% endblock %} {% block crumbs %}
  • Service orders
  • {% endblock %} {% block left_sidebar %} From 25304880a56fa3a412646838ca4e75dce33d04b2 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:02:03 -0500 Subject: [PATCH 04/11] Support explicit base-service selections without changing tier fees --- .../migrations/0004_orderline_services.py | 37 ++++ apps/agreements/models/orders.py | 16 ++ apps/agreements/orders/documents.py | 2 +- apps/agreements/orders/forms.py | 36 +++- .../static/agreements/package-builder.js | 53 ++++- .../agreements/orders/_comparison.html | 9 +- .../templates/agreements/orders/_family.html | 18 ++ .../agreements/orders/order_form.html | 22 +-- .../templates/agreements/orders/overview.html | 2 +- apps/agreements/tests/test_orders.py | 181 +++++++++++++++++- 10 files changed, 345 insertions(+), 31 deletions(-) create mode 100644 apps/agreements/migrations/0004_orderline_services.py diff --git a/apps/agreements/migrations/0004_orderline_services.py b/apps/agreements/migrations/0004_orderline_services.py new file mode 100644 index 000000000..259085962 --- /dev/null +++ b/apps/agreements/migrations/0004_orderline_services.py @@ -0,0 +1,37 @@ +from __future__ import annotations + +from typing import TYPE_CHECKING + +from django.db import migrations, models + +if TYPE_CHECKING: + from django.apps.registry import Apps + from django.db.backends.base.schema import BaseDatabaseSchemaEditor + + +def preserve_included_services(apps: Apps, schema_editor: BaseDatabaseSchemaEditor) -> None: + lines = apps.get_model("agreements", "OrderLine").objects.using(schema_editor.connection.alias) + for line in lines.select_related("order__program").iterator(): + definition = line.order.catalog_snapshot or line.order.program.definition + agreement = next((item for item in definition["agreements"] if item["slug"] == line.agreement), None) + if agreement is None: + continue + services = [ + service["key"] + for service in agreement.get("services", []) + if not service.get("tiers") or line.tier in service["tiers"] + ] + lines.filter(pk=line.pk).update(services=services) + + +class Migration(migrations.Migration): + dependencies = [("agreements", "0003_agreement_groups")] + + operations = [ + migrations.AddField( + model_name="orderline", + name="services", + field=models.JSONField(blank=True, default=list), + ), + migrations.RunPython(preserve_included_services, migrations.RunPython.noop), + ] diff --git a/apps/agreements/models/orders.py b/apps/agreements/models/orders.py index de728adeb..51ec0fa3e 100644 --- a/apps/agreements/models/orders.py +++ b/apps/agreements/models/orders.py @@ -13,6 +13,7 @@ from apps.agreements.models.agreements import Agreement from apps.agreements.models.terms import TermsVersion from apps.agreements.orders.catalog import Agreement as CatalogAgreement + from apps.agreements.orders.catalog import Service from apps.agreements.orders.pricing import FeeKey, Quote, QuoteSnapshot from apps.users.models import User @@ -215,6 +216,7 @@ class OrderLine(models.Model): order = models.ForeignKey(Order, on_delete=models.CASCADE, related_name="agreements") agreement = models.SlugField(max_length=64) tier = models.CharField(max_length=64) + services = models.JSONField(default=list, blank=True) addons = models.JSONField(default=dict, blank=True) special_terms = models.TextField(blank=True, help_text="Set by staff only; leave empty for none.") pricing = models.JSONField(default=dict, blank=True, editable=False) @@ -233,6 +235,20 @@ def agreement_obj(self) -> CatalogAgreement: """Return this agreement's configured definition.""" return self.order.catalog.agreements[self.agreement] + @property + def selected_services(self) -> list[Service]: + """Resolve explicit selections against the current or frozen tier's services.""" + selected = self.services + if not isinstance(selected, list) or not all(isinstance(key, str) for key in selected): + message = "Selected services must be a list of service keys." + raise ValidationError(message) + available = self.agreement_obj.services_at(self.tier) + keys = set(selected) + if keys - {service.key for service in available}: + message = "Selected services are no longer available at this tier. Edit this draft to choose services." + raise ValidationError(message) + return [service for service in available if service.key in keys] + @property def tier_name(self) -> str: """Return the selected tier's name.""" diff --git a/apps/agreements/orders/documents.py b/apps/agreements/orders/documents.py index 4b14e772e..0e659d19b 100644 --- a/apps/agreements/orders/documents.py +++ b/apps/agreements/orders/documents.py @@ -120,7 +120,7 @@ def _agreement_section(line: OrderLine) -> list[str]: ("Service Tier", f"**{md(tier.name)}**"), ("Response time targets", targets), ("Fair-use threshold", f"{tier.fair_use} requests per year"), - ("Included services", "; ".join(md(service.name) for service in agreement.services_at(line.tier)) or "None."), + ("Selected services", "; ".join(md(service.name) for service in line.selected_services) or "None."), *_parameter_rows(line), ("Special terms", md(line.special_terms.strip()) if line.special_terms.strip() else "None."), ] diff --git a/apps/agreements/orders/forms.py b/apps/agreements/orders/forms.py index ae32d6475..a384fcc42 100644 --- a/apps/agreements/orders/forms.py +++ b/apps/agreements/orders/forms.py @@ -39,7 +39,7 @@ class OrderForm(forms.ModelForm): agreements = forms.MultipleChoiceField( widget=forms.CheckboxSelectMultiple, - error_messages={"required": "Choose at least one service package."}, + error_messages={"required": "Choose at least one agreement family."}, ) discount = forms.ChoiceField(widget=forms.RadioSelect) discount_attestation = forms.BooleanField(required=False) @@ -168,9 +168,17 @@ def clean(self) -> dict[str, Any]: class AgreementForm(forms.Form): - """Tier and add-on selections generated from one catalog agreement.""" + """Tier, base-service, and add-on selections generated from one agreement.""" tier = forms.ChoiceField(widget=forms.RadioSelect) + services = forms.MultipleChoiceField( + required=False, + widget=forms.CheckboxSelectMultiple, + label="Base services", + error_messages={ + "invalid_choice": "Unknown base service %(value)s. Choose from the listed base services.", + }, + ) def __init__( self, @@ -185,6 +193,10 @@ def __init__( self.agreement = agreement cast("forms.ChoiceField", self.fields["tier"]).choices = [(t.key, t.name) for t in agreement.tiers] self.initial["tier"] = line.tier if line else agreement.default_tier + cast("forms.MultipleChoiceField", self.fields["services"]).choices = [ + (service.key, service.name) for service in agreement.services + ] + self.initial["services"] = line.services if line else [] if staff: self.fields["special_terms"] = forms.CharField( required=False, @@ -243,7 +255,7 @@ def _param_field(param: Param, initial: ParamValue | None) -> forms.Field: return field def tier_options(self) -> list[dict[str, Any]]: - """Pair every tier with the services and extras its fee includes.""" + """Pair every tier with its available base services and included extras.""" return [ { "tier": tier, @@ -274,6 +286,22 @@ def clean(self) -> dict[str, Any]: """Reject unknown selections and normalize active add-on parameters.""" cleaned = cast("dict[str, Any]", super().clean()) tier = cleaned.get("tier") + if tier and "services" in cleaned: + selected = set(cleaned["services"]) + available = self.agreement.services_at(tier) + unavailable = [ + service.name + for service in self.agreement.services + if service.key in selected and service not in available + ] + if unavailable: + self.add_error( + "services", + f"Not available at the selected tier: {', '.join(unavailable)}. " + "Deselect these base services or choose a tier that offers them.", + ) + else: + cleaned["services"] = [service.key for service in available if service.key in selected] addons: dict[str, dict[str, ParamValue]] = {} known = {self.add_prefix(name) for name in self.fields} for name in self.data: @@ -381,7 +409,7 @@ def save(self, user: User) -> Order: order.agreements.exclude(agreement__in=chosen).delete() for slug in chosen: data = self.agreement_forms[slug].cleaned_data - defaults = {"tier": data["tier"], "addons": data["addons"]} + defaults = {"tier": data["tier"], "services": data["services"], "addons": data["addons"]} if self.staff: defaults["special_terms"] = data["special_terms"].strip() OrderLine.objects.update_or_create(order=order, agreement=slug, defaults=defaults) diff --git a/apps/agreements/static/agreements/package-builder.js b/apps/agreements/static/agreements/package-builder.js index 74ea2ea70..c1bfa9b4b 100644 --- a/apps/agreements/static/agreements/package-builder.js +++ b/apps/agreements/static/agreements/package-builder.js @@ -30,6 +30,7 @@ title: el.dataset.familyTitle, include: el.querySelector(".pb-include-input"), radios: $$(".pb-tier-input", el), + services: $$(".pb-base-service", el), extraGroup, extras: extraGroup ? $$(".pb-extra", extraGroup) : [], }; @@ -38,6 +39,11 @@ const extraBox = (row) => row.querySelector(".pb-extra-toggle input[type='checkbox']"); const extraName = (row) => row.querySelector(".pb-extra-name").textContent.trim(); const tierOf = (family) => family.radios.find((radio) => radio.checked) || null; + const serviceBox = (row) => row.querySelector("input[type='checkbox']"); + const selectedServices = (family) => family.services.filter((row) => { + const box = serviceBox(row); + return box.checked && !box.disabled; + }); const tierColumn = (radio) => radio.closest(".pb-tier"); const included = () => families.filter((family) => family.include.checked && tierOf(family)); const familyOf = (node) => { @@ -121,6 +127,25 @@ const tier = on ? tierOf(family) : null; family.el.classList.toggle("is-included", Boolean(on && tier)); if (family.extraGroup) family.extraGroup.hidden = !tier; + const serviceTierKey = tier?.value || family.el.dataset.lastTier || family.el.dataset.defaultTier; + const unavailable = []; + let availableCount = 0; + family.services.forEach((row) => { + const allowedTiers = row.dataset.serviceTiers.split(" ").filter(Boolean); + const available = !allowedTiers.length || allowedTiers.includes(serviceTierKey); + const box = serviceBox(row); + row.hidden = !available; + box.disabled = !tier || !available; + if (available) availableCount += 1; + else if (box.checked) unavailable.push(row.dataset.serviceName); + }); + const emptyServices = family.el.querySelector(".pb-services-empty"); + if (emptyServices) emptyServices.hidden = availableCount > 0; + const changedServices = family.el.querySelector(".pb-services-changed"); + changedServices.hidden = !tier || !unavailable.length; + changedServices.textContent = unavailable.length + ? `Not selected at this tier: ${unavailable.join(", ")}. Your earlier choices are kept if you switch back to an eligible tier.` + : ""; family.extras.forEach((row) => { const box = extraBox(row); const includedIn = (row.dataset.includedIn || "").split(" ").filter(Boolean); @@ -252,7 +277,7 @@ } function revealTarget(target, focus = true) { - // An old extras link must not silently add a service that has since been removed. + // An old extras link must not silently add an agreement family that has since been removed. const extraGroup = target.closest("[data-extras-for]"); const family = extraGroup && familyOf(extraGroup); if (family && (!family.include.checked || !tierOf(family))) target = family.el; @@ -284,7 +309,7 @@ if (!unresolved && included().length) return true; const message = unresolved ? `Choose a tier for ${unresolved.name} before continuing.` - : "Choose at least one service tier before continuing."; + : "Choose at least one agreement family and tier before continuing."; state.failure = message; render(); const family = unresolved || families[0]; @@ -436,6 +461,10 @@ chosen.forEach((family) => { const tier = tierOf(family); params.append(tier.name, tier.value); + selectedServices(family).forEach((row) => { + const box = serviceBox(row); + params.append(box.name, box.value); + }); family.extras.forEach((row) => { const box = extraBox(row); if (!box.checked || box.disabled) return; @@ -450,6 +479,7 @@ } function fieldLabel(slug, fieldName) { + if (fieldName === "services") return "Base services"; const field = form.querySelector(`[name="${CSS.escape(`${slug}-${fieldName}`)}"]`); const row = field?.closest(".pb-extra"); if (!row) return ""; @@ -605,6 +635,15 @@ list.append( line(`${column.dataset.tierName} tier`, amountNode(quoted?.display.tier_fee || column.dataset.fee, "a year"), { className: "pb-line-tier", + detail: "Base-service selections do not change this fee.", + }), + ); + const services = selectedServices(family); + list.append( + line("Base services", el("span"), { + detail: services.length + ? services.map((row) => row.dataset.serviceName).join(", ") + : "No base services selected.", }), ); @@ -708,8 +747,8 @@ "p", "", families.length > 1 - ? "Choose a tier from any service to start. You can mix tiers across services and add extras." - : "Choose a tier to start, then add any extras.", + ? "Choose an agreement family and tier to start, then select its base services and extras." + : "Choose a tier to start, then select base services and extras.", ), ); return empty; @@ -793,6 +832,12 @@ summaryTitle.focus(); }); + window.addEventListener("pageshow", (event) => { + if (!event.persisted) return; + syncAll(); + refresh(0); + }); + families.forEach((family) => { if (!family.include.checked) setIncluded(family, false); }); diff --git a/apps/agreements/templates/agreements/orders/_comparison.html b/apps/agreements/templates/agreements/orders/_comparison.html index 2806e574b..2eaf0f770 100644 --- a/apps/agreements/templates/agreements/orders/_comparison.html +++ b/apps/agreements/templates/agreements/orders/_comparison.html @@ -1,6 +1,7 @@ {% load agreements %}{% with agreement=aform.agreement tier_options=aform.tier_options has_included_extras=aform.has_included_extras %}
    Compare service levels for {{ agreement.short_name }} +

    Base-service marks show availability, not automatic selection. Choose your base services above; the tier fee stays the same.

    @@ -44,16 +45,16 @@ {% for option in tier_options %} {% if service in option.services %} - + {% else %} - + {% endif %} {% endfor %} {% endfor %} {% if has_included_extras %} - + {% for option in tier_options %}{% with tier=option.tier %}
    {{ agreement.short_name }} service levels
    {{ service.name }}IncludedAvailable to selectNot includedNot available
    Also includedIncluded with the tier {% if tier.includes or option.included_addons %} @@ -81,7 +82,7 @@ {% if agreement.services %}
    -

    What the services cover

    +

    What the base services cover

    {% for service, tiers in agreement.service_rows %}
    {{ service.name }} {% if tiers %}{{ tiers }} only{% else %}Every tier{% endif %}
    diff --git a/apps/agreements/templates/agreements/orders/_family.html b/apps/agreements/templates/agreements/orders/_family.html index 54e2f4606..c66d45629 100644 --- a/apps/agreements/templates/agreements/orders/_family.html +++ b/apps/agreements/templates/agreements/orders/_family.html @@ -33,6 +33,24 @@

    {{ agreement.short_name {% if show_errors %}{{ aform.tier.errors }}{% endif %} +
    + Base services for {{ agreement.short_name }} +

    Select only the base services you want. Selecting none is allowed. The Service Tier fee stays the same regardless of your base-service selection.

    + {% if show_errors and aform.services.errors %}
    {{ aform.services.errors }}
    {% endif %} +
    + {% for service, tiers in agreement.service_rows %} + + {% empty %} +

    There are no base services to select for this agreement family.

    + {% endfor %} +
    + {% if agreement.services %}{% endif %} + +
    + {% include "agreements/orders/_comparison.html" %} diff --git a/apps/agreements/templates/agreements/orders/order_form.html b/apps/agreements/templates/agreements/orders/order_form.html index 6471a0748..eb3f37bf1 100644 --- a/apps/agreements/templates/agreements/orders/order_form.html +++ b/apps/agreements/templates/agreements/orders/order_form.html @@ -20,7 +20,7 @@

    {% if order %}Edit your package{% else %}Build your {{ program.title }} package{% endif %}

    -

    Choose your services, extras and term, then add your organization and contact details. You'll review the complete Order Form before signing.

    +

    Choose agreement families, base services, extras and term, then add your organization and contact details. You'll review the complete Order Form before signing.

    @@ -37,7 +37,7 @@

    Some details need attention

    {{ aform.agreement.short_name }}: {{ error }}{% endfor %} {% for field in aform %}{% for error in field.errors %} -
  • {{ aform.agreement.short_name }}{% if field.name != 'tier' and field.widget_type != 'checkbox' %}, {{ field.label }}{% endif %}: {{ error }}
  • +
  • {{ aform.agreement.short_name }}{% if field.name != 'tier' and field.widget_type != 'checkbox' %}, {{ field.label }}{% endif %}: {{ error }}
  • {% endfor %}{% endfor %} {% endif %}{% endfor %} @@ -57,8 +57,8 @@

    Some details need attention

    Choose your services

    -

    Choose a tier for each service you need. You can remove a service without losing your choices.

    - +

    Choose an agreement family and tier, then select its individual base services. You can remove an agreement family without losing your choices.

    +
    {{ form.agreements.errors }} {% for slug, aform in builder.agreement_forms.items %} @@ -72,9 +72,9 @@

    Choose your services

    Choose your extras

    -

    Add extras for the services in your package, or continue without adding any.

    - - +

    Add extras for the agreement families in your package, or continue without adding any.

    + + {% for slug, aform in builder.agreement_forms.items %} {% if slug in builder.chosen %} {% include "agreements/orders/_extras.html" with show_errors=True %} @@ -86,7 +86,7 @@

    Choose your extras

    Term and discount

    -

    Applies to every service in your package. Discounts apply to Service Tier fees only and don't combine. Multi-year terms are prepaid.

    +

    Applies to every agreement family in your package. Discounts apply to Service Tier fees only and don't combine. Multi-year terms are prepaid.

    Term and discount
    @@ -194,7 +194,7 @@

    Contacts and billing

    Agreements for this package

    -

    Each service is provided under its own published agreement with the Python Software Foundation. Your package goes on one Order Form that cites them, signed once.

    +

    Each agreement family has its own published terms with the Python Software Foundation. Your selected base services and extras go on one Order Form that cites those terms, signed once.

      {% for agreement in agreements %}
    • @@ -205,7 +205,7 @@

      Agreements for this package

    • {% endfor %}
    -

    Choose a service to see its agreement here.

    +

    Choose an agreement family to see its terms here.

    Cancel @@ -228,4 +228,4 @@

    Agreements for this package

    {% endblock %} -{% block extra_js %}{{ builder.parameter_conditions|json_script:"order-parameter-conditions" }}{% endblock %} +{% block extra_js %}{{ builder.parameter_conditions|json_script:"order-parameter-conditions" }}{% endblock %} diff --git a/apps/agreements/templates/agreements/orders/overview.html b/apps/agreements/templates/agreements/orders/overview.html index c78165e74..fea05e993 100644 --- a/apps/agreements/templates/agreements/orders/overview.html +++ b/apps/agreements/templates/agreements/orders/overview.html @@ -39,7 +39,7 @@

    {{ agreement.short_name }}

    {% if agreement.services %} -

    Includes {% for service, tiers in agreement.service_rows %}{{ service.name }}{% if tiers %} ({{ tiers }} only){% endif %}{% if not forloop.last %}; {% endif %}{% endfor %}.

    +

    Base services available to select: {% for service, tiers in agreement.service_rows %}{{ service.name }}{% if tiers %} ({{ tiers }} only){% endif %}{% if not forloop.last %}; {% endif %}{% endfor %}. Your selection does not change the Service Tier fee.

    {% endif %} {% if agreement.addons %}

    Extras, priced separately: {% for addon in agreement.addons %}{{ addon.name }}{% if not forloop.last %}; {% endif %}{% endfor %}.

    diff --git a/apps/agreements/tests/test_orders.py b/apps/agreements/tests/test_orders.py index 258dbe831..483c7315e 100644 --- a/apps/agreements/tests/test_orders.py +++ b/apps/agreements/tests/test_orders.py @@ -61,7 +61,12 @@ def make_order( } ) for slug, selections in (agreements or {"studio": STUDIO}).items(): - OrderLine.objects.create(order=order, agreement=slug, **selections) + line_selections = dict(selections) + if "services" not in line_selections: + line_selections["services"] = [ + service.key for service in order.catalog.agreements[slug].services_at(line_selections["tier"]) + ] + OrderLine.objects.create(order=order, agreement=slug, **line_selections) return order @@ -89,7 +94,9 @@ def payload(agreements: Iterable[str] = ("studio", "workshop"), **overrides: Any "billing_contact_name": "AP", "billing_contact_email": "ap@example.com", "studio-tier": "basic", + "studio-services": ["access"], "workshop-tier": "max", + "workshop-services": ["materials", "planning"], **overrides, } @@ -288,9 +295,12 @@ def countersign(self, user: UserModel) -> _MonkeyPatchedWSGIResponse: ) def test_signing_freezes_document_catalog_terms_and_fees(self) -> None: + OrderLine.objects.filter(order=self.order, agreement="studio").update(services=["planning"]) self.sign() order = reload(self.order) original = documents.order_form_markdown(order) + self.assertIn("Studio planning", original) + self.assertNotIn("Studio access", original) self.assertEqual(order.status, Agreement.Status.SIGNED) self.assertEqual(cast("Agreement", order.agreement).signature_method, Agreement.SignatureMethod.ACCOUNT) self.assertEqual(cast("Agreement", order.agreement).signer_email, "ada@example.com") @@ -299,6 +309,7 @@ def test_signing_freezes_document_catalog_terms_and_fees(self) -> None: definition = deepcopy(self.program.definition) definition["agreements"][0]["title"] = "Changed service" definition["agreements"][0]["tiers"][1]["annual_fee"] = "9999" + definition["agreements"][0]["services"] = [] definition["order_title"] = "Changed order title" Program.objects.filter(pk=self.program.pk).update(title="Changed program", definition=definition) Order.objects.filter(pk=order.pk).update(legal_name="Changed After Signing") @@ -307,12 +318,16 @@ def test_signing_freezes_document_catalog_terms_and_fees(self) -> None: self.assertEqual(frozen.fee_totals, old_total) self.assertEqual(frozen.program_title, "Example Services") self.assertEqual(frozen.agreement_list[0].agreement_obj.title, "Example Studio Services") + self.assertEqual(frozen.agreement_list[0].services, ["planning"]) + self.assertEqual([service.name for service in frozen.agreement_list[0].selected_services], ["Studio planning"]) def test_signing_refuses_a_changed_preview_without_leaving_an_offer(self) -> None: - seen = self.preview_sha256() - OrderLine.objects.filter(order=self.order, agreement="studio").update(tier="max") - self.sign(document_sha256=seen) - self.assertIsNone(reload(self.order).agreement) + for changes in ({"tier": "max"}, {"services": ["planning"]}): + with self.subTest(changes=changes): + seen = self.preview_sha256() + OrderLine.objects.filter(order=self.order, agreement="studio").update(**changes) + self.sign(document_sha256=seen) + self.assertIsNone(reload(self.order).agreement) def test_signing_requires_acceptance(self) -> None: self.assertEqual(self.sign(accept="").status_code, 400) @@ -445,7 +460,7 @@ def test_staff_document_edit_is_the_version_the_customer_signs(self) -> None: self.assertIn("forty-five (45) days", agreement.document_markdown) def test_withdrawing_reopens_the_order_at_current_prices(self) -> None: - order = make_order(self.customer, program=self.program) + order = make_order(self.customer, {"studio": {"tier": "plus", "services": ["access"]}}, program=self.program) agreement = workflow.offer(get_kind("order"), order, user=self.officer) definition = deepcopy(self.program.definition) definition["agreements"][0]["tiers"][1]["annual_fee"] = "2600" @@ -455,6 +470,10 @@ def test_withdrawing_reopens_the_order_at_current_prices(self) -> None: reopened = reload(order) self.assertTrue(reopened.is_editable) self.assertEqual(reopened.fee_totals["annual"], 2600) + self.assertEqual(reopened.agreements.get().services, ["access"]) + text = documents.order_form_markdown(reopened) + self.assertIn("Studio access", text) + self.assertNotIn("Studio planning", text) def test_published_terms_apply_only_to_orders_offered_afterwards(self) -> None: terms = Terms.objects.get(slug="studio-terms") @@ -482,6 +501,105 @@ def test_one_order_combines_agreements_in_catalog_order(self) -> None: self.assertEqual(order.agreements.get(agreement="workshop").tier, "max") self.assertEqual(order.customer_account, self.user) + def test_selected_services_persist_and_render_without_unselected_scope(self) -> None: + response = self.client.post( + self.url, + payload(["studio"], **{"studio-tier": "plus", "studio-services": ["planning"]}), + ) + order = Order.objects.get() + self.assertRedirects(response, order.get_absolute_url()) + self.assertEqual(order.agreements.get().services, ["planning"]) + self.assertContains(self.client.get(order.get_absolute_url()), "Studio planning") + self.assertNotContains(self.client.get(order.get_absolute_url()), "Studio access") + text = documents.order_form_markdown(order) + self.assertIn("Studio planning", text) + self.assertNotIn("Studio access", text) + + response = self.client.post( + reverse("agreements:order_edit", args=[order.pk]), + payload(["studio"], **{"studio-tier": "plus", "studio-services": ["access"]}), + ) + self.assertRedirects(response, order.get_absolute_url()) + saved = reload(order) + self.assertEqual(saved.agreements.get().services, ["access"]) + text = documents.order_form_markdown(saved) + self.assertIn("Studio access", text) + self.assertNotIn("Studio planning", text) + + def test_services_are_saved_and_presented_in_catalog_order(self) -> None: + self.client.post( + self.url, + payload(["studio"], **{"studio-tier": "plus", "studio-services": ["planning", "access"]}), + ) + order = Order.objects.get() + self.assertEqual(order.agreements.get().services, ["access", "planning"]) + text = documents.order_form_markdown(order) + self.assertLess(text.index("Studio access"), text.index("Studio planning")) + + def test_empty_and_subset_selections_keep_the_same_tier_fee(self) -> None: + for services in ([], ["planning"], ["access", "planning"]): + with self.subTest(services=services): + data = payload(["studio"], **{"studio-tier": "plus", "studio-services": services}) + response = self.client.post(self.url, data) + order = Order.objects.latest("created") + self.assertRedirects(response, order.get_absolute_url()) + self.assertEqual(order.agreements.get().services, services) + self.assertEqual(order.fee_totals, {"annual": 2400, "one_time": 0}) + quote = self.client.get(reverse("agreements:quote", args=[self.program.slug]), data) + self.assertEqual(quote.status_code, 200) + self.assertEqual(quote.json()["display"]["total_annual"], "$2,400") + text = documents.order_form_markdown(order) + self.assertEqual("Studio access" in text, "access" in services) + self.assertEqual("Studio planning" in text, "planning" in services) + + response = self.client.post( + reverse("agreements:order_edit", args=[order.pk]), + payload(["studio"], **{"studio-tier": "plus", "studio-services": []}), + ) + self.assertRedirects(response, order.get_absolute_url()) + emptied = reload(order) + self.assertEqual(emptied.agreements.get().services, []) + self.assertEqual(emptied.fee_totals["annual"], 2400) + agreement = workflow.offer(get_kind("order"), emptied, user=self.user) + self.assertNotIn("Studio access", agreement.document_markdown) + self.assertNotIn("Studio planning", agreement.document_markdown) + + def test_tiers_with_no_eligible_base_services_can_be_ordered(self) -> None: + for services in ([], [self.program.definition["agreements"][0]["services"][1]]): + with self.subTest(services=services): + definition = deepcopy(self.program.definition) + definition["agreements"][0]["services"] = services + Program.objects.filter(pk=self.program.pk).update(definition=definition) + response = self.client.post(self.url, payload(["studio"], **{"studio-services": []})) + order = Order.objects.latest("created") + self.assertRedirects(response, order.get_absolute_url()) + self.assertEqual(order.agreements.get().services, []) + agreement = workflow.offer(get_kind("order"), order, user=self.user) + self.assertNotIn("Studio access", agreement.document_markdown) + self.assertNotIn("Studio planning", agreement.document_markdown) + self.assertEqual(reload(order).fee_totals["annual"], 1200) + + def test_invalid_services_cannot_create_or_mutate_an_order(self) -> None: + order = make_order(self.user, {"studio": {"tier": "plus", "services": ["planning"]}}, program=self.program) + original = documents.order_form_markdown(order) + for services in (["unknown"], ["planning"], ["materials"]): + with self.subTest(services=services): + data = payload( + ["studio"], legal_name="Must not be saved", **{"studio-tier": "basic", "studio-services": services} + ) + self.assertEqual(self.client.post(self.url, data).status_code, 200) + self.assertEqual(Order.objects.count(), 1) + response = self.client.post(reverse("agreements:order_edit", args=[order.pk]), data) + self.assertEqual(response.status_code, 200) + unchanged = reload(order) + self.assertEqual(unchanged.legal_name, order.legal_name) + line = unchanged.agreements.get() + self.assertEqual((line.tier, line.services), ("plus", ["planning"])) + self.assertEqual(documents.order_form_markdown(unchanged), original) + quote = self.client.get(reverse("agreements:quote", args=[self.program.slug]), data) + self.assertEqual(quote.status_code, 400) + self.assertNotIn("display", quote.json()) + def test_customers_cannot_set_special_terms(self) -> None: self.client.post(self.url, payload(**{"studio-special_terms": "Free forever"})) self.assertEqual(Order.objects.get().agreements.get(agreement="studio").special_terms, "") @@ -638,6 +756,57 @@ def test_removed_tier_requires_draft_review_but_leaves_offered_order_intact(self self.assertEqual(reload(draft).fee_totals["annual"], 1200) self.assertEqual(reload(offered).fee_totals["annual"], 2400) + def test_withdrawn_service_scope_requires_correction_against_the_live_catalog(self) -> None: + for change in ("removed", "tier_restricted"): + with self.subTest(change=change): + Program.objects.filter(pk=self.program.pk).update(definition=self.program.definition) + order = make_order( + self.user, {"studio": {"tier": "plus", "services": ["planning"]}}, program=self.program + ) + agreement = workflow.offer(get_kind("order"), order, user=self.user) + original = agreement.document_markdown + original_sha256 = agreement.document_sha256 + original_preview = documents.order_form_markdown(reload(order)) + self.assertIn("Studio planning", original) + self.assertNotIn("Studio access", original) + definition = deepcopy(self.program.definition) + studio = definition["agreements"][0] + if change == "removed": + studio["services"] = studio["services"][:1] + else: + studio["services"][1]["tiers"] = ["max"] + Program.objects.filter(pk=self.program.pk).update(definition=definition) + + frozen = reload(order) + self.assertEqual(documents.order_form_markdown(frozen), original_preview) + self.assertEqual([service.key for service in frozen.agreement_list[0].selected_services], ["planning"]) + self.assertContains(self.client.get(order.get_absolute_url()), "Studio planning") + workflow.withdraw(agreement, user=self.user) + reopened = reload(order) + self.assertEqual(reopened.agreements.get().services, ["planning"]) + edit_url = reverse("agreements:order_edit", args=[order.pk]) + self.assertContains(self.client.get(order.get_absolute_url()), edit_url) + agreement_count = Agreement.objects.count() + response = self.client.post(reverse("agreements:order_offer", args=[order.pk])) + self.assertRedirects(response, order.get_absolute_url()) + rejected = reload(order) + self.assertIsNone(rejected.agreement) + self.assertEqual(rejected.catalog_snapshot, {}) + self.assertEqual(rejected.agreements.get().services, ["planning"]) + self.assertEqual(rejected.agreements.get().pricing, {}) + self.assertEqual(Agreement.objects.count(), agreement_count) + + response = self.client.post( + edit_url, payload(["studio"], **{"studio-tier": "plus", "studio-services": ["access"]}) + ) + self.assertRedirects(response, order.get_absolute_url()) + replacement = workflow.offer(get_kind("order"), reload(order), user=self.user) + self.assertIn("Studio access", replacement.document_markdown) + self.assertNotIn("Studio planning", replacement.document_markdown) + agreement.refresh_from_db() + self.assertEqual(agreement.document_markdown, original) + self.assertEqual(agreement.document_sha256, original_sha256) + class PrivateProgramTests(TestCase): def setUp(self) -> None: From 39d2973b4eea362c65d065f6e9a2136238166506 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:02:20 -0500 Subject: [PATCH 05/11] include validated svc selections in quote repsonses --- apps/agreements/orders/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/agreements/orders/views.py b/apps/agreements/orders/views.py index 650d79a27..cf7595e7a 100644 --- a/apps/agreements/orders/views.py +++ b/apps/agreements/orders/views.py @@ -163,7 +163,14 @@ def quote(request: HttpRequest, slug: str) -> JsonResponse: except ValidationError as exc: errors[key] = exc.messages continue - quotes.append({"slug": key, "name": builder.agreements[key].short_name, **priced.as_dict()}) + quotes.append( + { + "slug": key, + "name": builder.agreements[key].short_name, + "services": form.cleaned_data["services"], + **priced.as_dict(), + } + ) if errors: return JsonResponse({"errors": errors}, status=400) total_annual = sum((Decimal(q["total_annual"]) for q in quotes), Decimal(0)) From 77c6ab979d8d8dc6684c56420620f55be8aeaec7 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:02:34 -0500 Subject: [PATCH 06/11] expose selected order svcs in readonly admin pane --- apps/agreements/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/agreements/admin.py b/apps/agreements/admin.py index 7b93b0788..8af9ec9d4 100644 --- a/apps/agreements/admin.py +++ b/apps/agreements/admin.py @@ -201,7 +201,7 @@ class OrderLineInline(_ReadOnlyInline): """Inspect selections without bypassing the builder's validation.""" model = OrderLine - fields = ("agreement", "tier", "addons", "special_terms", "pricing") + fields = ("agreement", "tier", "services", "addons", "special_terms", "pricing") readonly_fields = fields From 09ac618044618eb8ae1ba7be23db19a3eb68d69a Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:02:42 -0500 Subject: [PATCH 07/11] fix doc --- docs/source/administration.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/source/administration.rst b/docs/source/administration.rst index 3ad95c691..0a56668da 100644 --- a/docs/source/administration.rst +++ b/docs/source/administration.rst @@ -173,8 +173,12 @@ after session or role revocation. Anonymous public terms remain publicly cacheab preserve entries, and validation reveals the field that needs attention. Account linkage (Administrators only) and contract adjustments are in a collapsed preparation section of Contacts & billing. - New packages start empty unless a service is explicitly preselected. Choosing a - tier includes its service; extras included at that tier are not charged again. + New packages start empty unless an agreement is explicitly preselected. Choosing a + tier adds that agreement to the package; select its individual base services separately. + Base-service selections start empty and do not change the tier fee. Only selected + services appear on the Order Form. Changing tiers can make a service unavailable; + review the remaining selections before continuing. Extras included at that tier + are not charged again. The live summary, saved order, and newly generated Order Form separate recurring and one-time fees, and show prepaid totals for multi-year terms. Existing frozen documents and fee snapshots are not rewritten. Review identifies the terms @@ -182,6 +186,9 @@ after session or role revocation. Anonymous public terms remain publicly cacheab Without JavaScript, all sections appear together: use each service's inclusion checkbox and review fees on the next page. Existing private-order access restrictions still apply. + Existing orders retain their previously included base services on upgrade, using + the frozen catalog for offered orders. Adding services to a catalog does not + automatically add them to existing drafts. Signed documents and fees remain unchanged. :Terms: Create a set of terms in the admin, then edit its text at ``/agreements/terms/``. Save a private draft or publish an immutable version with a label and change note. Unpublished sets open in the draft editor. Creating a set requires membership in From 7cee52427866a10f2a2920870035984a285958d1 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:33:03 -0500 Subject: [PATCH 08/11] mythos-red-team: Flag drafts with unavailable services in order lists --- apps/agreements/orders/views.py | 3 +++ apps/agreements/tests/test_orders.py | 24 ++++++++++++++++++++++++ docs/source/administration.rst | 3 +++ 3 files changed, 30 insertions(+) diff --git a/apps/agreements/orders/views.py b/apps/agreements/orders/views.py index cf7595e7a..4ef07de50 100644 --- a/apps/agreements/orders/views.py +++ b/apps/agreements/orders/views.py @@ -62,6 +62,9 @@ def _order_rows(orders: Iterable[Order]) -> list[dict[str, Any]]: for order in orders: row: dict[str, Any] = {"order": order} try: + if order.is_editable: + for line in order.agreement_list: + _ = line.selected_services row["selections"] = [(line.agreement_obj.short_name, line.tier_name) for line in order.agreement_list] row["fees"] = order.fee_totals except (ValidationError, KeyError): diff --git a/apps/agreements/tests/test_orders.py b/apps/agreements/tests/test_orders.py index 483c7315e..e33640a7c 100644 --- a/apps/agreements/tests/test_orders.py +++ b/apps/agreements/tests/test_orders.py @@ -756,6 +756,30 @@ def test_removed_tier_requires_draft_review_but_leaves_offered_order_intact(self self.assertEqual(reload(draft).fee_totals["annual"], 1200) self.assertEqual(reload(offered).fee_totals["annual"], 2400) + def test_unavailable_draft_services_require_review_in_customer_and_staff_lists(self) -> None: + draft = make_order(self.user, {"studio": {"tier": "plus", "services": ["planning"]}}, program=self.program) + offered = make_order(self.user, {"studio": {"tier": "plus", "services": ["planning"]}}, program=self.program) + workflow.offer(get_kind("order"), offered, user=self.user) + officer = make_officer() + for change in ("removed", "tier_restricted"): + definition = deepcopy(self.program.definition) + if change == "removed": + definition["agreements"][0]["services"] = definition["agreements"][0]["services"][:1] + else: + definition["agreements"][0]["services"][1]["tiers"] = ["max"] + Program.objects.filter(pk=self.program.pk).update(definition=definition) + for user, url in ( + (self.user, reverse("agreements:order_list")), + (self.user, self.program.get_absolute_url()), + (officer, reverse("agreements:staff_orders")), + ): + with self.subTest(change=change, url=url): + self.client.force_login(user) + listing = self.client.get(url) + self.assertContains(listing, "Review selections", count=1) + self.assertContains(listing, reverse("agreements:order_edit", args=[draft.pk])) + self.assertContains(listing, offered.get_absolute_url()) + def test_withdrawn_service_scope_requires_correction_against_the_live_catalog(self) -> None: for change in ("removed", "tier_restricted"): with self.subTest(change=change): diff --git a/docs/source/administration.rst b/docs/source/administration.rst index 0a56668da..a736db0aa 100644 --- a/docs/source/administration.rst +++ b/docs/source/administration.rst @@ -189,6 +189,9 @@ after session or role revocation. Anonymous public terms remain publicly cacheab Existing orders retain their previously included base services on upgrade, using the frozen catalog for offered orders. Adding services to a catalog does not automatically add them to existing drafts. Signed documents and fees remain unchanged. + If a catalog change makes a draft's selected service unavailable, customer order + lists and the staff order queue show **Review selections** instead of fees. + Offered orders continue to use their frozen catalog. :Terms: Create a set of terms in the admin, then edit its text at ``/agreements/terms/``. Save a private draft or publish an immutable version with a label and change note. Unpublished sets open in the draft editor. Creating a set requires membership in From ec93de2aaa445490aff60bec823d1a90cced11dc Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 15:33:04 -0500 Subject: [PATCH 09/11] mythos-red-team: Keep ineligible service selections visible until resolved --- apps/agreements/static/agreements/package-builder.js | 9 ++++++--- .../templates/agreements/orders/order_form.html | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/agreements/static/agreements/package-builder.js b/apps/agreements/static/agreements/package-builder.js index c1bfa9b4b..2d7a4a3fb 100644 --- a/apps/agreements/static/agreements/package-builder.js +++ b/apps/agreements/static/agreements/package-builder.js @@ -134,8 +134,11 @@ const allowedTiers = row.dataset.serviceTiers.split(" ").filter(Boolean); const available = !allowedTiers.length || allowedTiers.includes(serviceTierKey); const box = serviceBox(row); - row.hidden = !available; - box.disabled = !tier || !available; + row.hidden = !available && !box.checked; + box.disabled = !tier || (!available && !box.checked); + box.setCustomValidity(tier && !available && box.checked + ? "Deselect this base service or choose a tier that offers it." + : ""); if (available) availableCount += 1; else if (box.checked) unavailable.push(row.dataset.serviceName); }); @@ -144,7 +147,7 @@ const changedServices = family.el.querySelector(".pb-services-changed"); changedServices.hidden = !tier || !unavailable.length; changedServices.textContent = unavailable.length - ? `Not selected at this tier: ${unavailable.join(", ")}. Your earlier choices are kept if you switch back to an eligible tier.` + ? `Not available at this tier: ${unavailable.join(", ")}. Deselect these base services or choose a tier that offers them before continuing.` : ""; family.extras.forEach((row) => { const box = extraBox(row); diff --git a/apps/agreements/templates/agreements/orders/order_form.html b/apps/agreements/templates/agreements/orders/order_form.html index eb3f37bf1..da21b0689 100644 --- a/apps/agreements/templates/agreements/orders/order_form.html +++ b/apps/agreements/templates/agreements/orders/order_form.html @@ -228,4 +228,4 @@

    Agreements for this package

    {% endblock %} -{% block extra_js %}{{ builder.parameter_conditions|json_script:"order-parameter-conditions" }}{% endblock %} +{% block extra_js %}{{ builder.parameter_conditions|json_script:"order-parameter-conditions" }}{% endblock %} From 3b231b429bcb6cd89bb3a86ae0f219908e3a8b18 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 16:03:13 -0500 Subject: [PATCH 10/11] fix wording --- apps/agreements/templates/agreements/orders/overview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/agreements/templates/agreements/orders/overview.html b/apps/agreements/templates/agreements/orders/overview.html index fea05e993..3c5a5e813 100644 --- a/apps/agreements/templates/agreements/orders/overview.html +++ b/apps/agreements/templates/agreements/orders/overview.html @@ -18,7 +18,7 @@

    {% if program.is_public %}Build your support package{% else %}Prepare a package for a customer{% endif %}

    -

    Choose a tier for {% if agreements|length > 1 %}one service or several{% else %}{{ agreements.0.short_name|default:"the service" }}{% endif %}, add any extras, and see your fees as you go. Everything goes on one Order Form, signed once.

    +

    Choose a tier for {% if agreements|length > 1 %}one agreement family or several{% else %}{{ agreements.0.short_name|default:"the agreement" }}{% endif %}, add any extras, and see your fees as you go. Everything goes on one Order Form, signed once.

    {% if program.is_public %}Build a package{% else %}Prepare a package{% endif %}
    From 6159ff8e69786342a9afa3a70a77189ff1a1e858 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Tue, 6 Oct 2026 16:03:41 -0500 Subject: [PATCH 11/11] stylin --- .../agreements/static/agreements/package-builder.css | 4 +++- apps/agreements/static/agreements/package-builder.js | 12 +++++++++--- .../templates/agreements/orders/_family.html | 2 +- .../agreements/templates/agreements/orders/base.html | 2 +- .../templates/agreements/orders/order_form.html | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/agreements/static/agreements/package-builder.css b/apps/agreements/static/agreements/package-builder.css index 11c07e9b2..c3c65a67c 100644 --- a/apps/agreements/static/agreements/package-builder.css +++ b/apps/agreements/static/agreements/package-builder.css @@ -223,7 +223,9 @@ .package-builder .pb-base-service input { width: 1.1em; height: 1.1em; accent-color: var(--pb-blue); } .package-builder .pb-base-service .choice-help { display: block; } .package-builder .pb-base-service:has(input:disabled) { color: var(--pb-muted); cursor: default; } -.package-builder .pb-base-services .pb-services-changed { margin-top: 1em; } +.package-builder .pb-base-service:has(input[aria-invalid="true"]) { color: var(--pb-red-ink); } +.package-builder .pb-base-service input[aria-invalid="true"] { outline: 2px solid var(--pb-red); outline-offset: 2px; } +.package-builder .pb-base-services .pb-services-changed { margin: 1em 0 0; padding: 0.6em 0.8em; max-width: 44em; background-color: #f8eef0; border-left: 3px solid var(--pb-red); color: var(--pb-red-ink); font-size: 0.9375em; line-height: 1.55; } .package-builder .pb-staff-details { margin-top: 1.5em; border-bottom: 1px solid var(--pb-line); } .package-builder .pb-staff-details > summary { padding: 0.7em 0; color: var(--pb-blue-dark); font-size: 0.9375em; font-family: SourceSansProBold, Arial, sans-serif; cursor: pointer; } .package-builder .pb-staff-details[open] { padding-bottom: 1em; } diff --git a/apps/agreements/static/agreements/package-builder.js b/apps/agreements/static/agreements/package-builder.js index 2d7a4a3fb..c29613820 100644 --- a/apps/agreements/static/agreements/package-builder.js +++ b/apps/agreements/static/agreements/package-builder.js @@ -136,9 +136,15 @@ const box = serviceBox(row); row.hidden = !available && !box.checked; box.disabled = !tier || (!available && !box.checked); - box.setCustomValidity(tier && !available && box.checked - ? "Deselect this base service or choose a tier that offers it." - : ""); + const conflict = Boolean(tier) && !available && box.checked; + box.setCustomValidity(conflict ? "Deselect this base service or choose a tier that offers it." : ""); + if (conflict) { + box.setAttribute("aria-invalid", "true"); + box.setAttribute("aria-describedby", `${family.slug}-services-changed`); + } else { + box.removeAttribute("aria-invalid"); + box.removeAttribute("aria-describedby"); + } if (available) availableCount += 1; else if (box.checked) unavailable.push(row.dataset.serviceName); }); diff --git a/apps/agreements/templates/agreements/orders/_family.html b/apps/agreements/templates/agreements/orders/_family.html index c66d45629..abadf1748 100644 --- a/apps/agreements/templates/agreements/orders/_family.html +++ b/apps/agreements/templates/agreements/orders/_family.html @@ -48,7 +48,7 @@

    {{ agreement.short_name {% endfor %} {% if agreement.services %}{% endif %} - + {% include "agreements/orders/_comparison.html" %} diff --git a/apps/agreements/templates/agreements/orders/base.html b/apps/agreements/templates/agreements/orders/base.html index b35e48664..c11acf652 100644 --- a/apps/agreements/templates/agreements/orders/base.html +++ b/apps/agreements/templates/agreements/orders/base.html @@ -3,7 +3,7 @@ {% block title %}Service orders{% endblock %} {% block body_attributes %}class="psf agreements agreement-orders"{% endblock %} -{% block head %}{{ block.super }}{% endblock %} +{% block head %}{{ block.super }}{% endblock %} {% block crumbs %}
  • Service orders
  • {% endblock %} {% block left_sidebar %} diff --git a/apps/agreements/templates/agreements/orders/order_form.html b/apps/agreements/templates/agreements/orders/order_form.html index da21b0689..ec0d95405 100644 --- a/apps/agreements/templates/agreements/orders/order_form.html +++ b/apps/agreements/templates/agreements/orders/order_form.html @@ -228,4 +228,4 @@

    Agreements for this package

    {% endblock %} -{% block extra_js %}{{ builder.parameter_conditions|json_script:"order-parameter-conditions" }}{% endblock %} +{% block extra_js %}{{ builder.parameter_conditions|json_script:"order-parameter-conditions" }}{% endblock %}