ob-dj-store 0.0.11.10__py3-none-any.whl → 0.0.11.12__py3-none-any.whl

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

@@ -40,6 +40,8 @@ from ob_dj_store.core.stores.models import (
     Store,
     Tax,
     Wallet,
+    WalletMedia,
+    WalletTransaction,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory
 from ob_dj_store.core.stores.utils import distance
@@ -52,6 +54,7 @@ class AttributeChoiceSerializer(serializers.ModelSerializer):
             "id",
             "name",
             "price",
+            "label",
             "is_default",
         )
 
@@ -148,6 +151,7 @@ class OrderSerializer(serializers.ModelSerializer):
     items = OrderItemSerializer(many=True, read_only=True)
     history = OrderHistorySerializer(many=True, read_only=True)
     estimated_timeline = serializers.SerializerMethodField()
+    store_name = serializers.SerializerMethodField()
 
     class Meta:
         model = Order
@@ -170,6 +174,7 @@ class OrderSerializer(serializers.ModelSerializer):
             "extra_infos",
             "created_at",
             "updated_at",
+            "store_name",
         )
         extra_kwargs = {
             "customer": {"read_only": True},
@@ -200,9 +205,11 @@ class OrderSerializer(serializers.ModelSerializer):
             timeline["ready"] = timeline["delivering"] or timeline["order_ready"]
         return timeline
 
+    def get_store_name(self, obj):
+        return obj.store.name if obj.store else None
+
     def to_representation(self, instance):
         data = super().to_representation(instance)
-        data["store_name"] = instance.store.name
         return data
 
     def _get_store(self):
@@ -403,6 +410,7 @@ class ProductAttributeSerializer(serializers.ModelSerializer):
             "is_mandatory",
             "attribute_choices",
             "type",
+            "label",
             "min",
             "max",
         )
@@ -1061,13 +1069,18 @@ class FavoriteSerializer(serializers.ModelSerializer):
         return favorite
 
 
+class WalletMediaSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = WalletMedia
+        fields = "__all__"
+
+
 class WalletSerializer(serializers.ModelSerializer):
     class Meta:
         model = Wallet
-        fields = ["id", "user", "balance", "name", "image", "image_thumbnail_medium"]
+        fields = ["id", "user", "balance", "name", "media_image", "image_url"]
         extra_kwargs = {
             "user": {"read_only": True},
-            "image_thumbnail_medium": {"read_only": True},
         }
 
 
@@ -1090,3 +1103,15 @@ class WalletTopUpSerializer(serializers.Serializer):
         amount = self.validated_data["amount"]
         payment_method = self.validated_data["payment_method"]
         return wallet.top_up_wallet(amount=amount, payment_method=payment_method)
+
+
+class WalletTransactionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = WalletTransaction
+        fields = [
+            "id",
+            "type",
+            "amount",
+            "created_at",
+            "wallet",
+        ]

ob_dj_store/apis/stores/views.py

@@ -48,8 +48,10 @@ from ob_dj_store.apis.stores.rest.serializers.serializers import (
     ShippingMethodSerializer,
     StoreSerializer,
     TaxSerializer,
+    WalletMediaSerializer,
     WalletSerializer,
     WalletTopUpSerializer,
+    WalletTransactionSerializer,
 )
 from ob_dj_store.core.stores.models import (
     Cart,
@@ -66,6 +68,7 @@ from ob_dj_store.core.stores.models import (
     Store,
     Tax,
     Wallet,
+    WalletMedia,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory
 
@@ -944,7 +947,9 @@ class WalletViewSet(
     ]
 
     def get_queryset(self):
-        return Wallet.objects.filter(user=self.request.user)
+        return Wallet.objects.filter(user=self.request.user).select_related(
+            "media_image"
+        )
 
     @swagger_auto_schema(
         operation_summary="Get User Wallet",
@@ -1010,3 +1015,61 @@ class WalletViewSet(
         instance = self.get_object()
         payment_url = serializer.top_up_wallet(instance)
         return Response({"payment_url": payment_url}, status=status.HTTP_200_OK)
+
+    @swagger_auto_schema(
+        operation_summary="List Wallet's transactions",
+        operation_description="""
+                list user's wallet transactions(debit,credit)
+            """,
+        tags=[
+            "Wallet",
+        ],
+    )
+    @action(
+        methods=[
+            "GET",
+        ],
+        detail=True,
+        url_path="transactions",
+        serializer_class=WalletTransactionSerializer,
+    )
+    def transactions(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        queryset = self.get_object().transactions.all()
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
+    @swagger_auto_schema(
+        operation_summary="List Wallet selection images",
+        operation_description="""
+                list wallet selection images
+            """,
+        tags=[
+            "Wallet",
+        ],
+    )
+    @action(
+        methods=[
+            "GET",
+        ],
+        detail=False,
+        url_path="images",
+        serializer_class=WalletMediaSerializer,
+    )
+    def images(
+        self, request: Request, *args: typing.Any, **kwargs: typing.Any
+    ) -> Response:
+        queryset = WalletMedia.objects.filter(is_active=True)
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)

ob_dj_store/core/stores/admin.py

@@ -288,6 +288,10 @@ class WalletAdmin(admin.ModelAdmin):
     ]
 
 
+class WalletMediaAdmin(admin.ModelAdmin):
+    list_display = ("id", "image", "image_thumbnail_medium", "is_active")
+
+
 admin.site.register(models.Store, StoreAdmin)
 admin.site.register(models.ShippingMethod, ShippingMethodAdmin)
 admin.site.register(models.PaymentMethod, PaymentMethodAdmin)
@@ -305,3 +309,4 @@ admin.site.register(models.Inventory, InventoryAdmin)
 admin.site.register(models.Tax, TaxAdmin)
 admin.site.register(models.WalletTransaction, WalletTransactionAdmin)
 admin.site.register(models.Wallet, WalletAdmin)
+admin.site.register(models.WalletMedia, WalletMediaAdmin)

ob_dj_store/core/stores/migrations/0066_auto_20230304_1532.py

@@ -0,0 +1,64 @@
+# Generated by Django 3.2.8 on 2023-03-04 12:32
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+import ob_dj_store.utils.helpers
+import ob_dj_store.utils.model
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0065_auto_20230228_1932"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="WalletMedia",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "image",
+                    models.ImageField(
+                        upload_to=ob_dj_store.utils.helpers.wallet_media_upload_to
+                    ),
+                ),
+                (
+                    "image_thumbnail_medium",
+                    models.ImageField(blank=True, null=True, upload_to="wallets/"),
+                ),
+                ("is_active", models.BooleanField(default=True)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+            ],
+            bases=(ob_dj_store.utils.model.DjangoModelCleanMixin, models.Model),
+        ),
+        migrations.RemoveField(
+            model_name="wallet",
+            name="image",
+        ),
+        migrations.RemoveField(
+            model_name="wallet",
+            name="image_thumbnail_medium",
+        ),
+        migrations.AddField(
+            model_name="wallet",
+            name="media_image",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="wallets",
+                to="stores.walletmedia",
+            ),
+        ),
+    ]

ob_dj_store/core/stores/models/__init__.py

@@ -26,7 +26,11 @@ from ob_dj_store.core.stores.models._store import (
     ShippingMethod,
     Store,
 )
-from ob_dj_store.core.stores.models._wallet import Wallet, WalletTransaction
+from ob_dj_store.core.stores.models._wallet import (
+    Wallet,
+    WalletMedia,
+    WalletTransaction,
+)
 
 __all__ = [
     "Store",
@@ -60,4 +64,5 @@ __all__ = [
     "WalletTransaction",
     "Wallet",
     "FavoriteExtra",
+    "WalletMedia",
 ]

ob_dj_store/core/stores/models/_wallet.py

@@ -11,10 +11,27 @@ from ob_dj_store.core.stores.managers import WalletTransactionManager
 from ob_dj_store.core.stores.models._store import PaymentMethod
 from ob_dj_store.core.stores.utils import validate_currency
 from ob_dj_store.utils.helpers import wallet_media_upload_to
+from ob_dj_store.utils.model import DjangoModelCleanMixin
 
 logger = logging.getLogger(__name__)
 
 
+class WalletMedia(DjangoModelCleanMixin, models.Model):
+    """
+    selection images for wallets.
+    """
+
+    image = models.ImageField(upload_to=wallet_media_upload_to)
+    image_thumbnail_medium = models.ImageField(
+        upload_to="wallets/", null=True, blank=True
+    )
+    is_active = models.BooleanField(default=True)
+
+    # Audit fields
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+
 class Wallet(models.Model):
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
@@ -22,9 +39,12 @@ class Wallet(models.Model):
         related_name="wallets",
     )
     name = models.CharField(max_length=200, null=True, blank=True)
-    image = models.ImageField(upload_to=wallet_media_upload_to, null=True, blank=True)
-    image_thumbnail_medium = models.ImageField(
-        upload_to="wallets/", null=True, blank=True
+    media_image = models.ForeignKey(
+        WalletMedia,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="wallets",
     )
     currency = models.CharField(
         max_length=3,
@@ -63,6 +83,12 @@ class Wallet(models.Model):
         )
         return query["balance"]
 
+    @property
+    def image_url(self):
+        if self.media_image:
+            image = self.media_image.image_thumbnail_medium
+            return image.url if image else None
+
     def top_up_wallet(self, amount: Decimal, payment_method: PaymentMethod):
         from ob_dj_store.core.stores.models import Order, Payment
 

ob_dj_store/core/stores/receivers.py

@@ -9,7 +9,7 @@ from ob_dj_store.core.stores.models import (
     Order,
     OrderHistory,
     ProductMedia,
-    Wallet,
+    WalletMedia,
 )
 from ob_dj_store.utils.utils import resize_image
 
@@ -95,7 +95,7 @@ def create_product_media_thumbnails(sender, instance, **kwargs):
 
 @receiver(
     pre_save,
-    sender=Wallet,
+    sender=WalletMedia,
     dispatch_uid="create_wallet_thumbnails",
 )
 def create_wallet_thumbnails(sender, instance, **kwargs):
@@ -105,5 +105,4 @@ def create_wallet_thumbnails(sender, instance, **kwargs):
             instance.image,
             dim=medium_dim,
             size_name="medium",
-            image_name=f"{instance.currency}_{instance.user.username}",
         )

ob_dj_store/utils/helpers.py

@@ -35,6 +35,6 @@ def store_media_upload_to(instance, filename):
 
 
 def wallet_media_upload_to(instance, filename):
-    ext = filename.split(".")[-1]
+    image_name, ext = filename.split(".")
     if instance:
-        return f"wallets/{instance.currency}_{instance.user.username}_{int(now().timestamp())}.{ext}"
+        return f"wallets/{image_name}_{int(now().timestamp())}.{ext}"

ob_dj_store/utils/utils.py

@@ -10,7 +10,7 @@ from pilkit.processors import ResizeToFill
 logger = logging.getLogger(__name__)
 
 
-def resize_image(image, dim: dict, size_name: str, image_name: str):
+def resize_image(image, dim: dict, size_name: str, image_name: str = None):
     try:
         img = Image.open(image)
     except UnidentifiedImageError as e:
@@ -32,6 +32,8 @@ def resize_image(image, dim: dict, size_name: str, image_name: str):
         new_img = new_img.convert("RGB")
     new_img.save(output, format=img_format, quality=70)
     output.seek(0)
+    if not image_name:
+        image_name = filename
     new_image = InMemoryUploadedFile(
         output,
         "ImageField",

{ob_dj_store-0.0.11.10.dist-info → ob_dj_store-0.0.11.12.dist-info}/METADATA

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

{ob_dj_store-0.0.11.10.dist-info → ob_dj_store-0.0.11.12.dist-info}/RECORD

@@ -2,19 +2,19 @@ ob_dj_store/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/stores/filters.py,sha256=s4US_TysnIgdT8pue_1jlG3V33WhYmCymXK3DuC0rqY,5746
 ob_dj_store/apis/stores/urls.py,sha256=cPForgFpOgOGCUVAk6DZcZ7qOooMf1zpDIr1BA0L_8A,1593
-ob_dj_store/apis/stores/views.py,sha256=zoEgQg3qKVlhhHPj96_UoNE-B8Pf8NK4AuUEmTwOhgg,29833
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=43c_0NyKVZDfmI32f2DR3m6i0G2y3G_yxZEuJBvdAL4,36402
+ob_dj_store/apis/stores/views.py,sha256=RjibvMPfEKsKQtuuieU4UplNL2z-54ZkwDyC5J5Mbwo,31738
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=9hPfSHj5ODbrPuePX5sT5zPXc_jNk_FTZMOsu-rEWLY,36921
 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=4um-O_30xpnfcZHe_sNOyvSTnqLSbeExA2E1QppLEZQ,7354
+ob_dj_store/core/stores/admin.py,sha256=xRmi6LCda27w3f4c2rIaodbTSvLLBuhOLVgmEJcUU4g,7530
 ob_dj_store/core/stores/admin_inlines.py,sha256=SLj8mMa-Sc3oP693R0W9c3Ocyk7eb34IyXbC4E6LL8M,1557
 ob_dj_store/core/stores/apps.py,sha256=i6D2lcqlluP6FwJSBpekf7BQVzQURwSy_Y97SgqWTkM,434
 ob_dj_store/core/stores/managers.py,sha256=cDr8TtPxayLwTFNgFs9I87ZXh7ssqM-yAmvEcN9a5LU,6359
-ob_dj_store/core/stores/receivers.py,sha256=5AYMW8ul5htJPp4gBwRAH1VyT5ugZvDMJmed2sostBM,3194
+ob_dj_store/core/stores/receivers.py,sha256=gfpshRC_OjLW8dx9Y61dpakPGZkW_hV9KV9cEYH7K1w,3132
 ob_dj_store/core/stores/settings_validation.py,sha256=s9BPEdyCL2aslZwZGLAWEvJBzXlUo0p2TbC1_0E_SDo,327
 ob_dj_store/core/stores/utils.py,sha256=_FwZEIwKdfj3CuYHCz3wKqq5TBb8xak7UiiCB1oggKc,1850
 ob_dj_store/core/stores/gateway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -94,8 +94,9 @@ ob_dj_store/core/stores/migrations/0062_auto_20230226_2005.py,sha256=ApzGG5teYcL
 ob_dj_store/core/stores/migrations/0063_alter_store_payment_methods.py,sha256=QKIrNVtjttvYn4IO1GpGkA2gX4cyqjHNbFQ7q7cQqno,571
 ob_dj_store/core/stores/migrations/0064_auto_20230228_1814.py,sha256=6fgusQrMykN_tlNBxiJqLNvrHBA0yI32JK0kQ4VfNpQ,644
 ob_dj_store/core/stores/migrations/0065_auto_20230228_1932.py,sha256=r3-ThPhh_Lf4J3tYbCLiRbLSui5VSqwaVCtzvEZes_8,919
+ob_dj_store/core/stores/migrations/0066_auto_20230304_1532.py,sha256=IVOFLoaaFyRM50EBdfw9W4ixUP_F1n6LRm4zQJ9Yfaw,1977
 ob_dj_store/core/stores/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ob_dj_store/core/stores/models/__init__.py,sha256=1lEOqmvQlQJZj9nnObTAQqgnPP1yVGvM8H9yjglZ0VI,1568
+ob_dj_store/core/stores/models/__init__.py,sha256=fNB_sn6HM6EmTp_Z-Q7KXD8HDWVjG3qlayrWqvygvbw,1617
 ob_dj_store/core/stores/models/_address.py,sha256=qS5TQ9Z12zx_4CrrHvG8PoYVkdiOq_MtbKR14WKh3Hw,1661
 ob_dj_store/core/stores/models/_cart.py,sha256=qgjg5MXTMRIZRJJDx5BQ1pa9__ylfrnYMMRGbB2R53c,4555
 ob_dj_store/core/stores/models/_favorite.py,sha256=bpXlFBNK8jsQkZG1RiDAbNTNSoVP0NOUUxZI8c46QzI,2561
@@ -105,12 +106,12 @@ ob_dj_store/core/stores/models/_order.py,sha256=qtdUpG30dZeDGeh0Z8JhzyyqQIuxTdLf
 ob_dj_store/core/stores/models/_payment.py,sha256=dCOXOYkgxOGJqp0nxEvzHmdZxR_srFUIZAhrB--SP1U,6143
 ob_dj_store/core/stores/models/_product.py,sha256=yGVp3vl5rCReG4c8ogWy2NUcsTJeqCxP0tm6lQyYx7Y,10928
 ob_dj_store/core/stores/models/_store.py,sha256=g7QXKbZI886Pdw6smuheVep7Vh1ke42PEhJhnxW4byA,7334
-ob_dj_store/core/stores/models/_wallet.py,sha256=4LUyWPlgRedthWij-Nkn4diYvWHU755IOBLgpjZOyQ8,3679
+ob_dj_store/core/stores/models/_wallet.py,sha256=iPeS2BVbDhZcqw0Wi7tEiUgw7ihFKQvd0RK8ZaF6ZYY,4350
 ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ob_dj_store/utils/helpers.py,sha256=02igVH2DSDTZYa6kFSTmBnJeXfTdgjRCRSXQ7mvmCGo,1224
+ob_dj_store/utils/helpers.py,sha256=3LsbPik74hkn4T2R6cwa0x6IE9gBNK7gMQsjQsJz1uk,1200
 ob_dj_store/utils/model.py,sha256=DV7hOhTaZL3gh9sptts2jTUFlTArKG3i7oPioq9HLFE,303
-ob_dj_store/utils/utils.py,sha256=euWeNI39P48jGNwKoBCC5AmwQUmgDeb92t0fQtPm-5g,1282
-ob_dj_store-0.0.11.10.dist-info/METADATA,sha256=pjF7LcR9ltkOqvsxXXp5ZGjaJRR47kGrO_SyxVtGrZ4,2828
-ob_dj_store-0.0.11.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-ob_dj_store-0.0.11.10.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.11.10.dist-info/RECORD,,
+ob_dj_store/utils/utils.py,sha256=8UVAFB56qUSjJJ5f9vnermtw638gdFy4CFRCuMbns_M,1342
+ob_dj_store-0.0.11.12.dist-info/METADATA,sha256=OVSVTQIgRyF-cfWmlfDeklAKAx3PUL-MZE8pi-CkT44,2828
+ob_dj_store-0.0.11.12.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+ob_dj_store-0.0.11.12.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.11.12.dist-info/RECORD,,