Merge branch 'production' into iman/telegram

# Conflicts:
#	indoteknik_custom/models/__init__.py

1 files changed, 9 insertions, 3 deletions

diff --git a/indoteknik_api/controllers/api_v1/city.py b/indoteknik_api/controllers/api_v1/city.py
index 6e0e3edb..afe92c4a 100644
--- a/indoteknik_api/controllers/api_v1/city.py
+++ b/indoteknik_api/controllers/api_v1/city.py
@@ -15,10 +15,16 @@ class City(controller.Controller):
             name = '%' + name.replace(' ', '%') + '%'
             parameters.append(('name', 'ilike', name))
 
-        cities = request.env['vit.kota'].search(parameters)
+        state_id = kw.get('state_id')
+        if state_id:
+            parameters.append(('state_id', '=', int(state_id)))
+
+        districts = request.env['vit.kota'].search(parameters)
         data = []
-        for city in cities:
-            data.append({ 'id': city.id, 'name': city.name })
+        for district in districts:
+            data.append({ 'id': district.id, 'name': district.name })
         
         return self.response(data)
+    
+