Repository navigation
[IMP] my_compassion, theme_compassion_2025: terms and conditions apart from the privacy policy - #443
Conversation
…t from the privacy policy PayU asked for the terms and conditions and the privacy policy apart, to validate the production account of Compassion Poland. A website with a Terms and Conditions URL links both in its footer, its consent checkboxes and its gift basket; /legal/terms leads to them, /legal still to the privacy policy. A website without it keeps its single legal link. Assisted-by: claude-opus-5-5, medium, claude-code
NoeBerdoz
left a comment
There was a problem hiding this comment.
Review
Thanks David, this is a clean change. A website without a terms URL renders exactly as before, and the Polish one gets two separate documents everywhere a donor accepts them. I reviewed it together with the legal pages script of CompassionCH/tools#31, which switches it on.
What we tested
- The deploy path, on a fresh database. Install with 18.0, two MyCompassion websites with the theme (a Polish one whose footer was edited in the builder, and a Swiss-like one), then
-u theme_compassion_2025,my_compassionwith this PR, then the script twice. The upgrade is clean, the script can run again safely, and both pages are published and indexed. - Routes. On the PL site
/legaland/legal/termsanswer 302 to the right page, also with the/pl/and/en/prefixes. A site without a terms URL sends/legal/termsto/legal.local=Falseonly ever reads an admin-set value, so it is not an open redirect. - Labels. The email step, the gift basket block, both fast checkouts and
acceptance_fullshow "Akceptuję regulamin oraz politykę prywatności…" in Polish and the new English text, the checkbox stays required, and the Swiss-like site is unchanged. The Polish msgids match what Odoo extracts from the templates. - Tests.
TestLegalRoutespasses. The wholemy_compassionsuite fails on exactly the same tests as plain 18.0 (environment), so this PR adds none.
Open points
Levels: Must fix (money or security) · Before go-live (before real donors use it) · Should fix · Suggestion
- Before go-live: A footer edited in the website builder does not get the new links (thread on
footer.xml). A read-only check on production before the deploy settles it. - Should fix: The consent links open in the same tab (thread on the fast checkout).
- Suggestion: The texts around the label still speak of the privacy notice only (thread on
acceptance_full).
Deploy note
terms_url is a new column on website, and -u my_compassion does not upgrade the theme it depends on. Both databases need -u theme_compassion_2025,my_compassion, the Nordic one too when it takes this code, or every website request fails on the missing column.
Not code: the two texts, before PayU looks again
PayU lists what it checks on the site in Wymagania dla Twojej strony. Compared with the texts in the script, these look missing. Compassion Poland owns the texts, so these are questions for them:
- Regulamin: the KRS number, a phone number and an e-mail (the header has the address, NIP and REGON); a complaints procedure (how, where, and the deadline for the answer); the return rule: PayU expects either the 14 days, or a sentence saying donations cannot be returned, with the reason; when a donation or a sponsorship is booked; and the recurring payments: sponsorships are charged monthly on a saved card, so the amount, the frequency and how to stop them.
- Privacy policy: name PayU S.A. as a recipient (the guide asks for it explicitly); legal bases per purpose and how long data is kept; a cookies section (my2 does set cookies).
- § 1: "Darowizny przekazywane są dobrowolnie oraz prawne…": "prawne" looks like a typo.
- A question for PayU: its compliance page asks merchants who keep the buyer on their own page to show PayU's information clause ("The controller of your personal data is PayU S.A. …") and "By paying you accept PayU Payment Terms", and to send help@payu.pl a link and a screenshot. Our card form is PayU's Secure Form embedded in our page, so it is worth asking PayU whether this applies to us.
Verdict
No blocker in the code. Please run the footer check before the deploy; the new-tab links are a quick fix.
Assisted-by: claude-opus-5-5, xhigh, claude-code
Assisted-by: gpt-6-astra, high, codex
Assisted-by: claude-opus-5-5, medium, claude-code
- The consent links open in a new tab: a click inside the checkbox label left the checkout. - With a Terms and Conditions URL, the signed agreement of the account pages links both documents, and the consent error messages name both. Assisted-by: claude-opus-5-5, medium, claude-code
|
Thanks for the review, addressed in d2615c3:
The texts go to Compassion Poland with your list, including the question about PayU's information clause. |
|
Correction to three details of the review body:
Assisted-by: claude-opus-5-5, xhigh, claude-code |
NoeBerdoz
left a comment
There was a problem hiding this comment.
Second review
Thanks David. Two of the three points of the first review are fixed in d2615c3: the consent links open in a new tab, and the texts around the label follow the terms URL (the "(view agreement)" links lead to both documents, the fast checkout's message names both, and the donation one asks to accept "the conditions below"). The Polish msgids match what Odoo extracts from the templates. The first point, the edited footer, is answered by the script's new warning, reviewed on CompassionCH/tools#31.
What we tested
- Browser, on a fresh database with a PL and a Swiss-like website: the email step and the gift basket donor form in Polish and English (links in a new tab, checkbox still required, the error message after a post without the consent), and the user settings page of a signed and of an unsigned user. Both fast checkouts were rendered from a shell, since the database has no child. The Swiss-like site is unchanged everywhere.
- Tests. The whole
my_compassionandtheme_compassion_2025suites fail on exactly the same 108 tests at 18.0 and at this head (environment: no child, inactive EUR), so the fix adds none.
Open points
Levels: Must fix (money or security) · Before go-live (before real donors use it) · Should fix · Suggestion
- Should fix: On a website with a terms URL, the new alert hides the PayU module's "name on the card" message (thread on
my2_gift_package.xml:158). - Suggestion: The two links under the payment form still open in the same tab (thread on
my2_gift_package.xml:365).
Outside this PR
On the PL test website, /web/signup shows no consent checkbox: the signup views that carry acceptance_full are bound to the Swiss and the default websites. This is older than this PR, and worth checking on production before Polish donors create accounts.
Verdict
Nearly there. Point 1 is a small change, and it matters as soon as this PR is deployed where the PayU module is installed.
Assisted-by: claude-opus-5-5, xhigh, claude-code
Assisted-by: gpt-6-astra, high, codex
Assisted-by: claude-opus-5-5, medium, claude-code
- A single donor_error alert, whose text follows the terms URL: modules insert their own alerts before it (the PayU module's name on the card). - The links under the payment form open in a new tab; rel=noopener on the agreement links.
|
Thanks, second review addressed in 7437313:
The legal pages script (CompassionCH/tools#31, f25fd7f) now checks each copy's content for Outside this PR: confirmed locally. The PL website's |
NoeBerdoz
left a comment
There was a problem hiding this comment.
Third review
Thanks David, both points of the second review are fixed in 7437313. A single t-elif="donor_error" alert switches its text on the terms URL, so the PayU module's name message is inserted before it again, and both msgids, with their Polish translations, are unchanged. The two links under the payment form open in a new tab.
What we tested
On a fresh database, this PR merged with #442 and CompassionCH/compassion-accounting#298: test_name_message_next_to_a_terms_url passes, with a terms URL on the website and the name missing. The my_compassion failures in that run all come from the fresh database (no child, no active payment method).
Open point
Levels: Must fix (money or security) · Before go-live (before real donors use it) · Should fix · Suggestion
- Suggestion: Two
(view agreement)links still lackrel="noopener"(thread onmy_account_personal_info.xml:142).
Verdict
Approved.
Assisted-by: claude-opus-5-5, high, claude-code
Assisted-by: claude-opus-5-5, medium, claude-code
Assisted-by: gpt-6-astra, high, codex
Assisted-by: Qwen3.8-Flash-Next-GGUF UD-IQ4_XS, high, pi
Conflicts resolved: - my2_new_sponsorship_wizard.xml (split by this branch): the terms and conditions consent label from #443 goes into standard_step.xml and wap_step.xml. - my2_new_sponsorship_details.xml: this branch's layout, with #438's my2_new_sponsorship_details_extra_fields hook after the name row and its _my2_details_mandatory() guard on the "Do this later" button. - de_DE, fr_CH, it_IT .po: 18.0's side of the single conflicting hunk. Assisted-by: claude-opus-5-5, xhigh, claude-code
Requested by PayU to validate the production account of Compassion Poland: PayU wants the terms and conditions (regulamin) and the privacy policy (polityka prywatności) as two separate documents, instead of the single
/legalpage.terms_url), next to Privacy Policy URL in the Footer tab.acceptance_fullread "I accept the terms and conditions and the privacy policy", with both links;/legal/termsleads to the terms./legalstill leads to the privacy policy, so existing links and sent e-mails keep working./termsis not used because Odoo'saccountmodule already has it.my_compassion/i18n/pl_PL.po, and a newtheme_compassion_2025/i18n/pl_PL.pofor the footer.The two pages and their URLs are created on the PL website by
odoo_shell/legal_pages_compassion_poland.pyin CompassionCH/tools#31.Deploy:
-u theme_compassion_2025,my_compassion, then run the script.Tests: new
TestLegalRoutes, 2/2 passing. Checked by hand on a local copy of the PL website:/legaland/legal/termsredirect to the two pages;Locally,
TestPublicFundDonationstill fails on things unrelated to this change: a test user in German, and a column missing because the local database is behind. None of these tests uses a terms URL.🤖 Generated with Claude Code