diff --git a/addons/website_sale/__init__.py b/addons/website_sale/__init__.py index 7d34c7c054a..88710707227 100644 --- a/addons/website_sale/__init__.py +++ b/addons/website_sale/__init__.py @@ -3,3 +3,4 @@ from . import controllers from . import models +from . import wizard diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py index dd68c7046d5..c4136d11a15 100644 --- a/addons/website_sale/__manifest__.py +++ b/addons/website_sale/__manifest__.py @@ -15,6 +15,7 @@ 'data/digest_data.xml', 'views/product_views.xml', 'views/account_views.xml', + 'views/onboarding_views.xml', 'views/sale_report_views.xml', 'views/sale_order_views.xml', 'views/crm_team_views.xml', diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py index 2ed1e1dbe42..ad98431fbaf 100644 --- a/addons/website_sale/models/__init__.py +++ b/addons/website_sale/models/__init__.py @@ -12,3 +12,4 @@ from . import sale_order from . import website from . import res_config_settings from . import digest +from . import res_company diff --git a/addons/website_sale/models/res_company.py b/addons/website_sale/models/res_company.py new file mode 100644 index 00000000000..c82e478ab26 --- /dev/null +++ b/addons/website_sale/models/res_company.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models + + +class ResCompany(models.Model): + _inherit = 'res.company' + + website_sale_onboarding_payment_acquirer_done =\ + fields.Boolean("Website sale onboarding payment acquirer step done", default=False) + + @api.model + def action_open_website_sale_onboarding_payment_acquirer(self): + """ Called by onboarding panel above the quotation list.""" + action = self.env.ref('website_sale.action_open_website_sale_onboarding_payment_acquirer_wizard').read()[0] + return action diff --git a/addons/website_sale/views/onboarding_views.xml b/addons/website_sale/views/onboarding_views.xml new file mode 100644 index 00000000000..6004dfab302 --- /dev/null +++ b/addons/website_sale/views/onboarding_views.xml @@ -0,0 +1,31 @@ + + + + + website.sale.onboarding.payment.acquirer.form + website.sale.payment.acquirer.onboarding.wizard + + primary + 1000 + + + + + + Choose a payment method + ir.actions.act_window + website.sale.payment.acquirer.onboarding.wizard + form + form + + new + + diff --git a/addons/website_sale/wizard/__init__.py b/addons/website_sale/wizard/__init__.py new file mode 100644 index 00000000000..ca76ffc555b --- /dev/null +++ b/addons/website_sale/wizard/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import payment_acquirer_onboarding_wizard diff --git a/addons/website_sale/wizard/payment_acquirer_onboarding_wizard.py b/addons/website_sale/wizard/payment_acquirer_onboarding_wizard.py new file mode 100644 index 00000000000..688b740d72e --- /dev/null +++ b/addons/website_sale/wizard/payment_acquirer_onboarding_wizard.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models + + +class PaymentWizard(models.TransientModel): + _inherit = 'payment.acquirer.onboarding.wizard' + _name = 'website.sale.payment.acquirer.onboarding.wizard' + + def _set_payment_acquirer_onboarding_step_done(self): + """ Override. """ + self.env.user.company_id.website_sale_onboarding_payment_acquirer_done = True diff --git a/addons/website_theme_install/__init__.py b/addons/website_theme_install/__init__.py index 9a7e03eded3..dc5e6b693d1 100644 --- a/addons/website_theme_install/__init__.py +++ b/addons/website_theme_install/__init__.py @@ -1 +1,4 @@ -from . import models \ No newline at end of file +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import models diff --git a/addons/website_theme_install/models/__init__.py b/addons/website_theme_install/models/__init__.py index c32871d604e..480a1b847c7 100644 --- a/addons/website_theme_install/models/__init__.py +++ b/addons/website_theme_install/models/__init__.py @@ -1 +1,5 @@ -from . import ir_module_module \ No newline at end of file +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from . import ir_module_module +from . import res_company diff --git a/addons/website_theme_install/models/res_company.py b/addons/website_theme_install/models/res_company.py new file mode 100644 index 00000000000..ce1e3e719a7 --- /dev/null +++ b/addons/website_theme_install/models/res_company.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models +from ast import literal_eval + + +class ResCompany(models.Model): + _inherit = 'res.company' + + def _compute_website_theme_onboarding_done(self): + """ The step is marked as done if one theme is installed. """ + # we need the same domain as the existing action + action = self.env.ref('website_theme_install.theme_install_kanban_action').read()[0] + domain = literal_eval(action['domain']) + domain.append(('state', '=', 'installed')) + installed_themes_count = self.env['ir.module.module'].sudo().search_count(domain) + for record in self: + record.website_theme_onboarding_done = (installed_themes_count > 0) + + website_theme_onboarding_done = fields.Boolean("Onboarding website theme step done", + compute='_compute_website_theme_onboarding_done') + + @api.model + def action_open_website_theme_selector(self): + action = self.env.ref('website_theme_install.theme_install_kanban_action').read()[0] + action['target'] = 'new' + return action diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml index e78b76a53fb..1522b751936 100644 --- a/addons/website_theme_install/views/views.xml +++ b/addons/website_theme_install/views/views.xml @@ -95,4 +95,15 @@ action = { See themes here + +