From: Magnus Hagander Date: Mon, 9 Jun 2025 13:51:12 +0000 (+0200) Subject: Fix sponsor display and warnings for explicit-contract sponsors X-Git-Url: http://git.postgresql.org/gitweb/api.html?a=commitdiff_plain;p=pgeu-system.git Fix sponsor display and warnings for explicit-contract sponsors Make sure the warning is actually shown in all cases, so one doesn't accidentally click through a sponsor that's actually waiting for a contract. --- diff --git a/template/confsponsor/admin_sponsor.html b/template/confsponsor/admin_sponsor.html index 75ae0a83..5a0fe549 100644 --- a/template/confsponsor/admin_sponsor.html +++ b/template/confsponsor/admin_sponsor.html @@ -168,11 +168,6 @@ for this sponsor, it can be confirmed before the invoice is paid. contract level sponsorship, so as soon as the sponsorship details above have been verified, an invoice should be generated.

-

- Once generated, the invoice will automatically - be emailed to the sponsor, as well as show up on their dashboard. Once - the invoice is paid, the sponsorship will automatically become confirmed. -

{%else%}{%comment%}no invoice, not instant, so awaiting contract{%endcomment%} {%if sponsor.signmethod == 0%}

@@ -209,7 +204,12 @@ has been received, go ahead and generate the invoice. {%endif%}

{%csrf_token%} {%if sponsor.level.levelcost %} - +

+ Once generated, the invoice will automatically + be emailed to the sponsor, as well as show up on their dashboard. Once + the invoice is paid, the sponsorship will automatically become confirmed. +

+ {%else%} {%endif%} diff --git a/template/confsponsor/admin_sponsor_details.html b/template/confsponsor/admin_sponsor_details.html index deacbc8c..113d660c 100644 --- a/template/confsponsor/admin_sponsor_details.html +++ b/template/confsponsor/admin_sponsor_details.html @@ -43,7 +43,7 @@ No contract needed for this level. {%elif sponsor.level.contractlevel == 1 and not sponsor.explicitcontract %} Click-through contract completed. {%if not sponsor.confirmed%}{% csrf_token %}
{%endif%} - {%else%}{%comment%}Full contract{%endcomment%} + {%elif sponsor.level.contractlevel == 2 or sponsor.explicitcontract %}{%comment%}Full contract, or explicit contract{%endcomment%} {%if sponsor.signmethod == 0%} Digital contract.
{%if sponsor.contract.completed%}Signed ({{sponsor.contract.firstsigned}}) and countersigned ({{sponsor.contract.completed}}).