ob-dj-store 0.0.17.3__tar.gz → 0.0.17.4__tar.gz

{ob-dj-store-0.0.17.3 → ob-dj-store-0.0.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.17.3
+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.3 → ob-dj-store-0.0.17.4}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -108,7 +108,9 @@ class AttributeChoiceSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "label",
+            "label_arabic",
             "is_default",
         )
 
@@ -137,6 +139,7 @@ class AttributeSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "attribute_choices",
         )
 
@@ -552,6 +555,7 @@ class ProductTagSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "text_color",
             "background_color",
         )
@@ -565,6 +569,7 @@ class ProductAttributeSerializer(ArabicFieldsMixin, serializers.ModelSerializer)
         fields = (
             "id",
             "name",
+            "name_arabic",
             "is_mandatory",
             "attribute_choices",
             "type",
@@ -578,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",
@@ -596,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
 
@@ -822,6 +834,8 @@ class ProductSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeria
             "product_variants",
             "default_variant",
             "favorites",
+            "name_arabic",
+            "description_arabic",
         )
 
     def to_representation(self, instance: Product):
@@ -838,9 +852,12 @@ class ProductListSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "slug",
             "label",
+            "label_arabic",
             "description",
+            "description_arabic",
             "product_images",
             "type",
         )
@@ -857,7 +874,9 @@ class SubCategorySerializer(serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "description",
+            "description_arabic",
             "is_active",
             "products",
             "image",
@@ -894,7 +913,9 @@ class CategorySerializer(ArabicFieldsMixin, serializers.ModelSerializer):
         fields = (
             "id",
             "name",
+            "name_arabic",
             "description",
+            "description_arabic",
             "products",
             "is_active",
             "subcategories",
@@ -1047,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},
@@ -1124,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
@@ -1167,7 +1192,9 @@ class PaymentMethodSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             "id",
             "payment_provider",
             "name",
+            "name_arabic",
             "description",
+            "description_arabic",
         )
 
 
@@ -1276,6 +1303,7 @@ class FavoriteSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             "extra_info",
             "object_type",
             "name",
+            "name_arabic",
             "is_available_in_store",
         )
         extra_kwargs = {
@@ -1439,6 +1467,7 @@ class WalletSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             "currency",
             "balance",
             "name",
+            "name_arabic",
             "media_image",
             "image_url",
         ]

ob-dj-store-0.0.17.4/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-0.0.17.3 → ob-dj-store-0.0.17.4}/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.3 → ob-dj-store-0.0.17.4}/ob_dj_store.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.17.3
+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.3 → ob-dj-store-0.0.17.4}/ob_dj_store.egg-info/SOURCES.txt

@@ -172,6 +172,7 @@ ob_dj_store/core/stores/migrations/0096_discount_discount_pos_id.py
 ob_dj_store/core/stores/migrations/0097_auto_20231108_1939.py
 ob_dj_store/core/stores/migrations/0098_alter_discount_discount_rate.py
 ob_dj_store/core/stores/migrations/0099_alter_product_name_arabic.py
+ob_dj_store/core/stores/migrations/0100_remove_shippingmethod_type_arabic.py
 ob_dj_store/core/stores/migrations/__init__.py
 ob_dj_store/core/stores/models/__init__.py
 ob_dj_store/core/stores/models/_address.py