Spaces:
Sleeping
Sleeping
OnlyBiggg
commited on
Commit
·
43e4baf
1
Parent(s):
355c2a3
fix
Browse files
app/dialogflow/services/dialog_service.py
CHANGED
|
@@ -280,7 +280,9 @@ class DialogService:
|
|
| 280 |
if group.get("name"):
|
| 281 |
name = group["name"]
|
| 282 |
if name == office_name:
|
| 283 |
-
|
|
|
|
|
|
|
| 284 |
return None
|
| 285 |
|
| 286 |
async def find_id_provine_by_name_office(self, office_name: str):
|
|
@@ -315,8 +317,11 @@ class DialogService:
|
|
| 315 |
if group.get("name"):
|
| 316 |
name = group["name"]
|
| 317 |
if name == office_name:
|
| 318 |
-
|
| 319 |
-
|
|
|
|
|
|
|
|
|
|
| 320 |
|
| 321 |
async def get_origin_city_from_office(self, origin_office: str):
|
| 322 |
data = await self.search_pickup_points(origin=origin_office)
|
|
|
|
| 280 |
if group.get("name"):
|
| 281 |
name = group["name"]
|
| 282 |
if name == office_name:
|
| 283 |
+
office_id = group["officeId"]
|
| 284 |
+
office_id = office_id[0] if isinstance(office_id, tuple) else office_id
|
| 285 |
+
return office_id
|
| 286 |
return None
|
| 287 |
|
| 288 |
async def find_id_provine_by_name_office(self, office_name: str):
|
|
|
|
| 317 |
if group.get("name"):
|
| 318 |
name = group["name"]
|
| 319 |
if name == office_name:
|
| 320 |
+
province_id = group["provinceId"]
|
| 321 |
+
province_code = group["provinceCode"]
|
| 322 |
+
province_id = province_id[0] if isinstance(province_id, tuple) else province_id
|
| 323 |
+
return province_id, province_code
|
| 324 |
+
return None, None
|
| 325 |
|
| 326 |
async def get_origin_city_from_office(self, origin_office: str):
|
| 327 |
data = await self.search_pickup_points(origin=origin_office)
|
app/dialogflow/services/origin_codes.py
CHANGED
|
@@ -9,5 +9,6 @@ def get_origin_id_and_code(origin: str):
|
|
| 9 |
if origin == x["name"]:
|
| 10 |
id = x["id"],
|
| 11 |
code = x["code"]
|
|
|
|
| 12 |
return id, code
|
| 13 |
return None, None
|
|
|
|
| 9 |
if origin == x["name"]:
|
| 10 |
id = x["id"],
|
| 11 |
code = x["code"]
|
| 12 |
+
id = id[0] if isinstance(id, tuple) else id
|
| 13 |
return id, code
|
| 14 |
return None, None
|