From 997aa444cb4ddc543339ce4ba026ec3b4745c262 Mon Sep 17 00:00:00 2001 From: "Valeriya(vchu)" Date: Mon, 25 Sep 2023 17:32:48 +0200 Subject: [PATCH] [IMP] payment: payment methods improvements closes odoo/odoo#136525 Signed-off-by: Antoine Vandevenne (anv) --- .../views/account_portal_templates.xml | 2 +- addons/payment/__manifest__.py | 4 +- addons/payment/data/payment_method_data.xml | 23 +++- addons/payment/data/payment_provider_data.xml | 1 + addons/payment/models/payment_method.py | 25 +++- .../payment/views/payment_form_templates.xml | 10 +- addons/payment/views/payment_method_views.xml | 107 ++++++++++++++++-- .../payment/views/payment_provider_views.xml | 11 +- addons/payment/views/portal_templates.xml | 19 ++-- .../views/payment_custom_templates.xml | 16 +++ .../views/payment_demo_templates.xml | 16 +++ addons/sale/views/sale_portal_templates.xml | 6 +- .../data/payment_provider_data.xml | 2 +- .../data/website_sale_picking_data.xml | 2 +- .../static/tests/tours/onsite_payment_tour.js | 2 +- 15 files changed, 209 insertions(+), 37 deletions(-) diff --git a/addons/account_payment/views/account_portal_templates.xml b/addons/account_payment/views/account_portal_templates.xml index ef934bb3258..7e4bf8cf7b3 100644 --- a/addons/account_payment/views/account_portal_templates.xml +++ b/addons/account_payment/views/account_portal_templates.xml @@ -79,7 +79,7 @@ - - + + + - - - - - - + + + + + + + + + + + + + + + + + @@ -41,13 +92,38 @@ - - + + payment.method.kanban + payment.method + 1 + + + + +
+
+
+ +
+
+ + + +
+
+
+
+
+
+
+
+ + payment.method.search payment.method @@ -62,11 +138,20 @@ Payment Methods payment.method tree,kanban,form - [('is_primary', '=', True)] + [ + ('is_primary', '=', True), + ('provider_ids.state', '!=', 'disabled') + ] + {'active_test': False}

- Create a payment method + No payment methods found for your payment providers. +

+

+ + Configure a payment provider +

diff --git a/addons/payment/views/payment_provider_views.xml b/addons/payment/views/payment_provider_views.xml index c25813d4f09..bf62e1b3bdd 100644 --- a/addons/payment/views/payment_provider_views.xml +++ b/addons/payment/views/payment_provider_views.xml @@ -78,6 +78,7 @@ - + diff --git a/addons/payment/views/portal_templates.xml b/addons/payment/views/portal_templates.xml index 41c62977de7..5ec2abd14da 100644 --- a/addons/payment/views/portal_templates.xml +++ b/addons/payment/views/portal_templates.xml @@ -114,7 +114,7 @@ -
+
+
@@ -172,7 +173,9 @@
-
+
Amount @@ -187,11 +190,13 @@ - - - Payment Method - - + + + + Payment Method + + + diff --git a/addons/payment_custom/views/payment_custom_templates.xml b/addons/payment_custom/views/payment_custom_templates.xml index 582e7c5f393..d43759de4f8 100644 --- a/addons/payment_custom/views/payment_custom_templates.xml +++ b/addons/payment_custom/views/payment_custom_templates.xml @@ -1,6 +1,22 @@ + + + +