T3423 desktop new sponsorship view

my_compassion/__manifest__.py

@@ -76,9 +76,16 @@
         "templates/pages/my2_login_template.xml",
         "templates/pages/my2_gifts.xml",
         "templates/pages/my2_sponsorships.xml",
-        "templates/pages/my2_new_sponsorship_wizard.xml",
-        "templates/pages/my2_new_sponsorship_payment.xml",
-        "templates/pages/my2_new_sponsorship_details.xml",
+        "templates/pages/my2_new_sponsorship/progress_bar.xml",
+        "templates/pages/my2_new_sponsorship/sponsorship_plus.xml",
+        "templates/pages/my2_new_sponsorship/standard_step.xml",
+        "templates/pages/my2_new_sponsorship/wap_step.xml",
+        "templates/pages/my2_new_sponsorship/logged_in_steps.xml",
+        "templates/pages/my2_new_sponsorship/my2_new_sponsorship_wizard.xml",
+        "templates/pages/my2_new_sponsorship/thank_you_page.xml",
+        "templates/pages/my2_new_sponsorship/all_set.xml",
+        "templates/pages/my2_new_sponsorship/my2_new_sponsorship_payment.xml",
+        "templates/pages/my2_new_sponsorship/my2_new_sponsorship_details.xml",
         "templates/pages/my2_update_card.xml",
         "templates/pages/my2_gift_package.xml",
         "templates/pages/my2_gifts_thank_you.xml",

my_compassion/controllers/my2_sponsorships.py

@@ -119,7 +119,7 @@ def my2_render_write_and_pray_page(self, **kwargs):
         Renders the write and pray variant of the sponsorships page.
 
         Write&Pray is Switzerland-only: the free, no-financial-support
-        godparent role it offers is not a product the other countries sell.
+        sponsorship role it offers is not a product the other countries sell.
 
         return: An HTTP response containing a rendered template with the
         sponsorships landing page.
@@ -701,6 +701,15 @@ def _render_form_content(wizard):
             f"/web/login?{urlencode({'redirect': request.httprequest.full_path})}"
         )
 
+        # The step's own submit radios, when it has any: one per payment
+        # mode, in the fast-checkout step's own left column (see
+        # standard_step.xml), in place of the generic Continue/Finish button.
+        payment_mode_buttons = wizard._get_payment_mode_buttons()
+        # Whether those radios are this step's submit at all, which is what
+        # says if the generic button may stand in when the list above is
+        # empty.
+        step_offers_payment_modes = wizard._step_offers_payment_modes()
+
         # Render step template first
         inner_step_html = request.env["ir.qweb"]._render(
             wizard.current_step.template.id,
@@ -715,6 +724,8 @@ def _render_form_content(wizard):
                 "sponsorship_amount": _product_display_price("sponsorship"),
                 "sponsorship_plus_extra": _product_display_price("fund_gen"),
                 "login_url_redirect": login_url_redirect,
+                "payment_mode_buttons": payment_mode_buttons,
+                "step_offers_payment_modes": step_offers_payment_modes,
             },
         )
 
@@ -725,13 +736,8 @@ def _render_form_content(wizard):
                 "wizard": wizard,
                 "inner_step_html": inner_step_html,
                 "currency_name": currency_name,
-                # The step's own submit buttons, when it has any: one per
-                # payment mode, in place of the generic Continue/Finish one.
-                "payment_mode_buttons": wizard._get_payment_mode_buttons(),
-                # Whether those buttons are this step's submit at all, which
-                # is what says if the generic button may stand in when the
-                # list above is empty.
-                "step_offers_payment_modes": wizard._step_offers_payment_modes(),
+                "payment_mode_buttons": payment_mode_buttons,
+                "step_offers_payment_modes": step_offers_payment_modes,
             },
         )