ob-dj-store 0.0.17.7__tar.gz → 0.0.17.9__tar.gz

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/PKG-INFO

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

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -463,7 +463,8 @@ class OrderSerializer(serializers.ModelSerializer):
                 if gift_details:
                     amount = gift_details["price"]
                 else:
-                    amount = user.cart.total_price
+                    amount = user.cart.full_price
+
                 if wallet.balance < amount:
                     raise serializers.ValidationError(
                         {"wallet": _("Insufficient Funds")},
@@ -601,12 +602,14 @@ class ProductVariantSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     is_primary = serializers.SerializerMethodField()
     inventory = serializers.SerializerMethodField()
     name_extra = serializers.SerializerMethodField("get_name_extra")
+    label_extra = serializers.SerializerMethodField("get_label_extra")
 
     class Meta:
         model = ProductVariant
         fields = (
             "id",
             "name_extra",
+            "label_extra",
             "name",
             "label",
             "sku",
@@ -626,6 +629,9 @@ class ProductVariantSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     def get_name_extra(self, obj):
         return obj.name
 
+    def get_label_extra(self, obj):
+        return obj.label
+
     def get_is_primary(self, obj):
         return True if obj.inventories.filter(is_primary=True).exists() else False
 
@@ -1664,16 +1670,24 @@ class PartnerOTPRequestSerializer(serializers.ModelSerializer):
         return partner_otp_auth
 
 
-class PartnerSerializer(serializers.ModelSerializer):
+class PartnerSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     discount = DiscountSerializer()
     stores = StoreListSerializer(many=True)
 
     class Meta:
         model = Partner
-        fields = ("id", "name", "stores", "auth_method", "country", "discount")
+        fields = (
+            "id",
+            "name",
+            "stores",
+            "auth_method",
+            "country",
+            "discount",
+            "name_arabic",
+        )
 
 
-class PartnerAuthInfoSerializer(serializers.ModelSerializer):
+class PartnerAuthInfoSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
     partner = PartnerSerializer(read_only=True)
     promotion_code = serializers.IntegerField(write_only=True, required=False)
     otp_code = serializers.IntegerField(write_only=True, required=False)

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store/apis/stores/views.py

@@ -770,7 +770,9 @@ class ProductView(
     def featured(self, request, *args, **kwargs):
         instance = self.get_queryset().filter(is_featured=True)
         page = self.paginate_queryset(instance)
-        serializer = ProductListSerializer(page, many=True)
+        serializer = ProductListSerializer(
+            page, many=True, context={"request": request}
+        )
         return self.get_paginated_response(serializer.data)
 
 

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store/core/stores/admin.py

@@ -410,6 +410,7 @@ class WalletTransactionAdmin(ImportExportModelAdmin, admin.ModelAdmin):
     list_display = [
         "id",
         "user",
+        "currency",
         "type",
         "amount",
         "is_cashback",
@@ -421,11 +422,18 @@ class WalletTransactionAdmin(ImportExportModelAdmin, admin.ModelAdmin):
     ]
     search_fields = [
         "wallet__user__email",
+        "wallet__user__currency",
     ]
 
     def user(self, obj) -> typing.Text:
         return obj.wallet.user.email
 
+    def currency(self, obj) -> typing.Text:
+        return obj.wallet.currency
+
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("wallet__user")
+
     def save_model(self, request: Any, obj: Any, form: Any, change: Any) -> None:
         if not obj.pk:
             obj.is_by_admin = True

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store/core/stores/admin_inlines.py

@@ -6,7 +6,14 @@ from ob_dj_store.core.stores import models
 class OpeningHoursInlineAdmin(admin.TabularInline):
     model = models.OpeningHours
     extra = 1
-    fields = ["store", "weekday", "from_hour", "to_hour", "always_open"]
+    fields = [
+        "store",
+        "weekday",
+        "weekday_arabic",
+        "from_hour",
+        "to_hour",
+        "always_open",
+    ]
 
     def get_queryset(self, request):
         return super().get_queryset(request).select_related("store")

ob-dj-store-0.0.17.9/ob_dj_store/core/stores/migrations/0102_partner_name_arabic.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2023-12-21 15:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0101_store_is_digital"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="partner",
+            name="name_arabic",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store/core/stores/models/_partner.py

@@ -44,6 +44,7 @@ class Partner(DjangoModelCleanMixin, models.Model):
         CODE = "CODE", _("Promotion code")
 
     name = models.CharField(_("Partner's Name"), max_length=255)
+    name_arabic = models.CharField(null=True, blank=True, max_length=255)
     stores = models.ManyToManyField(Store, related_name="partners")
     promotion_code = models.PositiveBigIntegerField(
         _("Promotion code"), null=True, blank=True, unique=True

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store.egg-info/PKG-INFO

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

{ob-dj-store-0.0.17.7 → ob-dj-store-0.0.17.9}/ob_dj_store.egg-info/SOURCES.txt

@@ -174,6 +174,7 @@ 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/0101_store_is_digital.py
+ob_dj_store/core/stores/migrations/0102_partner_name_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