ob-dj-store 0.0.17.2__py3-none-any.whl → 0.0.17.4__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):
@@ -107,7 +108,9 @@ class AttributeChoiceSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "label",
+            "label_arabic",
             "is_default",
         )
 
@@ -136,6 +139,7 @@ class AttributeSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "attribute_choices",
         )
 
@@ -551,6 +555,7 @@ class ProductTagSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "text_color",
             "background_color",
         )
@@ -564,6 +569,7 @@ class ProductAttributeSerializer(ArabicFieldsMixin, serializers.ModelSerializer)
         fields = (
             "id",
             "name",
+            "name_arabic",
             "is_mandatory",
             "attribute_choices",
             "type",
@@ -577,13 +583,17 @@ class ProductVariantSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     product_attributes = ProductAttributeSerializer(many=True)
     is_primary = serializers.SerializerMethodField()
     inventory = serializers.SerializerMethodField()
+    name_extra = serializers.SerializerMethodField("get_name_extra")
 
     class Meta:
         model = ProductVariant
         fields = (
             "id",
+            "name_extra",
             "name",
+            "name_arabic",
             "label",
+            "label_arabic",
             "sku",
             "product_attributes",
             "is_primary",
@@ -595,6 +605,9 @@ class ProductVariantSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         )
         extra_kwargs = {"image_thumbnail_medium": {"read_only": True}}
 
+    def get_name_extra(self, obj):
+        return obj.name
+
     def get_is_primary(self, obj):
         return True if obj.inventories.filter(is_primary=True).exists() else False
 
@@ -821,6 +834,8 @@ class ProductSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeria
             "product_variants",
             "default_variant",
             "favorites",
+            "name_arabic",
+            "description_arabic",
         )
 
     def to_representation(self, instance: Product):
@@ -837,9 +852,12 @@ class ProductListSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "slug",
             "label",
+            "label_arabic",
             "description",
+            "description_arabic",
             "product_images",
             "type",
         )
@@ -856,7 +874,9 @@ class SubCategorySerializer(serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "description",
+            "description_arabic",
             "is_active",
             "products",
             "image",
@@ -893,7 +913,9 @@ class CategorySerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "description",
+            "description_arabic",
             "products",
             "is_active",
             "subcategories",
@@ -1046,6 +1068,7 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             "current_day_opening_hours",
             "image",
             "busy_mode",
+            "name_arabic",
         )
         extra_kwargs = {
             "image": {"read_only": True, "required": False},
@@ -1123,7 +1146,10 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
         return len(self.favorites) > 0
 
     def get_address_line(self, obj):
-        return obj.address.address_line
+        language = (
+            True if self.context["request"].META.get("HTTP_LANGUAGE", "") else False
+        )
+        return obj.address.address_line_arabic if language else obj.address.address_line
 
     def get_distance(self, obj):
         # get the distance between the user location and store location
@@ -1166,7 +1192,9 @@ class PaymentMethodSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             "id",
             "payment_provider",
             "name",
+            "name_arabic",
             "description",
+            "description_arabic",
         )
 
 
@@ -1275,6 +1303,7 @@ class FavoriteSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             "extra_info",
             "object_type",
             "name",
+            "name_arabic",
             "is_available_in_store",
         )
         extra_kwargs = {
@@ -1438,6 +1467,7 @@ class WalletSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             "currency",
             "balance",
             "name",
+            "name_arabic",
             "media_image",
             "image_url",
         ]

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/core/stores/migrations/0100_remove_shippingmethod_type_arabic.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.8 on 2023-12-14 14:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0099_alter_product_name_arabic"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="shippingmethod",
+            name="type_arabic",
+        ),
+    ]

ob_dj_store/core/stores/models/_store.py

@@ -29,11 +29,6 @@ class ShippingMethod(models.Model):
         TAKEAWAY = "TAKEAWAY"
         DELIVERY = "DELIVERY"
 
-    class ShippingTypeArabic(models.TextChoices):
-        DRIVE_THROUGH = "DRIVE_THROUGH"
-        TAKEAWAY = "TAKEAWAY"
-        DELIVERY = "توصيل"
-
     class ShippingFeeOptions(models.IntegerChoices):
         """
         Decides how the shipping fees should be calculated.
@@ -46,11 +41,6 @@ class ShippingMethod(models.Model):
     type = models.CharField(
         max_length=30, choices=ShippingType.choices, default=ShippingType.DELIVERY
     )
-    type_arabic = models.CharField(
-        max_length=30,
-        choices=ShippingTypeArabic.choices,
-        default=ShippingTypeArabic.DELIVERY,
-    )
     shipping_fee_option = models.IntegerField(
         choices=ShippingFeeOptions.choices, default=1
     )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.17.2
+Version: 0.0.17.4
 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.4.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=2UdqUOvqtX1IozbT619VkSbLv5y87Zz2qlyU6NKsP1k,60564
 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
@@ -132,6 +132,7 @@ ob_dj_store/core/stores/migrations/0096_discount_discount_pos_id.py,sha256=UMK1y
 ob_dj_store/core/stores/migrations/0097_auto_20231108_1939.py,sha256=zlz85pUO_3TynWIVcJfWESoapuffdY4aed8FQXhOF1s,1177
 ob_dj_store/core/stores/migrations/0098_alter_discount_discount_rate.py,sha256=JkIwox2MiBxDtjvUZVHbF7zQZwL0JiejDglFf5lANGk,577
 ob_dj_store/core/stores/migrations/0099_alter_product_name_arabic.py,sha256=dVv63A8f01zqA12KMWhV8Gu4brt8UYZ152TPk_aKiZw,483
+ob_dj_store/core/stores/migrations/0100_remove_shippingmethod_type_arabic.py,sha256=3rwZhXsOqbo4jdW6AT5ClaDqXPYbMfP1JOesNzy-Ldw,347
 ob_dj_store/core/stores/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/models/__init__.py,sha256=VeWrDiIbw94ZDSFD-62rz9iTTW87iPdwDW5jcjxm7bs,2045
 ob_dj_store/core/stores/models/_address.py,sha256=8zV444A8M7P8yqQHjEOCROUykWPQ1ndSdd2IIX8wwWY,2207
@@ -143,13 +144,13 @@ ob_dj_store/core/stores/models/_order.py,sha256=hFdlAQcN-iZM6_RaIWJ_FATwTER7pHCG
 ob_dj_store/core/stores/models/_partner.py,sha256=n2D_tbhsry6QH3eFBMJyWTmv3Sd2iuKXBylIsjEU4fc,4470
 ob_dj_store/core/stores/models/_payment.py,sha256=LLXDKDeetCWauybC_VCtxxnD1PECKvuzQcPrnTBh6fs,6434
 ob_dj_store/core/stores/models/_product.py,sha256=F4GPoYXxmw-LC8Gben7RRFly-NmnjcvQhT6hrDggKbw,17665
-ob_dj_store/core/stores/models/_store.py,sha256=LmCdnkhuxMPC3oDAUXDlPuiTey_SWhGSLUnrG_9IToY,9888
+ob_dj_store/core/stores/models/_store.py,sha256=wv_bkWIpudUUcM81rLaOnuVzhBPMU5Dqk3oUmMY5Ep8,9581
 ob_dj_store/core/stores/models/_wallet.py,sha256=Eb1Sy79_M8PGrcfd5Bri0fT-bkwyqfkPHNyC2T7CR_0,5454
 ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.4.dist-info/METADATA,sha256=ntqmx3kziaao3jAf57faWXBgL8ZRc8i6Oc8VDMfxDNY,2827
+ob_dj_store-0.0.17.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ob_dj_store-0.0.17.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.17.4.dist-info/RECORD,,