ob-dj-store 0.0.17.2__py3-none-any.whl → 0.0.17.3__py3-none-any.whl

ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -84,21 +84,22 @@ class ArabicFieldsMixin:
         language_header = request.META.get("HTTP_LANGUAGE", "").upper()
         return language_header == self.ARABIC_LANGUAGE_CODE
 
-    def get_fields(self):
-        """
-        Override the get_fields method to include or exclude Arabic fields.
-        """
-        fields = super().get_fields()
+    def to_representation(self, instance):
         request = self.context.get("request")
-
+        data = super().to_representation(instance)
         if request and self.should_include_arabic_fields(request):
-            for field_name in list(fields.keys()):
-                if any(suffix in field_name for suffix in self.arabic_field_suffixes):
-                    original_field_name = field_name.replace("_arabic", "")
-                    fields[original_field_name] = fields[field_name]
-                    fields.pop(field_name, None)
-
-        return fields
+            data_output = {}
+            for field_name, field_instance in data.items():
+                for suffix in self.arabic_field_suffixes:
+                    if field_name.endswith(suffix) or field_name.startswith(suffix):
+                        original_field_name = field_name.replace(suffix, "")
+                        data_output[original_field_name] = (
+                            field_instance
+                            if field_instance
+                            else data[original_field_name]
+                        )
+            data.update(data_output)
+        return data
 
 
 class AttributeChoiceSerializer(ArabicFieldsMixin, serializers.ModelSerializer):

ob_dj_store/core/stores/admin.py

@@ -95,6 +95,7 @@ class StoreAdmin(LeafletGeoAdmin):
             {
                 "fields": (
                     "name",
+                    "name_arabic",
                     "location",
                     "address",
                     "is_active",

{ob_dj_store-0.0.17.2.dist-info → ob_dj_store-0.0.17.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.17.2
+Version: 0.0.17.3
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes

{ob_dj_store-0.0.17.2.dist-info → ob_dj_store-0.0.17.3.dist-info}/RECORD

@@ -3,14 +3,14 @@ ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 ob_dj_store/apis/stores/filters.py,sha256=lrtmusSkMSQZMrn4PYbwWwqDtPbWQc-nOXE3Wdl58ew,9676
 ob_dj_store/apis/stores/urls.py,sha256=7vwogfIGcKS0hHYK3iBXKQwi1kCA_vuHY1eZt8rAspg,2021
 ob_dj_store/apis/stores/views.py,sha256=wcTVpGOuRvYc0ADnu6niHPy_jcWKTYUTX9cJ7UAOWfE,43320
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=7xTKzJf8MjYglC0M9XhILqkAcGhe1-dT57Wzxx7TT8k,59464
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=if2fW9hSUU4JKJmcfestOCNfuCIzc06pPvUpQqZ9Pug,59639
 ob_dj_store/apis/tap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/tap/serializers.py,sha256=KPrBK4h2-fWvEVf6vOj2ww5-USV9WqpyYicIqoHIiXI,1065
 ob_dj_store/apis/tap/urls.py,sha256=bnOTv6an11kxpo_FdqlhsizlGPLVpNxBjCyKcf3_C9M,367
 ob_dj_store/apis/tap/views.py,sha256=VnVquybTHlJquxsC0RNTy20dtLXalchO0SlGjSDaBng,2666
 ob_dj_store/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/__init__.py,sha256=-izNGrxNn_nn3IQXd5pkuES9lSF-AHYb14yhNPozYCI,65
-ob_dj_store/core/stores/admin.py,sha256=t8n6oFsqFEgdhT3YJAQGmkgyrp217VGm3dx861Mbhz8,12287
+ob_dj_store/core/stores/admin.py,sha256=VqTSIviohiX0OO39zr2HwZYFdxMWwV-mWdCYrbNc1IU,12322
 ob_dj_store/core/stores/admin_inlines.py,sha256=NM8Ab7htloQdihRBmew4Ie-ENsKhMlKRIsIH06xO1Mw,2903
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
 ob_dj_store/core/stores/managers.py,sha256=Rhv_jTul29A0t_H7jiLQUewn4GnSbgYZ6kq4WAivvjc,9852
@@ -149,7 +149,7 @@ ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ob_dj_store/utils/helpers.py,sha256=o7wgypM7mI2vZqZKkhxnTcnHJC8GMQDOuYMnRwXr6tY,2058
 ob_dj_store/utils/model.py,sha256=DV7hOhTaZL3gh9sptts2jTUFlTArKG3i7oPioq9HLFE,303
 ob_dj_store/utils/utils.py,sha256=8UVAFB56qUSjJJ5f9vnermtw638gdFy4CFRCuMbns_M,1342
-ob_dj_store-0.0.17.2.dist-info/METADATA,sha256=Hm-S7HrSI2ncvznCy8GZUSXXt0SI2gPZ-fOc5L_hOiY,2827
-ob_dj_store-0.0.17.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ob_dj_store-0.0.17.2.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.17.2.dist-info/RECORD,,
+ob_dj_store-0.0.17.3.dist-info/METADATA,sha256=iD1ucE15Y-3JN0n9W3izZsw-7B80hXDuMlUJCL6SwP4,2827
+ob_dj_store-0.0.17.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ob_dj_store-0.0.17.3.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.17.3.dist-info/RECORD,,