channel-app 0.0.147__tar.gz → 0.0.148__tar.gz

{channel_app-0.0.147/channel_app.egg-info → channel_app-0.0.148}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel_app
-Version: 0.0.147
+Version: 0.0.148
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.147 → channel_app-0.0.148}/channel_app/omnitron/commands/orders/addresses.py

@@ -162,16 +162,19 @@ class GetOrCreateAddress(OmnitronCommandInterface):
             district_pk = district.pk
         return country_pk, city_pk, township_pk, district_pk
 
-    def get_mapping_object(self, code, endpoint):
+    def get_mapping_object(self, code, endpoint, extra_filters=None):
         """
         :param code: Identifier code for the City and Country on the Sales Channel. This is
             prefix with channel_id as integration_code
         :param endpoint: omnitron sdk endpoint
+        :param extra_filters: extra filters for the endpoint, dict or None
         :return: mapped objects E.g (City, Country)
         """
         integration_code = f"{self.integration.channel_id}_{code}"
         params = {"mapping__code__exact": integration_code,
                   "mapping__integration_type": INTEGRATION_TYPE}
+        if extra_filters:
+            params.update(extra_filters)
         objects = endpoint.list(params=params)
         if len(objects) != 1:
             raise IntegrationMappingException(params={"code": integration_code})
@@ -235,7 +238,8 @@ class GetOrCreateAddress(OmnitronCommandInterface):
         if len(townships) == 1:
             return townships[0]
         try:
-            townships = self.get_mapping_object(township_name, endpoint)
+            extra_filters = {"city": city.pk, "is_active": True}
+            townships = self.get_mapping_object(township_name, endpoint, extra_filters)
         except IntegrationMappingException as exc:
             raise TownshipException(
                 params={"type": ErrorType.township.value,
@@ -264,7 +268,8 @@ class GetOrCreateAddress(OmnitronCommandInterface):
         if len(districts) == 1:
             return districts[0]
         try:
-            districts = self.get_mapping_object(district_name, endpoint)
+            extra_filters = {"city": city.pk, "township": township.pk, "is_active": True}
+            districts = self.get_mapping_object(district_name, endpoint, extra_filters)
         except IntegrationMappingException as exc:
             raise DistrictException(
                 params={"type": ErrorType.district.value,

{channel_app-0.0.147 → channel_app-0.0.148/channel_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: channel_app
-Version: 0.0.147
+Version: 0.0.148
 Summary: Channel app for Sales Channels
 Home-page: https://github.com/akinon/channel_app
 Author: akinonteam

{channel_app-0.0.147 → channel_app-0.0.148}/setup.py

@@ -5,7 +5,7 @@ with open("README.md") as f:
 
 setup(
     name="channel_app",
-    version="0.0.147",
+    version="0.0.148",
     packages=find_packages(),
     url="https://github.com/akinon/channel_app",
     description="Channel app for Sales Channels",