Skip to content

Commit

Permalink
[UPD] delivery_deliverea: Get partner data info
Browse files Browse the repository at this point in the history
  • Loading branch information
dalonsofl committed Dec 16, 2024
1 parent fc20867 commit 9f2559c
Showing 1 changed file with 10 additions and 14 deletions.
24 changes: 10 additions & 14 deletions delivery_deliverea/models/delivery_carrier.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,29 +266,25 @@ def _check_mandatory_fields(self, values, mandatory_list, object_id):
% {"field": ", ".join(errors), "object_id": object_id.name}
)

def _get_field_from_partner_or_parent_id(self, partner, field):
return partner[field] or partner.parent_id and partner.parent_id[field] or ""

def _get_deliverea_sender_info(self, partner, request_type):
country_id = self._get_field_from_partner_or_parent_id(partner, "country_id")
state_id = self._get_field_from_partner_or_parent_id(partner, "state_id")
country_id = partner.country_id or ""
state_id = partner.state_id or ""
values = {
"name": self._get_field_from_partner_or_parent_id(partner, "name"),
"name": partner.name or "",
"address": " ".join(
[
self._get_field_from_partner_or_parent_id(partner, "street"),
self._get_field_from_partner_or_parent_id(partner, "street2"),
partner.street or "",
partner.street2 or "",
]
).strip(),
"city": self._get_field_from_partner_or_parent_id(partner, "city"),
"zipCode": self._get_field_from_partner_or_parent_id(partner, "zip"),
"city": partner.city or "",
"zipCode": partner.zip or "",
"countryCode": country_id.code if country_id else "",
"idNumber": self._get_field_from_partner_or_parent_id(partner, "vat"),
"idNumber": partner.vat or "",
"stateCode": state_id.code if state_id else "",
"observations": "",
"phone": self._get_field_from_partner_or_parent_id(partner, "phone")
or self._get_field_from_partner_or_parent_id(partner, "mobile"),
"email": self._get_field_from_partner_or_parent_id(partner, "email"),
"phone": partner.phone or partner.mobile or "",
"email": partner.email or "",
}
self._check_mandatory_fields(
values,
Expand Down

0 comments on commit 9f2559c

Please sign in to comment.