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

ob_dj_store/core/stores/migrations/0062_auto_20230226_2005.py

@@ -0,0 +1,43 @@
+# Generated by Django 3.2.8 on 2023-02-26 17:05
+
+from django.conf import settings
+from django.db import migrations, models
+
+import ob_dj_store.core.stores.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("stores", "0061_auto_20230223_1435"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="store",
+            name="currency",
+            field=models.CharField(
+                default="KWD",
+                max_length=3,
+                validators=[ob_dj_store.core.stores.utils.validate_currency],
+            ),
+        ),
+        migrations.AddField(
+            model_name="wallet",
+            name="currency",
+            field=models.CharField(
+                default="KWD",
+                max_length=3,
+                validators=[ob_dj_store.core.stores.utils.validate_currency],
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="wallet",
+            unique_together={("user", "currency")},
+        ),
+        migrations.RemoveField(
+            model_name="wallet",
+            name="country",
+        ),
+    ]

ob_dj_store/core/stores/migrations/0063_alter_store_payment_methods.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.8 on 2023-02-27 11:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0062_auto_20230226_2005"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="store",
+            name="payment_methods",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Payment methods within the store",
+                related_name="stores",
+                to="stores.PaymentMethod",
+            ),
+        ),
+    ]

ob_dj_store/core/stores/migrations/0064_auto_20230228_1814.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.8 on 2023-02-28 15:14
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("stores", "0063_alter_store_payment_methods"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="favorite",
+            name="name",
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name="favorite",
+            unique_together={("name", "user")},
+        ),
+    ]

ob_dj_store/core/stores/migrations/0065_auto_20230228_1932.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.2.8 on 2023-02-28 16:32
+
+from django.db import migrations, models
+
+import ob_dj_store.utils.helpers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0064_auto_20230228_1814"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="wallet",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                upload_to=ob_dj_store.utils.helpers.wallet_media_upload_to,
+            ),
+        ),
+        migrations.AddField(
+            model_name="wallet",
+            name="image_thumbnail_medium",
+            field=models.ImageField(blank=True, null=True, upload_to="wallets/"),
+        ),
+        migrations.AddField(
+            model_name="wallet",
+            name="name",
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+    ]

ob_dj_store/core/stores/models/_favorite.py

@@ -16,6 +16,7 @@ class Favorite(DjangoModelCleanMixin, models.Model):
     user = models.ForeignKey(
         get_user_model(), related_name="favorites", on_delete=models.CASCADE
     )
+    name = models.CharField(max_length=200, null=True, blank=True)
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     content_object = GenericForeignKey("content_type", "object_id")
     object_id = models.PositiveIntegerField()
@@ -26,18 +27,20 @@ class Favorite(DjangoModelCleanMixin, models.Model):
     class Meta:
         verbose_name = _("favorite")
         verbose_name_plural = _("favorites")
+        unique_together = (("name", "user"),)
 
     def __str__(self):
         return f"{self.user} favorites {self.content_object}"
 
     @classmethod
-    def add_favorite(cls, content_object, user, extras=[]):
+    def add_favorite(cls, content_object, user, name, extras=[]):
         content_type = ContentType.objects.get_for_model(type(content_object))
         favorite = Favorite(
             user=user,
             content_type=content_type,
             object_id=content_object.pk,
             content_object=content_object,
+            name=name,
         )
         favorite.save()
         for extra in extras:

ob_dj_store/core/stores/models/_order.py

@@ -119,6 +119,8 @@ class Order(DjangoModelCleanMixin, models.Model):
 
     @property
     def total_amount(self):
+        if self.type_of_order == Order.OrderType.WALLET.value:
+            return Decimal(self.extra_infos["amount"])
         amount = Decimal(
             sum(map(lambda item: Decimal(item.total_amount) or 0, self.items.all()))
         )
@@ -157,7 +159,7 @@ class OrderItem(DjangoModelCleanMixin, models.Model):
     product_variant = models.ForeignKey(
         "stores.ProductVariant",
         null=True,
-        on_delete=models.SET_NULL,
+        on_delete=models.PROTECT,
         related_name="order_items",
     )
     # notes for special instructions, can be empty
@@ -181,7 +183,7 @@ class OrderItem(DjangoModelCleanMixin, models.Model):
     extra_infos = models.JSONField(null=True, blank=True)
 
     def __str__(self):
-        return f"OrderItem - {self.quantity} {self.product_variant.name}"
+        return f"OrderItem - {self.quantity} {self.product_variant.product.name}{self.product_variant.name}"
 
     class Meta:
         verbose_name = _("Order Item")

ob_dj_store/core/stores/models/_payment.py

@@ -110,17 +110,36 @@ class Payment(models.Model):
         return f"Payment (PK={self.pk})"
 
     def mark_paid(self):
+        """
+        mark payment and orders as paid then perform post payment actions
+        if wallet fill up we add wallet transaction to the user
+        if physical order we decrease the quantity from inventory and delete items from cart
+        """
+        from ob_dj_store.core.stores.models._wallet import WalletTransaction
+
         self.status = self.PaymentStatus.SUCCESS
-        orders = list(self.orders.all())
-        cart = self.user.cart
-        for order in orders:
+        orders = self.orders.all()
+        if orders[0].type_of_order == Order.OrderType.WALLET.value:
+            order = orders[0]
+            currency = order.extra_infos["currency"]
+            wallet = self.user.wallets.get(currency=currency)
+            WalletTransaction.objects.create(
+                wallet=wallet,
+                amount=self.amount,  # TODO: cunfused about how we hundle if he want to fill up other currency
+                type=WalletTransaction.TYPE.CREDIT,
+            )
             order.status = Order.OrderStatus.PAID
-            for item in order.items.all():
-                if item.inventory:
-                    item.inventory.decrease(item.quantity)
             order.save()
-            items = order.store.store_items.filter(cart=cart)
-            items.delete()
+        else:
+            cart = self.user.cart
+            for order in orders:
+                order.status = Order.OrderStatus.PAID
+                for item in order.items.all():
+                    if item.inventory:
+                        item.inventory.decrease(item.quantity)
+                order.save()
+                items = order.store.store_items.filter(cart=cart)
+                items.delete()
         self.payment_post_at = timezone.now()
         self.save()
 
@@ -130,14 +149,15 @@ class Payment(models.Model):
 
     @property
     def total_payment(self):
+        orders = self.orders.all()
         sum_orders = Decimal(
-            sum(map(lambda order: Decimal(order.total_amount) or 0, self.orders.all()))
+            sum(map(lambda order: Decimal(order.total_amount) or 0, orders))
         )
         if self.payment_tax.rate == Tax.Rates.PERCENTAGE:
             perc = Decimal(sum_orders * self.payment_tax.value / 100)
-            return sum_orders + perc
+            return round(sum_orders + perc, 3)
 
-        return sum_orders + Decimal(self.payment_tax.value)
+        return round(sum_orders + self.payment_tax.value, 3)
 
     @property
     def type_of_order(self):

ob_dj_store/core/stores/models/_product.py

@@ -2,8 +2,6 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import RegexValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from imagekit.models import ImageSpecField
-from imagekit.processors import ResizeToFill
 
 from ob_dj_store.core.stores.managers import (
     CategoryManager,
@@ -31,11 +29,11 @@ class Category(DjangoModelCleanMixin, models.Model):
         related_name="subcategories",
     )
     image = models.ImageField(upload_to=category_media_upload_to, null=True, blank=True)
-    image_thumbnail = ImageSpecField(
-        source="image",
-        processors=[ResizeToFill(200, 200)],
-        format="JPEG",
-        options={"quality": 60},
+    image_thumbnail_small = models.ImageField(
+        upload_to="category_media/", null=True, blank=True
+    )
+    image_thumbnail_medium = models.ImageField(
+        upload_to="category_media/", null=True, blank=True
     )
     order_value = models.PositiveSmallIntegerField(
         verbose_name=_("ordering"), default=1
@@ -105,7 +103,7 @@ class Product(DjangoModelCleanMixin, models.Model):
         PHYSICAL = "PHYSICAL", _("physical")
         DIGITAL = "DIGITAL", _("digital")
 
-    name = models.CharField(max_length=200, help_text=_("Name"))
+    name = models.CharField(max_length=200, help_text=_("Name"), unique=True)
     slug = models.SlugField(max_length=255, unique=True)
     description = models.TextField(null=True, blank=True)
     # TODO: A product can be assigned to multiple categories
@@ -189,6 +187,8 @@ class AttributeChoice(DjangoModelCleanMixin, models.Model):
     order_value = models.PositiveSmallIntegerField(
         verbose_name=_("ordering"), default=1
     )
+    is_default = models.BooleanField(default=False)
+    label = models.CharField(max_length=200, null=True, blank=True)
     # Audit fields
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -210,6 +210,8 @@ class ProductAttribute(DjangoModelCleanMixin, models.Model):
     class Type(models.TextChoices):
         ONE_CHOICE = "ONE_CHOICE", _("one choice")
         MULTIPLE_CHOICES = "MULTIPLE_CHOICES", _("multiple choices")
+        LIST_CHOICES = "LIST_CHOICES", _("list choices")
+        INCREMENT_CHOICE = "INCREMENT_CHOICE", _("increment choice")
 
     name = models.CharField(max_length=200, help_text=_("Name"))
     description = models.TextField(null=True, blank=True)
@@ -225,9 +227,12 @@ class ProductAttribute(DjangoModelCleanMixin, models.Model):
     order_value = models.PositiveSmallIntegerField(
         verbose_name=_("ordering"), default=1
     )
+    min = models.PositiveSmallIntegerField(default=1)
+    max = models.PositiveSmallIntegerField(default=1)
     is_mandatory = models.BooleanField(default=False)
     plu = models.CharField(max_length=40, unique=True, null=True, blank=True)
     external_id = models.CharField(max_length=40, unique=True, null=True, blank=True)
+    label = models.CharField(max_length=200, null=True, blank=True)
     # Audit fields
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -288,11 +293,11 @@ class ProductMedia(DjangoModelCleanMixin, models.Model):
     )
     is_primary = models.BooleanField(default=False)
     image = models.ImageField(upload_to=product_media_upload_to)
-    image_thumbnail = ImageSpecField(
-        source="image",
-        processors=[ResizeToFill(200, 200)],
-        format="JPEG",
-        options={"quality": 60},
+    image_thumbnail_small = models.ImageField(
+        upload_to="product_media/", null=True, blank=True
+    )
+    image_thumbnail_medium = models.ImageField(
+        upload_to="product_media/", null=True, blank=True
     )
     order_value = models.PositiveSmallIntegerField(
         verbose_name=_("ordering"), default=1
@@ -313,3 +318,7 @@ class ProductMedia(DjangoModelCleanMixin, models.Model):
         ordering = ("order_value",)
         verbose_name = _("product media")
         verbose_name_plural = _("Product medias")
+
+    @property
+    def name(self):
+        return f"{self.product.name}_{self.order_value}"

ob_dj_store/core/stores/models/_store.py

@@ -3,6 +3,7 @@ import typing
 from django.conf import settings
 from django.contrib.gis.db import models
 from django.core.exceptions import ValidationError
+from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
 
@@ -11,7 +12,7 @@ from ob_dj_store.core.stores.managers import (
     ShippingMethodManager,
     StoreManager,
 )
-from ob_dj_store.core.stores.utils import get_currency_by_country
+from ob_dj_store.core.stores.utils import validate_currency
 from ob_dj_store.utils.helpers import store_media_upload_to
 from ob_dj_store.utils.model import DjangoModelCleanMixin
 
@@ -113,7 +114,7 @@ class Store(DjangoModelCleanMixin, models.Model):
     )
     payment_methods = models.ManyToManyField(
         PaymentMethod,
-        related_name="payment_methods",
+        related_name="stores",
         blank=True,
         help_text=_("Payment methods within the store"),
     )
@@ -136,6 +137,13 @@ class Store(DjangoModelCleanMixin, models.Model):
         help_text=_("This is the min price to get a free delivery"),
     )
     image = models.ImageField(upload_to=store_media_upload_to, null=True, blank=True)
+    currency = models.CharField(
+        max_length=3,
+        default="KWD",
+        validators=[
+            validate_currency,
+        ],
+    )
 
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -150,10 +158,11 @@ class Store(DjangoModelCleanMixin, models.Model):
         return f"Store {self.name} (PK={self.pk})"
 
     @property
-    def currency(self):
-        if self.address:
-            return get_currency_by_country(self.address.country.name)
-        return None
+    def current_opening_hours(self):
+        return next(
+            (x for x in self.opening_hours.all() if x.weekday == now().weekday() + 1),
+            None,
+        )
 
 
 class OpeningHours(DjangoModelCleanMixin, models.Model):

ob_dj_store/core/stores/models/_wallet.py

@@ -6,10 +6,11 @@ from django.conf import settings
 from django.db import models
 from django.db.models.functions import Coalesce
 from django.utils.translation import gettext_lazy as _
-from django_countries.fields import CountryField
 
 from ob_dj_store.core.stores.managers import WalletTransactionManager
-from ob_dj_store.core.stores.utils import get_currency_by_country
+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
 
 logger = logging.getLogger(__name__)
 
@@ -20,7 +21,21 @@ class Wallet(models.Model):
         on_delete=models.CASCADE,
         related_name="wallets",
     )
-    country = CountryField(_("the wallet's country"), null=True, blank=True)
+    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
+    )
+    currency = models.CharField(
+        max_length=3,
+        default="KWD",
+        validators=[
+            validate_currency,
+        ],
+    )
+
+    class Meta:
+        unique_together = ("user", "currency")
 
     def __str__(self) -> typing.Text:
         return f"Wallet(PK={self.pk})"
@@ -48,11 +63,29 @@ class Wallet(models.Model):
         )
         return query["balance"]
 
-    @property
-    def currency(self):
-        if self.country:
-            return get_currency_by_country(self.country.name)
-        return None
+    def top_up_wallet(self, amount: Decimal, payment_method: PaymentMethod):
+        from ob_dj_store.core.stores.models import Order, Payment
+
+        user = self.user
+        order = Order.objects.create(
+            customer=user,
+            payment_method=payment_method,
+            extra_infos={
+                "is_wallet_fill_up": True,
+                "amount": str(amount),
+                "currency": self.currency,
+            },
+        )
+        payment = Payment.objects.create(
+            orders=[
+                order,
+            ],
+            user=user,
+            currency=self.currency,
+            method=payment_method,
+            amount=amount,
+        )
+        return payment.payment_url
 
 
 class WalletTransaction(models.Model):

ob_dj_store/core/stores/receivers.py

@@ -1,8 +1,17 @@
 from django.conf import settings
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
 
-from ob_dj_store.core.stores.models import Cart, Order, OrderHistory, Wallet
+from config import settings as store_settings
+from ob_dj_store.core.stores.models import (
+    Cart,
+    Category,
+    Order,
+    OrderHistory,
+    ProductMedia,
+    Wallet,
+)
+from ob_dj_store.utils.utils import resize_image
 
 
 @receiver(
@@ -15,8 +24,8 @@ def create_customer_cart_and_wallet_handler(sender, instance, created, **kwargs)
         return
     cart = Cart(customer=instance)
     cart.save()
-    country = getattr(instance, "country", None)
-    Wallet.objects.create(user=instance, country=country)
+    for currency in store_settings.WALLET_CURRENCIES:
+        instance.wallets.create(currency=currency)
 
 
 # add receiver to ProductVariant to create inventory
@@ -32,3 +41,69 @@ def create_order_history_handler(sender, instance, created, **kwargs):
         order=instance,
         status=instance.status,
     )
+
+
+@receiver(
+    pre_save,
+    sender=Category,
+    dispatch_uid="create_category_thumbnails",
+)
+def create_category_thumbnails(sender, instance, **kwargs):
+    medium_dim = getattr(store_settings, "THUMBNAIL_MEDIUM_DIMENSIONS", None)
+    small_dim = getattr(store_settings, "THUMBNAIL_SMALL_DIMENSIONS", None)
+    if instance.image:
+        if medium_dim:
+            instance.image_thumbnail_medium = resize_image(
+                instance.image,
+                dim=medium_dim,
+                size_name="medium",
+                image_name=instance.name,
+            )
+        if small_dim:
+            instance.image_thumbnail_small = resize_image(
+                instance.image,
+                dim=small_dim,
+                size_name="small",
+                image_name=instance.name,
+            )
+
+
+@receiver(
+    pre_save,
+    sender=ProductMedia,
+    dispatch_uid="create_product_media_thumbnails",
+)
+def create_product_media_thumbnails(sender, instance, **kwargs):
+    medium_dim = getattr(store_settings, "THUMBNAIL_MEDIUM_DIMENSIONS", None)
+    small_dim = getattr(store_settings, "THUMBNAIL_SMALL_DIMENSIONS", None)
+    if instance.image:
+        if medium_dim:
+            instance.image_thumbnail_medium = resize_image(
+                instance.image,
+                dim=medium_dim,
+                size_name="medium",
+                image_name=instance.name,
+            )
+        if small_dim:
+            instance.image_thumbnail_small = resize_image(
+                instance.image,
+                dim=small_dim,
+                size_name="small",
+                image_name=instance.name,
+            )
+
+
+@receiver(
+    pre_save,
+    sender=Wallet,
+    dispatch_uid="create_wallet_thumbnails",
+)
+def create_wallet_thumbnails(sender, instance, **kwargs):
+    medium_dim = getattr(store_settings, "THUMBNAIL_MEDIUM_DIMENSIONS", None)
+    if instance.image and medium_dim:
+        instance.image_thumbnail_medium = resize_image(
+            instance.image,
+            dim=medium_dim,
+            size_name="medium",
+            image_name=f"{instance.currency}_{instance.user.username}",
+        )

ob_dj_store/core/stores/utils.py

@@ -55,13 +55,19 @@ def distance(origin, destination):
 
 def get_currency_by_country(country):
     country = pycountry.countries.get(name=country)
-    if not country:
-        raise ValidationError(_("Invalid Country!"))
-    return pycountry.currencies.get(numeric=country.numeric).alpha_3
+    currency = pycountry.currencies.get(numeric=country.numeric)
+    return currency.alpha_3
 
 
 def get_country_by_currency(currency):
     currency = pycountry.currencies.get(alpha_3=currency)
-    if not currency:
-        raise ValidationError(_("Invalid Currency!"))
-    return pycountry.countries.get(numeric=currency.numeric).alpha_2
+    country = pycountry.countries.get(numeric=currency.numeric)
+    return country.alpha_2
+
+
+def validate_currency(value):
+    if not pycountry.currencies.get(alpha_3=value):
+        raise ValidationError(
+            _("%(value)s is not a currency"),
+            params={"value": value},
+        )

ob_dj_store/utils/helpers.py

@@ -19,7 +19,7 @@ def import_class_from_string(serializer_class_name):
 
 def product_media_upload_to(instance, filename):
     ext = filename.split(".")[-1]
-    return f"product_media/{instance.product.id}_{instance.order_value}_{int(now().timestamp())}.{ext}"
+    return f"product_media/{instance.product.name}_{instance.order_value}_{int(now().timestamp())}.{ext}"
 
 
 def category_media_upload_to(instance, filename):
@@ -31,4 +31,10 @@ def category_media_upload_to(instance, filename):
 def store_media_upload_to(instance, filename):
     ext = filename.split(".")[-1]
     if instance:
-        return f"category_media/{instance.name}_{int(now().timestamp())}.{ext}"
+        return f"store_media/{instance.name}_{int(now().timestamp())}.{ext}"
+
+
+def wallet_media_upload_to(instance, filename):
+    ext = filename.split(".")[-1]
+    if instance:
+        return f"wallets/{instance.currency}_{instance.user.username}_{int(now().timestamp())}.{ext}"

ob_dj_store/utils/utils.py

@@ -1,3 +1,43 @@
-class JustOnSave(object):
-    def on_source_saved(self, file):
-        file.generate()
+import logging
+import os
+from io import BytesIO
+
+from django.core.files.uploadedfile import InMemoryUploadedFile
+from django.utils.timezone import now
+from PIL import Image, UnidentifiedImageError
+from pilkit.processors import ResizeToFill
+
+logger = logging.getLogger(__name__)
+
+
+def resize_image(image, dim: dict, size_name: str, image_name: str):
+    try:
+        img = Image.open(image)
+    except UnidentifiedImageError as e:
+        logger.error(e)
+        return None
+    width, height = dim.values()
+    processor = ResizeToFill(width=width, height=height)
+    new_img = processor.process(img)
+    filename, extension = os.path.splitext(image.name)
+    extension = extension.lower()
+    if extension == ".png":
+        content_type = "image/png"
+        img_format = "PNG"
+    else:
+        content_type = "image/jpeg"
+        img_format = "JPEG"
+    output = BytesIO()
+    if new_img.mode in ("RGBA", "P"):
+        new_img = new_img.convert("RGB")
+    new_img.save(output, format=img_format, quality=70)
+    output.seek(0)
+    new_image = InMemoryUploadedFile(
+        output,
+        "ImageField",
+        f"{image_name}_{int(now().timestamp())}_{size_name}.{img_format.lower()}",
+        content_type,
+        output.__sizeof__(),
+        None,
+    )
+    return new_image

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

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