sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.7.12 fix search_matches sendmail link

Browse Source
This commit is contained in:
SDE
2024-11-06 15:51:54 +03:00
parent 774ee85f8d
commit 2cfa314c3c
2 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
RoutesApp/search_matches.py
View File

@@ -91,8 +91,11 @@ def search_matches(for_routes=None):
)
check_fields = [
'type_transport', 'departure_DT', 'arrival_DT', 'from_address_point', 'to_address_point',
'from_place', 'to_place', 'cargo_type', 'weight'
'type_transport', 'departure_DT', 'arrival_DT',
# 'from_address_point', 'to_address_point',
'from_place', 'to_place',
'cargo_type', 'weight',
'from_city', 'to_city',
]
if for_routes:
@@ -118,6 +121,14 @@ def search_matches(for_routes=None):
kwargs.update({f"{field_name}__lte": field_val})
else:
kwargs.update({f"{field_name}__gte": field_val})
elif field_name == 'from_city':
params.update({'from_address_point': field_val.id})
kwargs.update({field_name: field_val})
elif field_name == 'to_city':
params.update({'to_address_point': field_val.id})
kwargs.update({field_name: field_val})
# elif field_name in ['from_address_point', 'to_address_point']:
# kwargs.update({field_name: field_val})
else:
kwargs.update({field_name: field_val})
params.update({field_name: field_val})