From 042d141702588ea497e03cee8820191706d04ad6 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 30 Dec 2018 09:40:32 -0800 Subject: [PATCH] #63 Migrate to new API. --- sale_planner/models/partner.py | 14 +++++++------- sale_planner/wizard/order_planner.py | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sale_planner/models/partner.py b/sale_planner/models/partner.py index a14c45d3..fe44f548 100644 --- a/sale_planner/models/partner.py +++ b/sale_planner/models/partner.py @@ -1,9 +1,9 @@ from odoo import api, fields, models try: - from uszipcode import ZipcodeSearchEngine + from uszipcode import SearchEngine except ImportError: - ZipcodeSearchEngine = None + SearchEngine = None class Partner(models.Model): @@ -13,13 +13,13 @@ class Partner(models.Model): def geo_localize(self): # We need country names in English below for partner in self.with_context(lang='en_US'): - if ZipcodeSearchEngine and partner.zip: - with ZipcodeSearchEngine() as search: + if SearchEngine and partner.zip: + with SearchEngine() as search: zipcode = search.by_zipcode(str(self.zip).split('-')[0]) - if zipcode and zipcode['Latitude']: + if zipcode and zipcode.lat: partner.write({ - 'partner_latitude': zipcode['Latitude'], - 'partner_longitude': zipcode['Longitude'], + 'partner_latitude': zipcode.lat, + 'partner_longitude': zipcode.lng, 'date_localization': fields.Date.context_today(partner), }) else: diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py index 10ac7aba..75c81fca 100644 --- a/sale_planner/wizard/order_planner.py +++ b/sale_planner/wizard/order_planner.py @@ -8,10 +8,10 @@ from logging import getLogger _logger = getLogger(__name__) try: - from uszipcode import ZipcodeSearchEngine + from uszipcode import SearchEngine except ImportError: _logger.warn('module "uszipcode" cannot be loaded, falling back to Google API') - ZipcodeSearchEngine = None + SearchEngine = None from odoo import api, fields, models, tools from odoo.addons.base_geolocalize.models.res_partner import geo_find, geo_query_address @@ -58,12 +58,12 @@ class FakePartner(): if not hasattr(self, 'date_localization') and self.date_localization: self.date_localization = 'TODAY!' # The fast way. - if ZipcodeSearchEngine and self.zip: - with ZipcodeSearchEngine() as search: + if SearchEngine and self.zip: + with SearchEngine() as search: zipcode = search.by_zipcode(str(self.zip).split('-')[0]) - if zipcode and zipcode['Latitude']: - self.partner_latitude = zipcode['Latitude'] - self.partner_longitude = zipcode['Longitude'] + if zipcode and zipcode.lat: + self.partner_latitude = zipcode.lat + self.partner_longitude = zipcode.lng return self.date_localization # The slow way.