[IMP] lcc_cyclos_base: add get_cyclos_server_domain function

Lokavaluto · Dec 5, 2023 · 619c729 · 619c729
1 parent b8909d8
commit 619c729
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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
diff --git a/lcc_cyclos_base/models/res_partner.py b/lcc_cyclos_base/models/res_partner.py
@@ -72,11 +72,7 @@ def backends(self):
         if not wallets:
             return backends
         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
@@ -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):