Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP]Extract address API values construction to a dedicated method #38

Open
wants to merge 2 commits into
base: mit/16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions account_avatax_oca/models/avatax_rest_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,22 +262,6 @@ def get_tax(
if doc_date and type(doc_date) != str:
doc_date = fields.Date.to_string(doc_date)
create_transaction = {
"addresses": {
"shipFrom": {
"city": origin.city,
"country": origin.country_id.code or None,
"line1": origin.street or None,
"postalCode": origin.zip,
"region": origin.state_id.code or None,
},
"shipTo": {
"city": destination.city,
"country": destination.country_id.code or None,
"line1": destination.street or None,
"postalCode": destination.zip,
"region": destination.state_id.code or None,
},
},
"lines": lineslist,
# 'purchaseOrderNo": "2020-02-05-001"
"companyCode": company_code,
Expand All @@ -295,6 +279,24 @@ def get_tax(
"type": doc_type,
"commit": commit,
}

# Bigin
# Block For Getting Origin and Destination Address
# Segeregate Method for if Destination dosen't have any
# address details get Avatax Tax with using Lattitude and Longitude from Partner

origin_addresses = origin.get_origin_addresses(origin)

destination_addresses = destination.get_destination_addresses(destination)

org_dest_addresses = {"addresses" : origin_addresses}

org_dest_addresses.get("addresses").update(destination_addresses)

create_transaction.update(org_dest_addresses)

# End

if is_override and invoice_date:
create_transaction.update(
{
Expand Down
39 changes: 39 additions & 0 deletions account_avatax_oca/models/partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,42 @@ def write(self, vals):
partner.multi_address_validation(validation_on_save=True)
partner.validated_on_save = True
return res

def get_origin_addresses(self, origin):
partner_origin_addresses = {
"shipFrom": {
"city": origin.city,
"country": origin.country_id.code or None,
"line1": origin.street or None,
"postalCode": origin.zip,
"region": origin.state_id.code or None,
},
}
return partner_origin_addresses

def get_destination_addresses(self, destination):
partner_destination_addresses = {}
if (
not destination.city and not destination.zip and not destination.state_id.code
) and (destination.partner_latitude and destination.partner_longitude):
partner_destination_addresses.update(
{
"coordinates": {
"latitude": destination.partner_latitude,
"longitude": destination.partner_longitude,
}
}
)
else:
partner_destination_addresses.update(
{
"shipTo": {
"city": destination.city,
"country": destination.country_id.code or None,
"line1": destination.street or None,
"postalCode": destination.zip,
"region": destination.state_id.code or None,
}
}
)
return partner_destination_addresses