ob-dj-store 0.0.17.6__py3-none-any.whl → 0.0.17.8__py3-none-any.whl

ob_dj_store/apis/stores/filters.py

@@ -39,6 +39,7 @@ class StoreFilter(filters.FilterSet):
             "delivery_charges",
             "min_free_delivery_amount",
             "shipping_methods",
+            "is_digital",
         ]
 
     def by_location(self, queryset, name, value):

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/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/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/core/stores/migrations/0101_store_is_digital.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.8 on 2023-12-18 11:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0100_remove_shippingmethod_type_arabic"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="store",
+            name="is_digital",
+            field=models.BooleanField(default=False),
+        ),
+    ]

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/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/core/stores/models/_store.py

@@ -183,6 +183,7 @@ class Store(DjangoModelCleanMixin, models.Model):
         ],
     )
     busy_mode = models.BooleanField(default=False)
+    is_digital = models.BooleanField(default=False)
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

{ob_dj_store-0.0.17.6.dist-info → ob_dj_store-0.0.17.8.dist-info}/METADATA

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

{ob_dj_store-0.0.17.6.dist-info → ob_dj_store-0.0.17.8.dist-info}/RECORD

@@ -1,9 +1,9 @@
 ob_dj_store/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ob_dj_store/apis/stores/filters.py,sha256=lrtmusSkMSQZMrn4PYbwWwqDtPbWQc-nOXE3Wdl58ew,9676
+ob_dj_store/apis/stores/filters.py,sha256=zKBXPBoqIyFlSeZOECp97RTWvSLqNPnlPhEp7p8W5tE,9702
 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=_vGPkWaZs8Osq3xV9Dg9cgu9JMHPK02tfSxlvxBWBT0,61442
+ob_dj_store/apis/stores/views.py,sha256=aE4LFPHzs_CtzZ8K5-vAbDn_51hyhi0KIsi7cV8dpkA,43372
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=unQr5K3TA5X7MJmwrBkTKS7zP7Tovtm42F64CCSjjNY,61750
 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
@@ -11,7 +11,7 @@ ob_dj_store/apis/tap/views.py,sha256=VnVquybTHlJquxsC0RNTy20dtLXalchO0SlGjSDaBng
 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=5nudX9BJ4lF58gYjAI3bR0dnVDJ_GxP-p1tBjEaPFws,12487
-ob_dj_store/core/stores/admin_inlines.py,sha256=NM8Ab7htloQdihRBmew4Ie-ENsKhMlKRIsIH06xO1Mw,2903
+ob_dj_store/core/stores/admin_inlines.py,sha256=2K8iDmP4h0CLIOqy3x-ZXXpgYnT2jqL4cg5YFdiho8s,2976
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
 ob_dj_store/core/stores/managers.py,sha256=Rhv_jTul29A0t_H7jiLQUewn4GnSbgYZ6kq4WAivvjc,9852
 ob_dj_store/core/stores/receivers.py,sha256=DljYC97C_e1mHduKw9Un6YQmxIdwSIter7yVVZwggFA,3768
@@ -133,6 +133,8 @@ ob_dj_store/core/stores/migrations/0097_auto_20231108_1939.py,sha256=zlz85pUO_3T
 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/0101_store_is_digital.py,sha256=yDs7c23WLdhnx82VBw0Fs_YJ0-IgfxLMvMsCkIiThFU,404
+ob_dj_store/core/stores/migrations/0102_partner_name_arabic.py,sha256=iJIiy5isLYv9Jv2sd-NOyZkwySNlXOEqGTOWE3wLH5w,411
 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
@@ -141,16 +143,16 @@ ob_dj_store/core/stores/models/_favorite.py,sha256=3yyMCoiftGOPAQwkMI2J29r3x6NJs
 ob_dj_store/core/stores/models/_feedback.py,sha256=eCUVgprNK5hSRKOS4M_pdR7QH2-rqhoYevlpykhCOLg,1472
 ob_dj_store/core/stores/models/_inventory.py,sha256=ZU8xDMQZxLnFehkBEGWr-os4AF1IlCn5XnBxvRq9IAs,4314
 ob_dj_store/core/stores/models/_order.py,sha256=hFdlAQcN-iZM6_RaIWJ_FATwTER7pHCGoGSqc2prWBM,9710
-ob_dj_store/core/stores/models/_partner.py,sha256=n2D_tbhsry6QH3eFBMJyWTmv3Sd2iuKXBylIsjEU4fc,4470
+ob_dj_store/core/stores/models/_partner.py,sha256=Rm7viyuJWGT2abZcqu1axmLvi7bdlfmgL1qd2gzshVA,4544
 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=wv_bkWIpudUUcM81rLaOnuVzhBPMU5Dqk3oUmMY5Ep8,9581
+ob_dj_store/core/stores/models/_store.py,sha256=PM5pPJL7-1FNKN7zmwJCkNqZs2cxlzg5HNxPGqpVwlc,9633
 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.6.dist-info/METADATA,sha256=PSbNU28NGI_G9Pwdw56GJWvK91mlZYvu3nH0BX9T-5Q,2827
-ob_dj_store-0.0.17.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ob_dj_store-0.0.17.6.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.17.6.dist-info/RECORD,,
+ob_dj_store-0.0.17.8.dist-info/METADATA,sha256=mfkmpYXZgtcUSeoD_MZhvF2rxLCqEB5QH31KVwGmrgE,2827
+ob_dj_store-0.0.17.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ob_dj_store-0.0.17.8.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.17.8.dist-info/RECORD,,