Skip to content

Commit

Permalink
[FIX] global: adapt backend_key name translation to global wallet list
Browse files Browse the repository at this point in the history
  • Loading branch information
Stéphan Sainléger committed Dec 5, 2023
1 parent 619c729 commit 338848a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 3 additions & 1 deletion lcc_comchain_base/models/res_partner_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ def get_lcc_product(self):
@api.model
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("comchain:"):
if backend_key == "comchain:" + self.env.user.company_id.comchain_currency_name:
name = "comchain"
elif backend_key.startswith("comchain:"):
name = backend_key
return name

Expand Down
4 changes: 3 additions & 1 deletion lcc_cyclos_base/models/res_partner_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,9 @@ def get_lcc_product(self):
@api.model
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:"):
if backend_key == "cyclos":
name = "cyclos"
elif backend_key.startswith("cyclos:"):
name = backend_key.replace("@"+self.env.user.company_id.get_cyclos_server_domain(), "")
return name

Expand Down
5 changes: 4 additions & 1 deletion lcc_lokavaluto_app_connection/services/partner_services.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ def backend_credentials(self):
)
def credit_requests(self, partner_credit_requests_get_param):
credit_request_list = []
wallets = self.env["res.partner.backend"].get_wallets(partner_credit_requests_get_param.backend_keys)
backend_types = []
for backend_key in partner_credit_requests_get_param.backend_keys:
backend_types.append(self.env["res.partner.backend"].translate_backend_key_in_wallet_name(backend_key))
wallets = self.env["res.partner.backend"].search([("type", "in", backend_types)])
for wallet in wallets:
credit_request_list = credit_request_list + wallet.get_pending_credit_requests()
return credit_request_list
Expand Down

0 comments on commit 338848a

Please sign in to comment.