From edc918594fa10fcf4c1f748c03427a530bda699d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Sainl=C3=A9ger?= Date: Wed, 15 Nov 2023 00:06:05 +0100 Subject: [PATCH] [IMP] lcc_cyclos_base: add get_cyclos_server_domain function --- lcc_cyclos_base/models/company.py | 8 ++++++++ lcc_cyclos_base/models/res_partner.py | 6 +----- lcc_cyclos_base/models/res_partner_backend.py | 6 +----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lcc_cyclos_base/models/company.py b/lcc_cyclos_base/models/company.py index d5fb1f71..73b88a56 100644 --- a/lcc_cyclos_base/models/company.py +++ b/lcc_cyclos_base/models/company.py @@ -10,3 +10,11 @@ class Company(models.Model): cyclos_server_login = fields.Char(string="Login for cyclos server") cyclos_server_password = fields.Char(string="Password for cyclos server") + + def get_cyclos_server_domain(self): + self.ensure_one() + domain_url = self.cyclos_server_url + remove = ["https://", "http://", "/api"] + for value in remove: + domain_url = domain_url.replace(value, "") + return domain_url \ No newline at end of file diff --git a/lcc_cyclos_base/models/res_partner.py b/lcc_cyclos_base/models/res_partner.py index 2e8c8d75..cc3825e0 100644 --- a/lcc_cyclos_base/models/res_partner.py +++ b/lcc_cyclos_base/models/res_partner.py @@ -66,11 +66,7 @@ def backends(self): backends = super(ResPartner, self).backends() wallets = self.get_wallets("cyclos") if wallets[0].cyclos_id: - cyclos_serveur_url = self.env.user.company_id.cyclos_server_url - remove = ["https://", "http://", "/api"] - for value in remove: - cyclos_serveur_url = cyclos_serveur_url.replace(value, "") - return backends | {"%s:%s" % ("cyclos", cyclos_serveur_url)} + return backends | {"%s:%s" % ("cyclos", self.env.user.company_id.get_cyclos_server_domain())} else: return backends diff --git a/lcc_cyclos_base/models/res_partner_backend.py b/lcc_cyclos_base/models/res_partner_backend.py index 8fa55fcb..bbaf8978 100644 --- a/lcc_cyclos_base/models/res_partner_backend.py +++ b/lcc_cyclos_base/models/res_partner_backend.py @@ -261,11 +261,7 @@ def get_lcc_product(self): def translate_backend_key_in_wallet_name(self, backend_key): name = super(ResPartnerBackend,self).translate_backend_key_in_wallet_name(backend_key) if backend_key.startswith("cyclos:"): - cyclos_serveur_url = self.env.user.company_id.cyclos_server_url - remove = ["https://", "http://", "/api"] - for value in remove: - cyclos_serveur_url = cyclos_serveur_url.replace(value, "") - name = backend_key.replace("@"+cyclos_serveur_url, "") + name = backend_key.replace("@"+self.env.user.company_id.get_cyclos_server_domain(), "") return name def get_wallet_data(self):